Fix test failures on 2.6.x