diff --git a/mis_builder/tests/__init__.py b/mis_builder/tests/__init__.py
index 2b27a91a..17feb6ea 100644
--- a/mis_builder/tests/__init__.py
+++ b/mis_builder/tests/__init__.py
@@ -22,13 +22,13 @@
 #
 ##############################################################################
 
-from . import mis_builder_test
+from . import test_mis_builder
 
 fast_suite = [
 ]
 
 checks = [
-    mis_builder_test,
+    test_mis_builder,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/mis_builder/tests/mis_builder_test.py b/mis_builder/tests/test_mis_builder.py
similarity index 97%
rename from mis_builder/tests/mis_builder_test.py
rename to mis_builder/tests/test_mis_builder.py
index 7730e57c..2a70aafb 100644
--- a/mis_builder/tests/mis_builder_test.py
+++ b/mis_builder/tests/test_mis_builder.py
@@ -33,10 +33,10 @@ DB = common.DB
 ADMIN_USER_ID = common.ADMIN_USER_ID
 
 
-class mis_builder_test(common.TransactionCase):
+class test_mis_builder(common.TransactionCase):
 
     def setUp(self):
-        super(mis_builder_test, self).setUp()
+        super(test_mis_builder, self).setUp()
 
     def test_datetime_conversion(self):
         date_to_convert = '2014-07-05'