Support 5.3.3 in tests