This should make the build-time tests a bit more robust, by using the -noreset option to avoid a race condition (see #981201).
I have to work this out from first principles every time and it's really getting old.