diff --git a/certbot/tests/plugins/__init__.py b/certbot/tests/plugins/__init__.py
new file mode 100644
index 000000000..3cfcb5008
--- /dev/null
+++ b/certbot/tests/plugins/__init__.py
@@ -0,0 +1 @@
+"""Certbot Plugins Tests"""
diff --git a/certbot/certbot/plugins/common_test.py b/certbot/tests/plugins/common_test.py
similarity index 100%
rename from certbot/certbot/plugins/common_test.py
rename to certbot/tests/plugins/common_test.py
diff --git a/certbot/certbot/plugins/disco_test.py b/certbot/tests/plugins/disco_test.py
similarity index 100%
rename from certbot/certbot/plugins/disco_test.py
rename to certbot/tests/plugins/disco_test.py
diff --git a/certbot/certbot/plugins/dns_common_lexicon_test.py b/certbot/tests/plugins/dns_common_lexicon_test.py
similarity index 100%
rename from certbot/certbot/plugins/dns_common_lexicon_test.py
rename to certbot/tests/plugins/dns_common_lexicon_test.py
diff --git a/certbot/certbot/plugins/dns_common_test.py b/certbot/tests/plugins/dns_common_test.py
similarity index 100%
rename from certbot/certbot/plugins/dns_common_test.py
rename to certbot/tests/plugins/dns_common_test.py
diff --git a/certbot/certbot/plugins/enhancements_test.py b/certbot/tests/plugins/enhancements_test.py
similarity index 100%
rename from certbot/certbot/plugins/enhancements_test.py
rename to certbot/tests/plugins/enhancements_test.py
diff --git a/certbot/certbot/plugins/manual_test.py b/certbot/tests/plugins/manual_test.py
similarity index 100%
rename from certbot/certbot/plugins/manual_test.py
rename to certbot/tests/plugins/manual_test.py
diff --git a/certbot/certbot/plugins/null_test.py b/certbot/tests/plugins/null_test.py
similarity index 100%
rename from certbot/certbot/plugins/null_test.py
rename to certbot/tests/plugins/null_test.py
diff --git a/certbot/certbot/plugins/selection_test.py b/certbot/tests/plugins/selection_test.py
similarity index 100%
rename from certbot/certbot/plugins/selection_test.py
rename to certbot/tests/plugins/selection_test.py
diff --git a/certbot/certbot/plugins/standalone_test.py b/certbot/tests/plugins/standalone_test.py
similarity index 100%
rename from certbot/certbot/plugins/standalone_test.py
rename to certbot/tests/plugins/standalone_test.py
diff --git a/certbot/certbot/plugins/storage_test.py b/certbot/tests/plugins/storage_test.py
similarity index 100%
rename from certbot/certbot/plugins/storage_test.py
rename to certbot/tests/plugins/storage_test.py
diff --git a/certbot/certbot/plugins/util_test.py b/certbot/tests/plugins/util_test.py
similarity index 100%
rename from certbot/certbot/plugins/util_test.py
rename to certbot/tests/plugins/util_test.py
diff --git a/certbot/certbot/plugins/webroot_test.py b/certbot/tests/plugins/webroot_test.py
similarity index 100%
rename from certbot/certbot/plugins/webroot_test.py
rename to certbot/tests/plugins/webroot_test.py