[#517] Hopefully this fixes 8.4 tests