Fix failing tests on 5.x-dev [no_release]