Fix tests on 5.3