Make 2.4 tests run with M2 instead of M1