Integrate PR 12649's race detector directly in the testsuite machinery