Fix tests on 2.6