diff --git a/tests/pam/test_pam_fprintd.py b/tests/pam/test_pam_fprintd.py
index e3cfb1e..cad210e 100755
--- a/tests/pam/test_pam_fprintd.py
+++ b/tests/pam/test_pam_fprintd.py
@@ -18,7 +18,9 @@ import subprocess
 import dbus
 import dbusmock
 import fcntl
+import glob
 import os
+import shutil
 import time
 import pypamtest
 
@@ -68,6 +70,9 @@ class TestPamFprintd(dbusmock.DBusTestCase):
     def tearDownClass(klass):
         klass.stop_monitor()
 
+        # Remove pam wrapper files, as they may break other tests
+        [shutil.rmtree(i) for i in glob.glob('/tmp/pam.[0-9A-z]')]
+
     def setUp(self):
         (self.p_mock, self.obj_fprintd_manager) = self.spawn_server_template(
             self.template_name, {}, stdout=subprocess.PIPE)