diff --git a/MySQLdb/MANIFEST.in b/MySQLdb/MANIFEST.in
index 0b78a83..9a8a4d5 100644
--- a/MySQLdb/MANIFEST.in
+++ b/MySQLdb/MANIFEST.in
@@ -1,14 +1,11 @@
 recursive-include doc *.txt
+recursive-include tests *.py
 include MANIFEST.in
 include MANIFEST
 include ChangeLog
 include HISTORY
 include GPL
 include pymemcompat.h
-include dbapi20.py
-include test_MySQLdb_dbapi20.py
-include test_capabilities.py
-include test_MySQLdb_capabilities.py
 include metadata.cfg
 include site.cfg
 include setup_common.py
diff --git a/MySQLdb/capabilities.py b/MySQLdb/tests/capabilities.py
similarity index 100%
rename from MySQLdb/capabilities.py
rename to MySQLdb/tests/capabilities.py
diff --git a/MySQLdb/dbapi20.py b/MySQLdb/tests/dbapi20.py
similarity index 100%
rename from MySQLdb/dbapi20.py
rename to MySQLdb/tests/dbapi20.py
diff --git a/MySQLdb/test_MySQLdb_capabilities.py b/MySQLdb/tests/test_MySQLdb_capabilities.py
similarity index 100%
rename from MySQLdb/test_MySQLdb_capabilities.py
rename to MySQLdb/tests/test_MySQLdb_capabilities.py
diff --git a/MySQLdb/test_MySQLdb_dbapi20.py b/MySQLdb/tests/test_MySQLdb_dbapi20.py
similarity index 100%
rename from MySQLdb/test_MySQLdb_dbapi20.py
rename to MySQLdb/tests/test_MySQLdb_dbapi20.py