diff --git a/pywb/cdx/test/cdxserver_test.py b/pywb/cdx/test/test_cdxserver.py
similarity index 100%
rename from pywb/cdx/test/cdxserver_test.py
rename to pywb/cdx/test/test_cdxserver.py
diff --git a/pywb/cdx/test/zipnum_test.py b/pywb/cdx/test/test_zipnum.py
similarity index 97%
rename from pywb/cdx/test/zipnum_test.py
rename to pywb/cdx/test/test_zipnum.py
index 7c98309a..3b1de326 100644
--- a/pywb/cdx/test/zipnum_test.py
+++ b/pywb/cdx/test/test_zipnum.py
@@ -23,14 +23,11 @@ org,iana)/domains/root/servers 20140126201227 http://www.iana.org/domains/root/s
 
 """
 
-
-
-
-from cdxserver_test import cdx_ops_test
-
+from test_cdxserver import cdx_ops_test
 from pywb import get_test_dir
+
+
 test_zipnum = get_test_dir() + 'zipcdx/zipnum-sample.idx'
-print test_zipnum
 
 def zip_ops_test(url, **kwargs):
     sources = test_zipnum
@@ -40,5 +37,3 @@ def zip_ops_test(url, **kwargs):
 if __name__ == "__main__":
     import doctest
     doctest.testmod()
-
-
diff --git a/pywb/utils/test/binsearch_test.py b/pywb/utils/test/test_binsearch.py
similarity index 100%
rename from pywb/utils/test/binsearch_test.py
rename to pywb/utils/test/test_binsearch.py
diff --git a/pywb/utils/test/loaders_test.py b/pywb/utils/test/test_loaders.py
similarity index 100%
rename from pywb/utils/test/loaders_test.py
rename to pywb/utils/test/test_loaders.py
diff --git a/pywb/utils/test/statusandheaders_test.py b/pywb/utils/test/test_statusandheaders.py
similarity index 100%
rename from pywb/utils/test/statusandheaders_test.py
rename to pywb/utils/test/test_statusandheaders.py