16 files changed, 36 insertions, 22 deletions
diff --git a/Lib/sqlite3/test/__init__.py b/Lib/sqlite3/test/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/Lib/sqlite3/test/__init__.py
+++ /dev/null
diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py
deleted file mode 100644
index 9992a02e5d..0000000000
--- a/Lib/test/test_sqlite.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import test.support
-from test.support import import_helper
-from test.support import load_package_tests
-
-# Skip test if _sqlite3 module not installed
-import_helper.import_module('_sqlite3')
-
-import unittest
-import os
-import sqlite3.test
-
-def load_tests(loader, tests, pattern):
-    if test.support.verbose:
-        print("test_sqlite: testing with version",
-              "{!r}, sqlite_version {!r}".format(sqlite3.version,
-                                                 sqlite3.sqlite_version))
-    return load_package_tests(os.path.dirname(sqlite3.test.__file__), loader, tests, pattern)
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py
new file mode 100644
index 0000000000..099c01e3b3
--- /dev/null
+++ b/Lib/test/test_sqlite3/__init__.py
@@ -0,0 +1,18 @@
+from test.support import import_helper, load_package_tests, verbose
+
+# Skip test if _sqlite3 module not installed.
+import_helper.import_module('_sqlite3')
+
+import unittest
+import os
+import sqlite3
+
+# Implement the unittest "load tests" protocol.
+def load_tests(*args):
+    pkg_dir = os.path.dirname(__file__)
+    return load_package_tests(pkg_dir, *args)
+
+if verbose:
+    print("test_sqlite3: testing with version",
+          "{!r}, sqlite_version {!r}".format(sqlite3.version,
+                                             sqlite3.sqlite_version))
diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py
new file mode 100644
index 0000000000..51eddc3c2f
--- /dev/null
+++ b/Lib/test/test_sqlite3/__main__.py
@@ -0,0 +1,5 @@
+from test.test_sqlite3 import load_tests  # Needed for the "load tests" protocol.
+import unittest
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/Lib/sqlite3/test/test_backup.py b/Lib/test/test_sqlite3/test_backup.py
index 384dd9229a..384dd9229a 100644
--- a/Lib/sqlite3/test/test_backup.py
+++ b/Lib/test/test_sqlite3/test_backup.py
diff --git a/Lib/sqlite3/test/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py
index d82543663d..d82543663d 100644
--- a/Lib/sqlite3/test/test_dbapi.py
+++ b/Lib/test/test_sqlite3/test_dbapi.py
diff --git a/Lib/sqlite3/test/test_dump.py b/Lib/test/test_sqlite3/test_dump.py
index 1f14c620f0..1f14c620f0 100644
--- a/Lib/sqlite3/test/test_dump.py
+++ b/Lib/test/test_sqlite3/test_dump.py
diff --git a/Lib/sqlite3/test/test_factory.py b/Lib/test/test_sqlite3/test_factory.py
index 420855ba34..420855ba34 100644
--- a/Lib/sqlite3/test/test_factory.py
+++ b/Lib/test/test_sqlite3/test_factory.py
diff --git a/Lib/sqlite3/test/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py
index bf454b2aa8..bf454b2aa8 100644
--- a/Lib/sqlite3/test/test_hooks.py
+++ b/Lib/test/test_sqlite3/test_hooks.py
diff --git a/Lib/sqlite3/test/test_regression.py b/Lib/test/test_sqlite3/test_regression.py
index 3d71809d9c..3d71809d9c 100644
--- a/Lib/sqlite3/test/test_regression.py
+++ b/Lib/test/test_sqlite3/test_regression.py
diff --git a/Lib/sqlite3/test/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py
index 8ea352b9ef..8ea352b9ef 100644
--- a/Lib/sqlite3/test/test_transactions.py
+++ b/Lib/test/test_sqlite3/test_transactions.py
diff --git a/Lib/sqlite3/test/test_types.py b/Lib/test/test_sqlite3/test_types.py
index 0cfb72c5f0..0cfb72c5f0 100644
--- a/Lib/sqlite3/test/test_types.py
+++ b/Lib/test/test_sqlite3/test_types.py
diff --git a/Lib/sqlite3/test/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py
index ad408475b7..ad408475b7 100644
--- a/Lib/sqlite3/test/test_userfunctions.py
+++ b/Lib/test/test_sqlite3/test_userfunctions.py
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 322800ae26..7c3c046f71 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1562,7 +1562,6 @@ TESTSUBDIRS=	ctypes/test \
 		lib2to3/tests/data \
 		lib2to3/tests/data/fixers \
 		lib2to3/tests/data/fixers/myfixes \
-		sqlite3/test \
 		test test/audiodata \
 		test/capath test/cjkencodings \
 		test/data test/decimaltestdata \
diff --git a/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst b/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst
new file mode 100644
index 0000000000..45f44bcbb1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst
@@ -0,0 +1,2 @@
+Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E.
+Aasland.
diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index 06e0a8b0d1..43c570f1da 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1272,7 +1272,17 @@
     <Compile Include="test\test_sort.py" />
     <Compile Include="test\test_source_encoding.py" />
     <Compile Include="test\test_spwd.py" />
-    <Compile Include="test\test_sqlite.py" />
+    <Compile Include="test\test_sqlite3" />
+    <Compile Include="test\test_sqlite3\__init__.py" />
+    <Compile Include="test\test_sqlite3\test_backup.py" />
+    <Compile Include="test\test_sqlite3\test_dbapi.py" />
+    <Compile Include="test\test_sqlite3\test_dump.py" />
+    <Compile Include="test\test_sqlite3\test_factory.py" />
+    <Compile Include="test\test_sqlite3\test_hooks.py" />
+    <Compile Include="test\test_sqlite3\test_regression.py" />
+    <Compile Include="test\test_sqlite3\test_transactions.py" />
+    <Compile Include="test\test_sqlite3\test_types.py" />
+    <Compile Include="test\test_sqlite3\test_userfunctions.py" />
     <Compile Include="test\test_ssl.py" />
     <Compile Include="test\test_startfile.py" />
     <Compile Include="test\test_stat.py" />