diff --git a/lib/xos-config/tests/config_test.py b/lib/xos-config/tests/test_config.py
similarity index 98%
rename from lib/xos-config/tests/config_test.py
rename to lib/xos-config/tests/test_config.py
index 1ce1ce6..bc9ad13 100644
--- a/lib/xos-config/tests/config_test.py
+++ b/lib/xos-config/tests/test_config.py
@@ -52,6 +52,10 @@
     Testing the XOS Config Module
     """
 
+    def setUp(self):
+        # In case some other testcase in nose has left config in an unclean state
+        Config.clear()
+
     def tearDown(self):
         # NOTE clear the config after each test
         Config.clear()
@@ -239,4 +243,4 @@
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()