Fix tests for 2.6.x