diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 8344dd1849c..f2e6af078a5 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2193,7 +2193,9 @@ def _findwheel(pkgname):
     If set, the wheels are searched for in WHEEL_PKG_DIR (see ensurepip).
     Otherwise, they are searched for in the test directory.
     """
-    wheel_dir = sysconfig.get_config_var('WHEEL_PKG_DIR') or TEST_HOME_DIR
+    wheel_dir = sysconfig.get_config_var('WHEEL_PKG_DIR') or os.path.join(
+        TEST_HOME_DIR, 'wheeldata',
+    )
     filenames = os.listdir(wheel_dir)
     filenames = sorted(filenames, reverse=True)  # approximate "newest" first
     for filename in filenames:
diff --git a/Lib/test/setuptools-67.6.1-py3-none-any.whl b/Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
similarity index 100%
rename from Lib/test/setuptools-67.6.1-py3-none-any.whl
rename to Lib/test/wheeldata/setuptools-67.6.1-py3-none-any.whl
diff --git a/Lib/test/wheel-0.40.0-py3-none-any.whl b/Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl
similarity index 100%
rename from Lib/test/wheel-0.40.0-py3-none-any.whl
rename to Lib/test/wheeldata/wheel-0.40.0-py3-none-any.whl
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1107259b5ae..21b122ae0fc 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2318,6 +2318,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/tokenizedata \
 		test/tracedmodules \
 		test/typinganndata \
+		test/wheeldata \
 		test/xmltestdata \
 		test/xmltestdata/c14n-20