diff --git a/certbot/MANIFEST.in b/certbot/MANIFEST.in
index abb8e854d..6214bfe95 100644
--- a/certbot/MANIFEST.in
+++ b/certbot/MANIFEST.in
@@ -4,7 +4,6 @@ include LICENSE.txt
 recursive-include docs *
 recursive-include examples *
 recursive-include certbot/tests/testdata *
-recursive-include tests *.py
 include certbot/ssl-dhparams.pem
 include certbot/py.typed
 global-exclude __pycache__
diff --git a/certbot/certbot/_internal/tests/__init__.py b/certbot/certbot/_internal/tests/__init__.py
new file mode 100644
index 000000000..5b3aa04ab
--- /dev/null
+++ b/certbot/certbot/_internal/tests/__init__.py
@@ -0,0 +1 @@
+"""certbot tests"""
diff --git a/certbot/tests/account_test.py b/certbot/certbot/_internal/tests/account_test.py
similarity index 100%
rename from certbot/tests/account_test.py
rename to certbot/certbot/_internal/tests/account_test.py
diff --git a/certbot/tests/auth_handler_test.py b/certbot/certbot/_internal/tests/auth_handler_test.py
similarity index 100%
rename from certbot/tests/auth_handler_test.py
rename to certbot/certbot/_internal/tests/auth_handler_test.py
diff --git a/certbot/tests/cert_manager_test.py b/certbot/certbot/_internal/tests/cert_manager_test.py
similarity index 99%
rename from certbot/tests/cert_manager_test.py
rename to certbot/certbot/_internal/tests/cert_manager_test.py
index caacc520f..c8483efa7 100644
--- a/certbot/tests/cert_manager_test.py
+++ b/certbot/certbot/_internal/tests/cert_manager_test.py
@@ -14,11 +14,11 @@ import pytest
 from certbot import configuration
 from certbot import errors
 from certbot._internal.storage import ALL_FOUR
+from certbot._internal.tests import storage_test
 from certbot.compat import filesystem
 from certbot.compat import os
 from certbot.display import util as display_util
 from certbot.tests import util as test_util
-import storage_test
 
 
 class BaseCertManagerTest(test_util.ConfigTestCase):
