diff --git a/client/shared/logging_manager_test.py b/client/shared/logging_manager_unittest.py
similarity index 100%
rename from client/shared/logging_manager_test.py
rename to client/shared/logging_manager_unittest.py
diff --git a/frontend/afe/models_test.py b/frontend/afe/models_unittest.py
similarity index 100%
rename from frontend/afe/models_test.py
rename to frontend/afe/models_unittest.py
diff --git a/frontend/afe/resources_test.py b/frontend/afe/resources_unittest.py
similarity index 100%
rename from frontend/afe/resources_test.py
rename to frontend/afe/resources_unittest.py
diff --git a/frontend/tko/resources_test.py b/frontend/tko/resources_unittest.py
similarity index 100%
rename from frontend/tko/resources_test.py
rename to frontend/tko/resources_unittest.py
diff --git a/scheduler/monitor_db_cleanup_test.py b/scheduler/monitor_db_cleanup_unittest.py
similarity index 100%
rename from scheduler/monitor_db_cleanup_test.py
rename to scheduler/monitor_db_cleanup_unittest.py
diff --git a/scheduler/monitor_db_functional_test.py b/scheduler/monitor_db_functional_unittest.py
similarity index 100%
rename from scheduler/monitor_db_functional_test.py
rename to scheduler/monitor_db_functional_unittest.py
diff --git a/server/hosts/monitors/console_patterns_test.py b/server/hosts/monitors/console_patterns_unittest.py
similarity index 100%
rename from server/hosts/monitors/console_patterns_test.py
rename to server/hosts/monitors/console_patterns_unittest.py
diff --git a/server/self-test/autotest_test.py b/server/self-test/autotest_unittest.py
similarity index 100%
rename from server/self-test/autotest_test.py
rename to server/self-test/autotest_unittest.py
diff --git a/server/self-test/utils_test.py b/server/self-test/utils_unittest.py
similarity index 100%
rename from server/self-test/utils_test.py
rename to server/self-test/utils_unittest.py
diff --git a/utils/coverage_suite.py b/utils/coverage_suite.py
index d93a5097ed..546825bf7d 100755
--- a/utils/coverage_suite.py
+++ b/utils/coverage_suite.py
@@ -36,7 +36,7 @@ def is_valid_directory(dirpath):
 
 
 def is_test_filename(filename):
-    return (filename.endswith('_unittest.py') or filename.endswith('_test.py'))
+    return filename.endswith('_unittest.py')
 
 
 def is_valid_filename(f):
diff --git a/utils/unittest_suite.py b/utils/unittest_suite.py
index 70383f51fd..b511e8c876 100755
--- a/utils/unittest_suite.py
+++ b/utils/unittest_suite.py
@@ -24,19 +24,19 @@
 
 REQUIRES_DJANGO = set((
         'monitor_db_unittest.py',
-        'monitor_db_functional_test.py',
-        'monitor_db_cleanup_test.py',
+        'monitor_db_functional_unittest.py',
+        'monitor_db_cleanup_unittest.py',
         'frontend_unittest.py',
         'csv_encoder_unittest.py',
         'rpc_interface_unittest.py',
-        'models_test.py',
+        'models_unittest.py',
         'scheduler_models_unittest.py',
         'metahost_scheduler_unittest.py',
         'site_metahost_scheduler_unittest.py',
         'rpc_utils_unittest.py',
         'site_rpc_utils_unittest.py',
         'execution_engine_unittest.py',
-        'service_proxy_lib_test.py',
+        'service_proxy_lib_unittest.py',
         ))
 
 REQUIRES_MYSQLDB = set((
@@ -49,7 +49,7 @@
         ))
 
 REQUIRES_SIMPLEJSON = set((
-        'resources_test.py',
+        'resources_unittest.py',
         'serviceHandler_unittest.py',
         ))
 
@@ -57,29 +57,19 @@
     'trigger_unittest.py',
     ))
 
-REQUIRES_HTTPLIB2 = set((
-        ))
-
 REQUIRES_PROTOBUFS = set((
         'job_serializer_unittest.py',
         ))
 
 LONG_RUNTIME = set((
     'base_barrier_unittest.py',
-    'logging_manager_test.py',
-    ))
-
-# This particular KVM autotest test is not a unittest
-SKIP = set((
-    'guest_test.py',
-    'dd_test.py',
+    'logging_manager_unittest.py',
     ))
 
 LONG_TESTS = (REQUIRES_DJANGO |
               REQUIRES_MYSQLDB |
               REQUIRES_GWT |
               REQUIRES_SIMPLEJSON |
-              REQUIRES_HTTPLIB2 |
               REQUIRES_AUTH |
               REQUIRES_PROTOBUFS |
               LONG_RUNTIME)
@@ -117,7 +107,7 @@ def run_test(mod_names, options):
 def scan_for_modules(start, options):
     modules = []
 
-    skip_tests = SKIP
+    skip_tests = []
     if options.skip_tests:
         skip_tests.update(options.skip_tests.split())
 
@@ -136,7 +126,7 @@ def scan_for_modules(start, options):
 
         # Look for unittest files.
         for fname in filenames:
-            if fname.endswith('_unittest.py') or fname.endswith('_test.py'):
+            if fname.endswith('_unittest.py'):
                 if not options.full and fname in LONG_TESTS:
                     continue
                 if fname in skip_tests: