diff --git a/Makefile.pre.in b/Makefile.pre.in
index c8e8dc5..5f2e984 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -563,6 +563,10 @@
 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
 		$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
 
+# Like testall, but with a single pass only
+buildbottest:	all platform
+		$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rw
+
 QUICKTESTOPTS=	$(TESTOPTS) -x test_thread test_signal test_strftime \
 		test_unicodedata test_re test_sre test_select test_poll \
 		test_linuxaudiodev test_struct test_sunaudiodev test_zlib
diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 840b44b..c8b1937 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
 cd PCbuild
-call rt.bat -d -uall -rw
+call rt.bat -d -q -uall -rw