Index: Lib/test/regrtest.py
===================================================================
--- Lib/test/regrtest.py	(revision 87549)
+++ Lib/test/regrtest.py	(working copy)
@@ -544,8 +544,16 @@
                     except StopIteration:
                         output.put((None, None, None, None))
                         return
+                    # Special case for test_site: it won't run if -S was specified.
+                    if test == "test_site":
+                        this_base_cmd = base_cmd[:]
+                        for flag in ('-S', '-s'):
+                            if flag in this_base_cmd:
+                                this_base_cmd.remove(flag)
+                    else:
+                        this_base_cmd = base_cmd
                     # -E is needed by some tests, e.g. test_import
-                    popen = Popen(base_cmd + ['--slaveargs', json.dumps(args_tuple)],
+                    popen = Popen(this_base_cmd + ['--slaveargs', json.dumps(args_tuple)],
                                    stdout=PIPE, stderr=PIPE,
                                    universal_newlines=True,
                                    close_fds=(os.name != 'nt'))
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in	(revision 87549)
+++ Makefile.pre.in	(working copy)
@@ -746,9 +746,9 @@
 # generated bytecode.  This is sometimes a very shy bug needing a lot of
 # sample data.
 
-TESTOPTS=	-l $(EXTRATESTOPTS)
+TESTOPTS=	-j1 $(EXTRATESTOPTS)
 TESTPROG=	$(srcdir)/Lib/test/regrtest.py
-TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
+TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb -S -s $(TESTPYTHONOPTS)
 test:		all platform
 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)