[1.7.x] Fix additional test failures caused by migration pollution