diff --git a/Lib/test/namespace_pkgs/both_portions/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
similarity index 100%
rename from Lib/test/namespace_pkgs/both_portions/foo/one.py
rename to Lib/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
diff --git a/Lib/test/namespace_pkgs/both_portions/foo/two.py b/Lib/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
similarity index 100%
rename from Lib/test/namespace_pkgs/both_portions/foo/two.py
rename to Lib/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
diff --git a/Lib/test/namespace_pkgs/missing_directory.zip b/Lib/test/test_importlib/namespace_pkgs/missing_directory.zip
similarity index 100%
rename from Lib/test/namespace_pkgs/missing_directory.zip
rename to Lib/test/test_importlib/namespace_pkgs/missing_directory.zip
diff --git a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
similarity index 100%
rename from Lib/test/namespace_pkgs/module_and_namespace_package/a_test.py
rename to Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
diff --git a/Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty b/Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
similarity index 100%
rename from Lib/test/namespace_pkgs/module_and_namespace_package/a_test/empty
rename to Lib/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
diff --git a/Lib/test/namespace_pkgs/nested_portion1.zip b/Lib/test/test_importlib/namespace_pkgs/nested_portion1.zip
similarity index 100%
rename from Lib/test/namespace_pkgs/nested_portion1.zip
rename to Lib/test/test_importlib/namespace_pkgs/nested_portion1.zip
diff --git a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
similarity index 100%
rename from Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
rename to Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
diff --git a/Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
similarity index 100%
rename from Lib/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py
rename to Lib/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
diff --git a/Lib/test/namespace_pkgs/portion1/foo/one.py b/Lib/test/test_importlib/namespace_pkgs/portion1/foo/one.py
similarity index 100%
rename from Lib/test/namespace_pkgs/portion1/foo/one.py
rename to Lib/test/test_importlib/namespace_pkgs/portion1/foo/one.py
diff --git a/Lib/test/namespace_pkgs/portion2/foo/two.py b/Lib/test/test_importlib/namespace_pkgs/portion2/foo/two.py
similarity index 100%
rename from Lib/test/namespace_pkgs/portion2/foo/two.py
rename to Lib/test/test_importlib/namespace_pkgs/portion2/foo/two.py
diff --git a/Lib/test/namespace_pkgs/project1/parent/child/one.py b/Lib/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
similarity index 100%
rename from Lib/test/namespace_pkgs/project1/parent/child/one.py
rename to Lib/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
diff --git a/Lib/test/namespace_pkgs/project2/parent/child/two.py b/Lib/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
similarity index 100%
rename from Lib/test/namespace_pkgs/project2/parent/child/two.py
rename to Lib/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
diff --git a/Lib/test/namespace_pkgs/project3/parent/child/three.py b/Lib/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
similarity index 100%
rename from Lib/test/namespace_pkgs/project3/parent/child/three.py
rename to Lib/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
diff --git a/Lib/test/namespace_pkgs/top_level_portion1.zip b/Lib/test/test_importlib/namespace_pkgs/top_level_portion1.zip
similarity index 100%
rename from Lib/test/namespace_pkgs/top_level_portion1.zip
rename to Lib/test/test_importlib/namespace_pkgs/top_level_portion1.zip
diff --git a/Lib/test/test_namespace_pkgs.py b/Lib/test/test_importlib/test_namespace_pkgs.py
similarity index 100%
rename from Lib/test/test_namespace_pkgs.py
rename to Lib/test/test_importlib/test_namespace_pkgs.py
diff --git a/Misc/NEWS b/Misc/NEWS
index 38928f8f688..21bd7792fcc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,8 @@ Tests
 
 - Issue #20743: Fix a reference leak in test_tcl.
 
+- Issue #21097: Move test_namespace_pkgs into test_importlib.
+
 - Issue #20939: Avoid various network test failures due to new
   redirect of http://www.python.org/ to https://www.python.org:
   use http://www.example.com instead.