Cause the time needed to run the testsuite to drop from ~4mins to ~40s (cherry picked from commit 1b5aa60767)
1b5aa60767