111 files changed, 7 insertions, 16 deletions

diff --git a/conftest.py b/conftest.py
index 3f7e59b4..72edcf14 100644
--- a/conftest.py
+++ b/conftest.py
@@ -14,7 +14,7 @@ def pytest_addoption(parser):
 collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
-    'distutils',
+    'setuptools/_distutils',
 ]
 
 
diff --git a/distutils/README b/setuptools/_distutils/README
index 23f48850..23f48850 100644
--- a/distutils/README
+++ b/setuptools/_distutils/README
diff --git a/distutils/__init__.py b/setuptools/_distutils/__init__.py
index 7dac55b6..7dac55b6 100644
--- a/distutils/__init__.py
+++ b/setuptools/_distutils/__init__.py
diff --git a/distutils/_msvccompiler.py b/setuptools/_distutils/_msvccompiler.py
index af8099a4..af8099a4 100644
--- a/distutils/_msvccompiler.py
+++ b/setuptools/_distutils/_msvccompiler.py
diff --git a/distutils/archive_util.py b/setuptools/_distutils/archive_util.py
index 565a3117..565a3117 100644
--- a/distutils/archive_util.py
+++ b/setuptools/_distutils/archive_util.py
diff --git a/distutils/bcppcompiler.py b/setuptools/_distutils/bcppcompiler.py
index 071fea5d..071fea5d 100644
--- a/distutils/bcppcompiler.py
+++ b/setuptools/_distutils/bcppcompiler.py
diff --git a/distutils/ccompiler.py b/setuptools/_distutils/ccompiler.py
index b5ef143e..b5ef143e 100644
--- a/distutils/ccompiler.py
+++ b/setuptools/_distutils/ccompiler.py
diff --git a/distutils/cmd.py b/setuptools/_distutils/cmd.py
index dba3191e..dba3191e 100644
--- a/distutils/cmd.py
+++ b/setuptools/_distutils/cmd.py
diff --git a/distutils/command/__init__.py b/setuptools/_distutils/command/__init__.py
index 481eea9f..481eea9f 100644
--- a/distutils/command/__init__.py
+++ b/setuptools/_distutils/command/__init__.py
diff --git a/distutils/command/bdist.py b/setuptools/_distutils/command/bdist.py
index 014871d2..014871d2 100644
--- a/distutils/command/bdist.py
+++ b/setuptools/_distutils/command/bdist.py
diff --git a/distutils/command/bdist_dumb.py b/setuptools/_distutils/command/bdist_dumb.py
index f0d6b5b8..f0d6b5b8 100644
--- a/distutils/command/bdist_dumb.py
+++ b/setuptools/_distutils/command/bdist_dumb.py
diff --git a/distutils/command/bdist_msi.py b/setuptools/_distutils/command/bdist_msi.py
index 0863a188..0863a188 100644
--- a/distutils/command/bdist_msi.py
+++ b/setuptools/_distutils/command/bdist_msi.py
diff --git a/distutils/command/bdist_rpm.py b/setuptools/_distutils/command/bdist_rpm.py
index 550cbfa1..550cbfa1 100644
--- a/distutils/command/bdist_rpm.py
+++ b/setuptools/_distutils/command/bdist_rpm.py
diff --git a/distutils/command/bdist_wininst.py b/setuptools/_distutils/command/bdist_wininst.py
index 0e9ddaa2..0e9ddaa2 100644
--- a/distutils/command/bdist_wininst.py
+++ b/setuptools/_distutils/command/bdist_wininst.py
diff --git a/distutils/command/build.py b/setuptools/_distutils/command/build.py
index a86df0bc..a86df0bc 100644
--- a/distutils/command/build.py
+++ b/setuptools/_distutils/command/build.py
diff --git a/distutils/command/build_clib.py b/setuptools/_distutils/command/build_clib.py
index 3e20ef23..3e20ef23 100644
--- a/distutils/command/build_clib.py
+++ b/setuptools/_distutils/command/build_clib.py
diff --git a/distutils/command/build_ext.py b/setuptools/_distutils/command/build_ext.py
index 1a9bd120..1a9bd120 100644
--- a/distutils/command/build_ext.py
+++ b/setuptools/_distutils/command/build_ext.py
diff --git a/distutils/command/build_py.py b/setuptools/_distutils/command/build_py.py
index cf0ca57c..cf0ca57c 100644
--- a/distutils/command/build_py.py
+++ b/setuptools/_distutils/command/build_py.py
diff --git a/distutils/command/build_scripts.py b/setuptools/_distutils/command/build_scripts.py
index ccc70e64..ccc70e64 100644
--- a/distutils/command/build_scripts.py
+++ b/setuptools/_distutils/command/build_scripts.py
diff --git a/distutils/command/check.py b/setuptools/_distutils/command/check.py
index ada25006..ada25006 100644
--- a/distutils/command/check.py
+++ b/setuptools/_distutils/command/check.py
diff --git a/distutils/command/clean.py b/setuptools/_distutils/command/clean.py
index 0cb27016..0cb27016 100644
--- a/distutils/command/clean.py
+++ b/setuptools/_distutils/command/clean.py
diff --git a/distutils/command/command_template b/setuptools/_distutils/command/command_template
index 6106819d..6106819d 100644
--- a/distutils/command/command_template
+++ b/setuptools/_distutils/command/command_template
diff --git a/distutils/command/config.py b/setuptools/_distutils/command/config.py
index aeda408e..aeda408e 100644
--- a/distutils/command/config.py
+++ b/setuptools/_distutils/command/config.py
diff --git a/distutils/command/install.py b/setuptools/_distutils/command/install.py
index 13feeb89..13feeb89 100644
--- a/distutils/command/install.py
+++ b/setuptools/_distutils/command/install.py
diff --git a/distutils/command/install_data.py b/setuptools/_distutils/command/install_data.py
index 947cd76a..947cd76a 100644
--- a/distutils/command/install_data.py
+++ b/setuptools/_distutils/command/install_data.py
diff --git a/distutils/command/install_egg_info.py b/setuptools/_distutils/command/install_egg_info.py
index 0ddc7367..0ddc7367 100644
--- a/distutils/command/install_egg_info.py
+++ b/setuptools/_distutils/command/install_egg_info.py
diff --git a/distutils/command/install_headers.py b/setuptools/_distutils/command/install_headers.py
index 9bb0b18d..9bb0b18d 100644
--- a/distutils/command/install_headers.py
+++ b/setuptools/_distutils/command/install_headers.py
diff --git a/distutils/command/install_lib.py b/setuptools/_distutils/command/install_lib.py
index 6154cf09..6154cf09 100644
--- a/distutils/command/install_lib.py
+++ b/setuptools/_distutils/command/install_lib.py
diff --git a/distutils/command/install_scripts.py b/setuptools/_distutils/command/install_scripts.py
index 31a1130e..31a1130e 100644
--- a/distutils/command/install_scripts.py
+++ b/setuptools/_distutils/command/install_scripts.py
diff --git a/distutils/command/register.py b/setuptools/_distutils/command/register.py
index 0fac94e9..0fac94e9 100644
--- a/distutils/command/register.py
+++ b/setuptools/_distutils/command/register.py
diff --git a/distutils/command/sdist.py b/setuptools/_distutils/command/sdist.py
index b4996fcb..b4996fcb 100644
--- a/distutils/command/sdist.py
+++ b/setuptools/_distutils/command/sdist.py
diff --git a/distutils/command/upload.py b/setuptools/_distutils/command/upload.py
index 95e9fda1..95e9fda1 100644
--- a/distutils/command/upload.py
+++ b/setuptools/_distutils/command/upload.py
diff --git a/distutils/command/wininst-10.0-amd64.exe b/setuptools/_distutils/command/wininst-10.0-amd64.exe
index 6fa0dce1..6fa0dce1 100644
--- a/distutils/command/wininst-10.0-amd64.exe
+++ b/setuptools/_distutils/command/wininst-10.0-amd64.exe
diff --git a/distutils/command/wininst-10.0.exe b/setuptools/_distutils/command/wininst-10.0.exe
index afc3bc6c..afc3bc6c 100644
--- a/distutils/command/wininst-10.0.exe
+++ b/setuptools/_distutils/command/wininst-10.0.exe
diff --git a/distutils/command/wininst-14.0-amd64.exe b/setuptools/_distutils/command/wininst-14.0-amd64.exe
index 253c2e2e..253c2e2e 100644
--- a/distutils/command/wininst-14.0-amd64.exe
+++ b/setuptools/_distutils/command/wininst-14.0-amd64.exe
diff --git a/distutils/command/wininst-14.0.exe b/setuptools/_distutils/command/wininst-14.0.exe
index 46f5f356..46f5f356 100644
--- a/distutils/command/wininst-14.0.exe
+++ b/setuptools/_distutils/command/wininst-14.0.exe
diff --git a/distutils/command/wininst-6.0.exe b/setuptools/_distutils/command/wininst-6.0.exe
index f57c855a..f57c855a 100644
--- a/distutils/command/wininst-6.0.exe
+++ b/setuptools/_distutils/command/wininst-6.0.exe
diff --git a/distutils/command/wininst-7.1.exe b/setuptools/_distutils/command/wininst-7.1.exe
index 1433bc1a..1433bc1a 100644
--- a/distutils/command/wininst-7.1.exe
+++ b/setuptools/_distutils/command/wininst-7.1.exe
diff --git a/distutils/command/wininst-8.0.exe b/setuptools/_distutils/command/wininst-8.0.exe
index 7403bfab..7403bfab 100644
--- a/distutils/command/wininst-8.0.exe
+++ b/setuptools/_distutils/command/wininst-8.0.exe
diff --git a/distutils/command/wininst-9.0-amd64.exe b/setuptools/_distutils/command/wininst-9.0-amd64.exe
index 94fbd434..94fbd434 100644
--- a/distutils/command/wininst-9.0-amd64.exe
+++ b/setuptools/_distutils/command/wininst-9.0-amd64.exe
diff --git a/distutils/command/wininst-9.0.exe b/setuptools/_distutils/command/wininst-9.0.exe
index 2ec261f9..2ec261f9 100644
--- a/distutils/command/wininst-9.0.exe
+++ b/setuptools/_distutils/command/wininst-9.0.exe
diff --git a/distutils/config.py b/setuptools/_distutils/config.py
index 2171abd6..2171abd6 100644
--- a/distutils/config.py
+++ b/setuptools/_distutils/config.py
diff --git a/distutils/core.py b/setuptools/_distutils/core.py
index d603d4a4..d603d4a4 100644
--- a/distutils/core.py
+++ b/setuptools/_distutils/core.py
diff --git a/distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
index 66c12dd3..66c12dd3 100644
--- a/distutils/cygwinccompiler.py
+++ b/setuptools/_distutils/cygwinccompiler.py
diff --git a/distutils/debug.py b/setuptools/_distutils/debug.py
index daf1660f..daf1660f 100644
--- a/distutils/debug.py
+++ b/setuptools/_distutils/debug.py
diff --git a/distutils/dep_util.py b/setuptools/_distutils/dep_util.py
index d74f5e4e..d74f5e4e 100644
--- a/distutils/dep_util.py
+++ b/setuptools/_distutils/dep_util.py
diff --git a/distutils/dir_util.py b/setuptools/_distutils/dir_util.py
index d5cd8e3e..d5cd8e3e 100644
--- a/distutils/dir_util.py
+++ b/setuptools/_distutils/dir_util.py
diff --git a/distutils/dist.py b/setuptools/_distutils/dist.py
index 37db4d6c..37db4d6c 100644
--- a/distutils/dist.py
+++ b/setuptools/_distutils/dist.py
diff --git a/distutils/errors.py b/setuptools/_distutils/errors.py
index 8b93059e..8b93059e 100644
--- a/distutils/errors.py
+++ b/setuptools/_distutils/errors.py
diff --git a/distutils/extension.py b/setuptools/_distutils/extension.py
index c507da36..c507da36 100644
--- a/distutils/extension.py
+++ b/setuptools/_distutils/extension.py
diff --git a/distutils/fancy_getopt.py b/setuptools/_distutils/fancy_getopt.py
index 7d170dd2..7d170dd2 100644
--- a/distutils/fancy_getopt.py
+++ b/setuptools/_distutils/fancy_getopt.py
diff --git a/distutils/file_util.py b/setuptools/_distutils/file_util.py
index b3fee35a..b3fee35a 100644
--- a/distutils/file_util.py
+++ b/setuptools/_distutils/file_util.py
diff --git a/distutils/filelist.py b/setuptools/_distutils/filelist.py
index c92d5fdb..c92d5fdb 100644
--- a/distutils/filelist.py
+++ b/setuptools/_distutils/filelist.py
diff --git a/distutils/log.py b/setuptools/_distutils/log.py
index 8ef6b28e..8ef6b28e 100644
--- a/distutils/log.py
+++ b/setuptools/_distutils/log.py
diff --git a/distutils/msvc9compiler.py b/setuptools/_distutils/msvc9compiler.py
index 6934e964..6934e964 100644
--- a/distutils/msvc9compiler.py
+++ b/setuptools/_distutils/msvc9compiler.py
diff --git a/distutils/msvccompiler.py b/setuptools/_distutils/msvccompiler.py
index d5857cb1..d5857cb1 100644
--- a/distutils/msvccompiler.py
+++ b/setuptools/_distutils/msvccompiler.py
diff --git a/distutils/spawn.py b/setuptools/_distutils/spawn.py
index aad277b0..aad277b0 100644
--- a/distutils/spawn.py
+++ b/setuptools/_distutils/spawn.py
diff --git a/distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
index 879b6981..879b6981 100644
--- a/distutils/sysconfig.py
+++ b/setuptools/_distutils/sysconfig.py
diff --git a/distutils/tests/Setup.sample b/setuptools/_distutils/tests/Setup.sample
index 36c4290d..36c4290d 100644
--- a/distutils/tests/Setup.sample
+++ b/setuptools/_distutils/tests/Setup.sample
diff --git a/distutils/tests/__init__.py b/setuptools/_distutils/tests/__init__.py
index 5d2e69e3..5d2e69e3 100644
--- a/distutils/tests/__init__.py
+++ b/setuptools/_distutils/tests/__init__.py
diff --git a/distutils/tests/includetest.rst b/setuptools/_distutils/tests/includetest.rst
index d7b4ae38..d7b4ae38 100644
--- a/distutils/tests/includetest.rst
+++ b/setuptools/_distutils/tests/includetest.rst
diff --git a/distutils/tests/py35compat.py b/setuptools/_distutils/tests/py35compat.py
index 0c755261..0c755261 100644
--- a/distutils/tests/py35compat.py
+++ b/setuptools/_distutils/tests/py35compat.py
diff --git a/distutils/tests/support.py b/setuptools/_distutils/tests/support.py
index 259af882..259af882 100644
--- a/distutils/tests/support.py
+++ b/setuptools/_distutils/tests/support.py
diff --git a/distutils/tests/test_archive_util.py b/setuptools/_distutils/tests/test_archive_util.py
index e9aad0e4..e9aad0e4 100644
--- a/distutils/tests/test_archive_util.py
+++ b/setuptools/_distutils/tests/test_archive_util.py
diff --git a/distutils/tests/test_bdist.py b/setuptools/_distutils/tests/test_bdist.py
index 130d8bf1..130d8bf1 100644
--- a/distutils/tests/test_bdist.py
+++ b/setuptools/_distutils/tests/test_bdist.py
diff --git a/distutils/tests/test_bdist_dumb.py b/setuptools/_distutils/tests/test_bdist_dumb.py
index 01a233bc..01a233bc 100644
--- a/distutils/tests/test_bdist_dumb.py
+++ b/setuptools/_distutils/tests/test_bdist_dumb.py
diff --git a/distutils/tests/test_bdist_msi.py b/setuptools/_distutils/tests/test_bdist_msi.py
index 418e60ec..418e60ec 100644
--- a/distutils/tests/test_bdist_msi.py
+++ b/setuptools/_distutils/tests/test_bdist_msi.py
diff --git a/distutils/tests/test_bdist_rpm.py b/setuptools/_distutils/tests/test_bdist_rpm.py
index 6453a02b..6453a02b 100644
--- a/distutils/tests/test_bdist_rpm.py
+++ b/setuptools/_distutils/tests/test_bdist_rpm.py
diff --git a/distutils/tests/test_bdist_wininst.py b/setuptools/_distutils/tests/test_bdist_wininst.py
index 5c3d025d..5c3d025d 100644
--- a/distutils/tests/test_bdist_wininst.py
+++ b/setuptools/_distutils/tests/test_bdist_wininst.py
diff --git a/distutils/tests/test_build.py b/setuptools/_distutils/tests/test_build.py
index b020a5ba..b020a5ba 100644
--- a/distutils/tests/test_build.py
+++ b/setuptools/_distutils/tests/test_build.py
diff --git a/distutils/tests/test_build_clib.py b/setuptools/_distutils/tests/test_build_clib.py
index 259c4352..259c4352 100644
--- a/distutils/tests/test_build_clib.py
+++ b/setuptools/_distutils/tests/test_build_clib.py
diff --git a/distutils/tests/test_build_ext.py b/setuptools/_distutils/tests/test_build_ext.py
index 1aec1537..1aec1537 100644
--- a/distutils/tests/test_build_ext.py
+++ b/setuptools/_distutils/tests/test_build_ext.py
diff --git a/distutils/tests/test_build_py.py b/setuptools/_distutils/tests/test_build_py.py
index 0712e92c..0712e92c 100644
--- a/distutils/tests/test_build_py.py
+++ b/setuptools/_distutils/tests/test_build_py.py
diff --git a/distutils/tests/test_build_scripts.py b/setuptools/_distutils/tests/test_build_scripts.py
index 954fc763..954fc763 100644
--- a/distutils/tests/test_build_scripts.py
+++ b/setuptools/_distutils/tests/test_build_scripts.py
diff --git a/distutils/tests/test_check.py b/setuptools/_distutils/tests/test_check.py
index e534aca1..e534aca1 100644
--- a/distutils/tests/test_check.py
+++ b/setuptools/_distutils/tests/test_check.py
diff --git a/distutils/tests/test_clean.py b/setuptools/_distutils/tests/test_clean.py
index c605afd8..c605afd8 100644
--- a/distutils/tests/test_clean.py
+++ b/setuptools/_distutils/tests/test_clean.py
diff --git a/distutils/tests/test_cmd.py b/setuptools/_distutils/tests/test_cmd.py
index cf5197c3..cf5197c3 100644
--- a/distutils/tests/test_cmd.py
+++ b/setuptools/_distutils/tests/test_cmd.py
diff --git a/distutils/tests/test_config.py b/setuptools/_distutils/tests/test_config.py
index 344084af..344084af 100644
--- a/distutils/tests/test_config.py
+++ b/setuptools/_distutils/tests/test_config.py
diff --git a/distutils/tests/test_config_cmd.py b/setuptools/_distutils/tests/test_config_cmd.py
index 4cd9a6b9..4cd9a6b9 100644
--- a/distutils/tests/test_config_cmd.py
+++ b/setuptools/_distutils/tests/test_config_cmd.py
diff --git a/distutils/tests/test_core.py b/setuptools/_distutils/tests/test_core.py
index 27ce7324..27ce7324 100644
--- a/distutils/tests/test_core.py
+++ b/setuptools/_distutils/tests/test_core.py
diff --git a/distutils/tests/test_cygwinccompiler.py b/setuptools/_distutils/tests/test_cygwinccompiler.py
index 9dc869de..9dc869de 100644
--- a/distutils/tests/test_cygwinccompiler.py
+++ b/setuptools/_distutils/tests/test_cygwinccompiler.py
diff --git a/distutils/tests/test_dep_util.py b/setuptools/_distutils/tests/test_dep_util.py
index c6fae39c..c6fae39c 100644
--- a/distutils/tests/test_dep_util.py
+++ b/setuptools/_distutils/tests/test_dep_util.py
diff --git a/distutils/tests/test_dir_util.py b/setuptools/_distutils/tests/test_dir_util.py
index d436cf83..d436cf83 100644
--- a/distutils/tests/test_dir_util.py
+++ b/setuptools/_distutils/tests/test_dir_util.py
diff --git a/distutils/tests/test_dist.py b/setuptools/_distutils/tests/test_dist.py
index d431085b..d431085b 100644
--- a/distutils/tests/test_dist.py
+++ b/setuptools/_distutils/tests/test_dist.py
diff --git a/distutils/tests/test_extension.py b/setuptools/_distutils/tests/test_extension.py
index e35f2738..e35f2738 100644
--- a/distutils/tests/test_extension.py
+++ b/setuptools/_distutils/tests/test_extension.py
diff --git a/distutils/tests/test_file_util.py b/setuptools/_distutils/tests/test_file_util.py
index a4e2d025..a4e2d025 100644
--- a/distutils/tests/test_file_util.py
+++ b/setuptools/_distutils/tests/test_file_util.py
diff --git a/distutils/tests/test_filelist.py b/setuptools/_distutils/tests/test_filelist.py
index 71fde2b7..71fde2b7 100644
--- a/distutils/tests/test_filelist.py
+++ b/setuptools/_distutils/tests/test_filelist.py
diff --git a/distutils/tests/test_install.py b/setuptools/_distutils/tests/test_install.py
index eb684a09..eb684a09 100644
--- a/distutils/tests/test_install.py
+++ b/setuptools/_distutils/tests/test_install.py
diff --git a/distutils/tests/test_install_data.py b/setuptools/_distutils/tests/test_install_data.py
index 32ab296a..32ab296a 100644
--- a/distutils/tests/test_install_data.py
+++ b/setuptools/_distutils/tests/test_install_data.py
diff --git a/distutils/tests/test_install_headers.py b/setuptools/_distutils/tests/test_install_headers.py
index 2217b321..2217b321 100644
--- a/distutils/tests/test_install_headers.py
+++ b/setuptools/_distutils/tests/test_install_headers.py
diff --git a/distutils/tests/test_install_lib.py b/setuptools/_distutils/tests/test_install_lib.py
index fda6315b..fda6315b 100644
--- a/distutils/tests/test_install_lib.py
+++ b/setuptools/_distutils/tests/test_install_lib.py
diff --git a/distutils/tests/test_install_scripts.py b/setuptools/_distutils/tests/test_install_scripts.py
index 1f7b1038..1f7b1038 100644
--- a/distutils/tests/test_install_scripts.py
+++ b/setuptools/_distutils/tests/test_install_scripts.py
diff --git a/distutils/tests/test_log.py b/setuptools/_distutils/tests/test_log.py
index 75cf9006..75cf9006 100644
--- a/distutils/tests/test_log.py
+++ b/setuptools/_distutils/tests/test_log.py
diff --git a/distutils/tests/test_msvc9compiler.py b/setuptools/_distutils/tests/test_msvc9compiler.py
index 77a07ef3..77a07ef3 100644
--- a/distutils/tests/test_msvc9compiler.py
+++ b/setuptools/_distutils/tests/test_msvc9compiler.py
diff --git a/distutils/tests/test_msvccompiler.py b/setuptools/_distutils/tests/test_msvccompiler.py
index b518d6a7..b518d6a7 100644
--- a/distutils/tests/test_msvccompiler.py
+++ b/setuptools/_distutils/tests/test_msvccompiler.py
diff --git a/distutils/tests/test_register.py b/setuptools/_distutils/tests/test_register.py
index e68b0af3..e68b0af3 100644
--- a/distutils/tests/test_register.py
+++ b/setuptools/_distutils/tests/test_register.py
diff --git a/distutils/tests/test_sdist.py b/setuptools/_distutils/tests/test_sdist.py
index 23db1269..23db1269 100644
--- a/distutils/tests/test_sdist.py
+++ b/setuptools/_distutils/tests/test_sdist.py
diff --git a/distutils/tests/test_spawn.py b/setuptools/_distutils/tests/test_spawn.py
index 919d0ad9..919d0ad9 100644
--- a/distutils/tests/test_spawn.py
+++ b/setuptools/_distutils/tests/test_spawn.py
diff --git a/distutils/tests/test_sysconfig.py b/setuptools/_distutils/tests/test_sysconfig.py
index d5076391..d5076391 100644
--- a/distutils/tests/test_sysconfig.py
+++ b/setuptools/_distutils/tests/test_sysconfig.py
diff --git a/distutils/tests/test_text_file.py b/setuptools/_distutils/tests/test_text_file.py
index 7e76240a..7e76240a 100644
--- a/distutils/tests/test_text_file.py
+++ b/setuptools/_distutils/tests/test_text_file.py
diff --git a/distutils/tests/test_unixccompiler.py b/setuptools/_distutils/tests/test_unixccompiler.py
index f2159662..f2159662 100644
--- a/distutils/tests/test_unixccompiler.py
+++ b/setuptools/_distutils/tests/test_unixccompiler.py
diff --git a/distutils/tests/test_upload.py b/setuptools/_distutils/tests/test_upload.py
index bca5516d..bca5516d 100644
--- a/distutils/tests/test_upload.py
+++ b/setuptools/_distutils/tests/test_upload.py
diff --git a/distutils/tests/test_util.py b/setuptools/_distutils/tests/test_util.py
index bf0d4333..bf0d4333 100644
--- a/distutils/tests/test_util.py
+++ b/setuptools/_distutils/tests/test_util.py
diff --git a/distutils/tests/test_version.py b/setuptools/_distutils/tests/test_version.py
index 8671cd2f..8671cd2f 100644
--- a/distutils/tests/test_version.py
+++ b/setuptools/_distutils/tests/test_version.py
diff --git a/distutils/tests/test_versionpredicate.py b/setuptools/_distutils/tests/test_versionpredicate.py
index 28ae09dc..28ae09dc 100644
--- a/distutils/tests/test_versionpredicate.py
+++ b/setuptools/_distutils/tests/test_versionpredicate.py
diff --git a/distutils/text_file.py b/setuptools/_distutils/text_file.py
index 93abad38..93abad38 100644
--- a/distutils/text_file.py
+++ b/setuptools/_distutils/text_file.py
diff --git a/distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
index 4d7a6de7..4d7a6de7 100644
--- a/distutils/unixccompiler.py
+++ b/setuptools/_distutils/unixccompiler.py
diff --git a/distutils/util.py b/setuptools/_distutils/util.py
index 4b002ece..4b002ece 100644
--- a/distutils/util.py
+++ b/setuptools/_distutils/util.py
diff --git a/distutils/version.py b/setuptools/_distutils/version.py
index c33bebae..c33bebae 100644
--- a/distutils/version.py
+++ b/setuptools/_distutils/version.py
diff --git a/distutils/versionpredicate.py b/setuptools/_distutils/versionpredicate.py
index 062c98f2..062c98f2 100644
--- a/distutils/versionpredicate.py
+++ b/setuptools/_distutils/versionpredicate.py
diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py
index f9e63798..06eed82f 100644
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py
@@ -8,19 +8,7 @@ for more motivation.
 import sys
 import re
 import importlib
-import contextlib
 import warnings
-from os.path import dirname
-
-
-@contextlib.contextmanager
-def patch_sys_path():
-    orig = sys.path[:]
-    sys.path[:] = [dirname(dirname(__file__))]
-    try:
-        yield
-    finally:
-        sys.path[:] = orig
 
 
 def clear_distutils():
@@ -34,9 +22,12 @@ def clear_distutils():
 
 def ensure_local_distutils():
     clear_distutils()
-    with patch_sys_path():
-        importlib.import_module('distutils')
-        assert sys.modules['distutils'].local
+    distutils = importlib.import_module('setuptools._distutils')
+    sys.modules['distutils'] = distutils
+
+    # sanity check that submodules load as expected
+    core = importlib.import_module('distutils.core')
+    assert '_distutils' in core.__file__, core.__file__
 
 
 ensure_local_distutils()