Fix test failure under 2.x