Fix broken tests on 5.4