diff --git a/buildtimetrend/test/dashboard_tests.py b/buildtimetrend/test/dashboard_tests.py
index 5f04cc2..8471f7b 100644
--- a/buildtimetrend/test/dashboard_tests.py
+++ b/buildtimetrend/test/dashboard_tests.py
@@ -41,7 +41,8 @@ def setUpClass(cls):
         cls.project_info = Settings().get_project_info()
         cls.maxDiff = None
 
-    def tearDown(self):
+    @staticmethod
+    def tearDown():
         """Clean up after tests"""
         if (check_file(constants.DASHBOARD_TEST_CONFIG_FILE)):
             os.remove(constants.DASHBOARD_TEST_CONFIG_FILE)
diff --git a/buildtimetrend/test/trend_test.py b/buildtimetrend/test/trend_test.py
index 8dba0b3..d8f72d0 100644
--- a/buildtimetrend/test/trend_test.py
+++ b/buildtimetrend/test/trend_test.py
@@ -37,7 +37,8 @@ def setUp(self):
         """Initialise test environment before each test."""
         self.trend = Trend()
 
-    def tearDown(self):
+    @staticmethod
+    def tearDown():
         """Clean up after tests"""
         if (tools.check_file(TEST_TREND_FILE)):
             os.remove(TEST_TREND_FILE)
diff --git a/buildtimetrend/travis/test/env_var_test.py b/buildtimetrend/travis/test/env_var_test.py
index 3c5dc14..1929e10 100644
--- a/buildtimetrend/travis/test/env_var_test.py
+++ b/buildtimetrend/travis/test/env_var_test.py
@@ -31,7 +31,8 @@ class TestTravisEnvVar(unittest.TestCase):
 
     """Unit tests for Travis CI environment variable related functions"""
 
-    def setUp(self):
+    @staticmethod
+    def setUp():
         """Initialise test environment before each test."""
         # reinit settings singleton
         Settings().__init__()