diff --git a/tests/fprintd.py b/tests/fprintd.py
index 817b777..c11e9da 100755
--- a/tests/fprintd.py
+++ b/tests/fprintd.py
@@ -256,12 +256,10 @@ class FPrintdTest(dbusmock.DBusTestCase):
 
     def setUp(self):
         self.test_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.test_dir)
         self.state_dir = os.path.join(self.test_dir, 'state')
         self.run_dir = os.path.join(self.test_dir, 'run')
 
-    def tearDown(self):
-        shutil.rmtree(self.test_dir)
-
     # From libfprint tests
     def send_retry(self, retry_error=1):
         # The default (1) is too-short