diff --git a/certbot/tests/cli_test.py b/certbot/certbot/_internal/tests/cli_test.py
similarity index 100%
rename from certbot/tests/cli_test.py
rename to certbot/certbot/_internal/tests/cli_test.py
diff --git a/certbot/tests/client_test.py b/certbot/certbot/_internal/tests/client_test.py
similarity index 100%
rename from certbot/tests/client_test.py
rename to certbot/certbot/_internal/tests/client_test.py
diff --git a/certbot/tests/compat/__init__.py b/certbot/certbot/_internal/tests/compat/__init__.py
similarity index 100%
rename from certbot/tests/compat/__init__.py
rename to certbot/certbot/_internal/tests/compat/__init__.py
diff --git a/certbot/tests/compat/filesystem_test.py b/certbot/certbot/_internal/tests/compat/filesystem_test.py
similarity index 100%
rename from certbot/tests/compat/filesystem_test.py
rename to certbot/certbot/_internal/tests/compat/filesystem_test.py
diff --git a/certbot/tests/compat/misc_test.py b/certbot/certbot/_internal/tests/compat/misc_test.py
similarity index 100%
rename from certbot/tests/compat/misc_test.py
rename to certbot/certbot/_internal/tests/compat/misc_test.py
diff --git a/certbot/tests/compat/os_test.py b/certbot/certbot/_internal/tests/compat/os_test.py
similarity index 100%
rename from certbot/tests/compat/os_test.py
rename to certbot/certbot/_internal/tests/compat/os_test.py
diff --git a/certbot/tests/configuration_test.py b/certbot/certbot/_internal/tests/configuration_test.py
similarity index 100%
rename from certbot/tests/configuration_test.py
rename to certbot/certbot/_internal/tests/configuration_test.py
diff --git a/certbot/tests/conftest.py b/certbot/certbot/_internal/tests/conftest.py
similarity index 100%
rename from certbot/tests/conftest.py
rename to certbot/certbot/_internal/tests/conftest.py
diff --git a/certbot/tests/crypto_util_test.py b/certbot/certbot/_internal/tests/crypto_util_test.py
similarity index 100%
rename from certbot/tests/crypto_util_test.py
rename to certbot/certbot/_internal/tests/crypto_util_test.py
diff --git a/certbot/tests/display/__init__.py b/certbot/certbot/_internal/tests/display/__init__.py
similarity index 100%
rename from certbot/tests/display/__init__.py
rename to certbot/certbot/_internal/tests/display/__init__.py
diff --git a/certbot/tests/display/completer_test.py b/certbot/certbot/_internal/tests/display/completer_test.py
similarity index 100%
rename from certbot/tests/display/completer_test.py
rename to certbot/certbot/_internal/tests/display/completer_test.py
diff --git a/certbot/tests/display/internal_util_test.py b/certbot/certbot/_internal/tests/display/internal_util_test.py
similarity index 100%
rename from certbot/tests/display/internal_util_test.py
rename to certbot/certbot/_internal/tests/display/internal_util_test.py
diff --git a/certbot/tests/display/obj_test.py b/certbot/certbot/_internal/tests/display/obj_test.py
similarity index 100%
rename from certbot/tests/display/obj_test.py
rename to certbot/certbot/_internal/tests/display/obj_test.py
diff --git a/certbot/tests/display/ops_test.py b/certbot/certbot/_internal/tests/display/ops_test.py
similarity index 100%
rename from certbot/tests/display/ops_test.py
rename to certbot/certbot/_internal/tests/display/ops_test.py
diff --git a/certbot/tests/display/util_test.py b/certbot/certbot/_internal/tests/display/util_test.py
similarity index 100%
rename from certbot/tests/display/util_test.py
rename to certbot/certbot/_internal/tests/display/util_test.py
diff --git a/certbot/tests/eff_test.py b/certbot/certbot/_internal/tests/eff_test.py
similarity index 100%
rename from certbot/tests/eff_test.py
rename to certbot/certbot/_internal/tests/eff_test.py
diff --git a/certbot/tests/error_handler_test.py b/certbot/certbot/_internal/tests/error_handler_test.py
similarity index 100%
rename from certbot/tests/error_handler_test.py
rename to certbot/certbot/_internal/tests/error_handler_test.py
diff --git a/certbot/tests/errors_test.py b/certbot/certbot/_internal/tests/errors_test.py
similarity index 100%
rename from certbot/tests/errors_test.py
rename to certbot/certbot/_internal/tests/errors_test.py
diff --git a/certbot/tests/helpful_test.py b/certbot/certbot/_internal/tests/helpful_test.py
similarity index 100%
rename from certbot/tests/helpful_test.py
rename to certbot/certbot/_internal/tests/helpful_test.py
diff --git a/certbot/tests/hook_test.py b/certbot/certbot/_internal/tests/hook_test.py
similarity index 100%
rename from certbot/tests/hook_test.py
rename to certbot/certbot/_internal/tests/hook_test.py
diff --git a/certbot/tests/lock_test.py b/certbot/certbot/_internal/tests/lock_test.py
similarity index 100%
rename from certbot/tests/lock_test.py
rename to certbot/certbot/_internal/tests/lock_test.py
diff --git a/certbot/tests/log_test.py b/certbot/certbot/_internal/tests/log_test.py
similarity index 100%
rename from certbot/tests/log_test.py
rename to certbot/certbot/_internal/tests/log_test.py
diff --git a/certbot/tests/main_test.py b/certbot/certbot/_internal/tests/main_test.py
similarity index 100%
rename from certbot/tests/main_test.py
rename to certbot/certbot/_internal/tests/main_test.py
diff --git a/certbot/tests/ocsp_test.py b/certbot/certbot/_internal/tests/ocsp_test.py
similarity index 100%
rename from certbot/tests/ocsp_test.py
rename to certbot/certbot/_internal/tests/ocsp_test.py
diff --git a/certbot/tests/plugins/__init__.py b/certbot/certbot/_internal/tests/plugins/__init__.py
similarity index 100%
rename from certbot/tests/plugins/__init__.py
rename to certbot/certbot/_internal/tests/plugins/__init__.py
diff --git a/certbot/tests/plugins/common_test.py b/certbot/certbot/_internal/tests/plugins/common_test.py
similarity index 100%
rename from certbot/tests/plugins/common_test.py
rename to certbot/certbot/_internal/tests/plugins/common_test.py
diff --git a/certbot/tests/plugins/disco_test.py b/certbot/certbot/_internal/tests/plugins/disco_test.py
similarity index 100%
rename from certbot/tests/plugins/disco_test.py
rename to certbot/certbot/_internal/tests/plugins/disco_test.py
diff --git a/certbot/tests/plugins/dns_common_lexicon_test.py b/certbot/certbot/_internal/tests/plugins/dns_common_lexicon_test.py
similarity index 100%
rename from certbot/tests/plugins/dns_common_lexicon_test.py
rename to certbot/certbot/_internal/tests/plugins/dns_common_lexicon_test.py
diff --git a/certbot/tests/plugins/dns_common_test.py b/certbot/certbot/_internal/tests/plugins/dns_common_test.py
similarity index 100%
rename from certbot/tests/plugins/dns_common_test.py
rename to certbot/certbot/_internal/tests/plugins/dns_common_test.py
diff --git a/certbot/tests/plugins/enhancements_test.py b/certbot/certbot/_internal/tests/plugins/enhancements_test.py
similarity index 100%
rename from certbot/tests/plugins/enhancements_test.py
rename to certbot/certbot/_internal/tests/plugins/enhancements_test.py
diff --git a/certbot/tests/plugins/manual_test.py b/certbot/certbot/_internal/tests/plugins/manual_test.py
similarity index 100%
rename from certbot/tests/plugins/manual_test.py
rename to certbot/certbot/_internal/tests/plugins/manual_test.py
diff --git a/certbot/tests/plugins/null_test.py b/certbot/certbot/_internal/tests/plugins/null_test.py
similarity index 100%
rename from certbot/tests/plugins/null_test.py
rename to certbot/certbot/_internal/tests/plugins/null_test.py
diff --git a/certbot/tests/plugins/selection_test.py b/certbot/certbot/_internal/tests/plugins/selection_test.py
similarity index 100%
rename from certbot/tests/plugins/selection_test.py
rename to certbot/certbot/_internal/tests/plugins/selection_test.py
diff --git a/certbot/tests/plugins/standalone_test.py b/certbot/certbot/_internal/tests/plugins/standalone_test.py
similarity index 100%
rename from certbot/tests/plugins/standalone_test.py
rename to certbot/certbot/_internal/tests/plugins/standalone_test.py
diff --git a/certbot/tests/plugins/storage_test.py b/certbot/certbot/_internal/tests/plugins/storage_test.py
similarity index 100%
rename from certbot/tests/plugins/storage_test.py
rename to certbot/certbot/_internal/tests/plugins/storage_test.py
diff --git a/certbot/tests/plugins/util_test.py b/certbot/certbot/_internal/tests/plugins/util_test.py
similarity index 100%
rename from certbot/tests/plugins/util_test.py
rename to certbot/certbot/_internal/tests/plugins/util_test.py
diff --git a/certbot/tests/plugins/webroot_test.py b/certbot/certbot/_internal/tests/plugins/webroot_test.py
similarity index 100%
rename from certbot/tests/plugins/webroot_test.py
rename to certbot/certbot/_internal/tests/plugins/webroot_test.py
diff --git a/certbot/tests/renewal_test.py b/certbot/certbot/_internal/tests/renewal_test.py
similarity index 100%
rename from certbot/tests/renewal_test.py
rename to certbot/certbot/_internal/tests/renewal_test.py
diff --git a/certbot/tests/renewupdater_test.py b/certbot/certbot/_internal/tests/renewupdater_test.py
similarity index 100%
rename from certbot/tests/renewupdater_test.py
rename to certbot/certbot/_internal/tests/renewupdater_test.py
diff --git a/certbot/tests/reverter_test.py b/certbot/certbot/_internal/tests/reverter_test.py
similarity index 100%
rename from certbot/tests/reverter_test.py
rename to certbot/certbot/_internal/tests/reverter_test.py
diff --git a/certbot/tests/storage_test.py b/certbot/certbot/_internal/tests/storage_test.py
similarity index 100%
rename from certbot/tests/storage_test.py
rename to certbot/certbot/_internal/tests/storage_test.py
diff --git a/certbot/tests/util_test.py b/certbot/certbot/_internal/tests/util_test.py
similarity index 100%
rename from certbot/tests/util_test.py
rename to certbot/certbot/_internal/tests/util_test.py