fix AllTests for v2.6 branch