diff --git a/test/test_config.py b/test/test_config.py
index 48f9b9a32f..03b7c12398 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -47,7 +47,6 @@ def setUp(self):
 
         self.configpath = os.path.join(self.tmp_directory, 'test.ini')
         shutil.copy(os.path.join('test', 'data', 'test.ini'), self.configpath)
-        self.addCleanup(os.remove, self.configpath)
 
         self.config = Config.from_file(None, self.configpath)
         self.addCleanup(self.cleanup_config_obj)
@@ -61,6 +60,7 @@ def cleanup_config_obj(self):
         self.config.sync()
         del self.config
         self.config = None
+        os.remove(self.configpath)
 
 
 class TestPicardConfig(TestPicardConfigCommon):
diff --git a/test/test_profiles.py b/test/test_profiles.py
index 7d6a0f0428..a6edb5c7b0 100644
--- a/test/test_profiles.py
+++ b/test/test_profiles.py
@@ -58,7 +58,6 @@ def setUp(self):
 
         self.configpath = os.path.join(self.tmp_directory, 'test.ini')
         shutil.copy(os.path.join('test', 'data', 'test.ini'), self.configpath)
-        self.addCleanup(os.remove, self.configpath)
 
         self.config = Config.from_file(None, self.configpath)
         self.addCleanup(self.cleanup_config_obj)
@@ -94,6 +93,7 @@ def cleanup_config_obj(self):
         self.config.sync()
         del self.config
         self.config = None
+        os.remove(self.configpath)
 
     def get_profiles(self, enabled=True):
         profiles = []