diff --git a/psycopg2.cproj b/psycopg2.cproj
index b231848f..1640ab1d 100644
--- a/psycopg2.cproj
+++ b/psycopg2.cproj
@@ -117,13 +117,13 @@
     <None Include="ZPsycopgDA\__init__.py" />
     <None Include="ZPsycopgDA\pool.py" />
     <None Include="tests\dbapi20.py" />
-    <None Include="tests\extras_dictcursor.py" />
+    <None Include="tests\test_extras_dictcursor.py" />
     <None Include="tests\__init__.py" />
     <None Include="tests\test_psycopg2_dbapi20.py" />
     <None Include="tests\test_transaction.py" />
-    <None Include="tests\types_basic.py" />
-    <None Include="tests\bugX000.py" />
-    <None Include="tests\types_extras.py" />
+    <None Include="tests\test_types_basic.py" />
+    <None Include="tests\test_bugX000.py" />
+    <None Include="tests\test_types_extras.py" />
     <None Include="tests\test_connection.py" />
     <None Include="tests\test_dates.py" />
     <None Include="tests\test_lobject.py" />
@@ -166,7 +166,7 @@
     <None Include="doc\src\faq.rst" />
     <None Include="tests\test_async.py" />
     <None Include="tests\test_copy.py" />
-    <None Include="tests\bug_gc.py" />
+    <None Include="tests\test_bug_gc.py" />
     <None Include="tests\test_green.py" />
     <None Include="tests\test_notify.py" />
     <None Include="scripts\make_errorcodes.py" />
diff --git a/tests/__init__.py b/tests/__init__.py
index a0575270..1114a950 100755
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -27,17 +27,17 @@ import sys
 from testconfig import dsn
 from testutils import unittest
 
-import bug_gc
-import bugX000
-import extras_dictcursor
+import test_bug_gc
+import test_bugX000
+import test_extras_dictcursor
 import test_dates
 import test_psycopg2_dbapi20
 import test_quote
 import test_connection
 import test_cursor
 import test_transaction
-import types_basic
-import types_extras
+import test_types_basic
+import test_types_extras
 import test_lobject
 import test_copy
 import test_notify
@@ -58,17 +58,17 @@ def test_suite():
         cnn.close()
 
     suite = unittest.TestSuite()
-    suite.addTest(bug_gc.test_suite())
-    suite.addTest(bugX000.test_suite())
-    suite.addTest(extras_dictcursor.test_suite())
+    suite.addTest(test_bug_gc.test_suite())
+    suite.addTest(test_bugX000.test_suite())
+    suite.addTest(test_extras_dictcursor.test_suite())
     suite.addTest(test_dates.test_suite())
     suite.addTest(test_psycopg2_dbapi20.test_suite())
     suite.addTest(test_quote.test_suite())
     suite.addTest(test_connection.test_suite())
     suite.addTest(test_cursor.test_suite())
     suite.addTest(test_transaction.test_suite())
-    suite.addTest(types_basic.test_suite())
-    suite.addTest(types_extras.test_suite())
+    suite.addTest(test_types_basic.test_suite())
+    suite.addTest(test_types_extras.test_suite())
     suite.addTest(test_lobject.test_suite())
     suite.addTest(test_copy.test_suite())
     suite.addTest(test_notify.test_suite())
diff --git a/tests/bugX000.py b/tests/test_bugX000.py
similarity index 100%
rename from tests/bugX000.py
rename to tests/test_bugX000.py
diff --git a/tests/bug_gc.py b/tests/test_bug_gc.py
similarity index 100%
rename from tests/bug_gc.py
rename to tests/test_bug_gc.py
diff --git a/tests/extras_dictcursor.py b/tests/test_extras_dictcursor.py
similarity index 100%
rename from tests/extras_dictcursor.py
rename to tests/test_extras_dictcursor.py
diff --git a/tests/types_basic.py b/tests/test_types_basic.py
similarity index 100%
rename from tests/types_basic.py
rename to tests/test_types_basic.py
diff --git a/tests/types_extras.py b/tests/test_types_extras.py
similarity index 100%
rename from tests/types_extras.py
rename to tests/test_types_extras.py