Fix 2.5.x tests