Fix tests for 5.6.x