diff --git a/GNUmakefile b/GNUmakefile
index bca86259..6ca47242 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -225,9 +225,9 @@ test: tests image
 	WINEPREFIX=$(BUILDDIR_ABS)/.wine-test-prefix $(WINE) explorer /desktop=wine-mono-test cmd /c '$(shell $(WINE) winepath -w $(TESTS_OUTDIR)/run-tests.exe) >test-output.txt 2>&1'
 	! grep -q 'The following tests failed but were not in fail-list:' test-output.txt
 
-test-nobuild:
+test-nobuild: build/removeuserinstalls-x86.exe
 	WINEPREFIX=$(SRCDIR_ABS)/.wine-test-prefix $(WINE) reg add 'HKCU\Software\Wine\WineDbg' /v ShowCrashDialog /t REG_DWORD /d 0 /f
-	for i in WINEPREFIX=$(SRCDIR_ABS)/.wine-test-prefix `$(WINE) uninstaller --list|grep '|||Wine Mono'|sed -e 's/|||.*$$//'`; do $(WINE) uninstaller --remove "$$i"; done
+	$(WINE) build/removeuserinstalls-x86.exe -a
 	$(WINE) msiexec /i '$(shell $(WINE) winepath -w $(SRCDIR)/wine-mono-$(MSI_VERSION)-x86.msi)'
 	$(RM_F) test-output.txt
 	WINEPREFIX=$(SRCDIR_ABS)/.wine-test-prefix $(WINE) explorer /desktop=wine-mono-test cmd /c '$(shell $(WINE) winepath -w $(SRCDIR)/tests/run-tests.exe) >test-output.txt 2>&1'