diff -r 0026d94d45e6 Makefile.pre.in
--- a/Makefile.pre.in	Thu Jul 28 03:53:59 2016 +0000
+++ b/Makefile.pre.in	Thu Jul 28 09:56:25 2016 +0200
@@ -1190,18 +1190,28 @@
 PLATDIR=	@PLATDIR@
 MACHDEPS=	$(PLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
-LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
-		tkinter/test/test_ttk site-packages test \
-		test/audiodata \
-		test/capath test/data \
+LIBSUBDIRS=	tkinter site-packages asyncio \
+		collections concurrent concurrent/futures encodings \
+		email email/mime ensurepip ensurepip/_bundled \
+		html json http dbm xmlrpc \
+		sqlite3 logging csv wsgiref urllib \
+		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
+		lib2to3/tests/data lib2to3/tests/data/fixers \
+		lib2to3/tests/data/fixers/myfixes \
+		ctypes ctypes/macholib \
+		idlelib idlelib/Icons idlelib/idle_test \
+		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
+		importlib turtledemo multiprocessing multiprocessing/dummy \
+		unittest venv venv/scripts venv/scripts/posix \
+		curses pydoc_data $(MACHDEPS)
+TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+		tkinter/test/test_ttk test \
+		test/audiodata test/capath test/data \
 		test/cjkencodings test/decimaltestdata test/xmltestdata \
-		test/eintrdata \
-		test/imghdrdata \
-		test/libregrtest \
+		test/eintrdata test/imghdrdata test/libregrtest \
 		test/subprocessdata test/sndhdrdata test/support \
 		test/tracedmodules test/encoded_modules \
-		test/test_import \
-		test/test_import/data \
+		test/test_import test/test_import/data \
 		test/test_import/data/circular_imports \
 		test/test_import/data/circular_imports/subpkg \
 		test/test_importlib/namespace_pkgs \
@@ -1224,28 +1234,12 @@
 		test/test_importlib/namespace_pkgs/project3/parent/child \
                 test/test_importlib/namespace_pkgs/module_and_namespace_package \
                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
-		asyncio \
-		test/test_asyncio \
-		collections concurrent concurrent/futures encodings \
-		email email/mime test/test_email test/test_email/data \
-		ensurepip ensurepip/_bundled \
-		html json test/test_json http dbm xmlrpc \
-		sqlite3 sqlite3/test \
-		logging csv wsgiref urllib \
-		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
-		lib2to3/tests/data lib2to3/tests/data/fixers \
-		lib2to3/tests/data/fixers/myfixes \
-		ctypes ctypes/test ctypes/macholib \
-		idlelib idlelib/Icons idlelib/idle_test \
-		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-		importlib test/test_importlib test/test_importlib/builtin \
+		test/test_asyncio test/test_email test/test_email/data \
+		test/test_json  sqlite3/test ctypes/test \
+		test/test_importlib test/test_importlib/builtin \
 		test/test_importlib/extension test/test_importlib/frozen \
 		test/test_importlib/import_ test/test_importlib/source \
-		turtledemo \
-		multiprocessing multiprocessing/dummy \
-		unittest unittest/test unittest/test/testmock \
-		venv venv/scripts venv/scripts/posix \
-		curses pydoc_data $(MACHDEPS)
+		unittest/test unittest/test/testmock
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
@@ -1255,7 +1249,12 @@
 		else	true; \
 		fi; \
 	done
-	@for d in $(LIBSUBDIRS); \
+	@if test "x@WITH_TEST_SUITE@" = xyes; then \
+		subdirs="$(LIBSUBDIRS) $(TESTSUBDIRS)"; \
+	else \
+		subdirs="$(LIBSUBDIRS)"; \
+	fi; \
+	for d in $$subdirs; \
 	do \
 		a=$(srcdir)/Lib/$$d; \
 		if test ! -d $$a; then continue; else true; fi; \
@@ -1276,7 +1275,12 @@
 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
 		fi; \
 	done
-	@for d in $(LIBSUBDIRS); \
+	@if test "x@WITH_TEST_SUITE@" = xyes; then \
+		subdirs="$(LIBSUBDIRS) $(TESTSUBDIRS)"; \
+	else \
+		subdirs="$(LIBSUBDIRS)"; \
+	fi; \
+	for d in $$subdirs; \
 	do \
 		a=$(srcdir)/Lib/$$d; \
 		if test ! -d $$a; then continue; else true; fi; \
diff -r 0026d94d45e6 configure.ac
--- a/configure.ac	Thu Jul 28 03:53:59 2016 +0000
+++ b/configure.ac	Thu Jul 28 09:56:25 2016 +0200
@@ -203,6 +203,18 @@
 fi
 AC_SUBST(UNIVERSALSDK)
 
+AC_MSG_CHECKING(for --disable-test-suite)
+AC_ARG_ENABLE([test-suite],
+    AS_HELP_STRING([--disable-test-suite], [do not install the Python test suite]))
+if test "x$enable_test_suite" = xno; then
+    disable_test_suite=yes
+else
+    WITH_TEST_SUITE=yes
+    disable_test_suite=no
+fi
+AC_SUBST(WITH_TEST_SUITE)
+AC_MSG_RESULT($disable_test_suite)
+
 AC_SUBST(ARCH_RUN_32BIT)
 ARCH_RUN_32BIT=""