diff --git a/tools/test-runner b/tools/test-runner
index a9b13aa8..28dd96d9 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -497,6 +497,8 @@ class Namespace:
 			print("Killing process %s" % p.name)
 			self.stop_process(p)
 
+		os.remove(self.dbus_address.split('=')[1])
+
 	def __del__(self):
 		print("Removing namespace %s" % self.name)
 		self.reset()
@@ -1168,6 +1170,10 @@ def run_auto_tests(ctx, args):
 		finally:
 			post_test(ctx, copied)
 
+	shutil.rmtree('/tmp/certs')
+	shutil.rmtree('/tmp/secrets')
+	os.remove('/tmp/phonesim.conf')
+
 	# Write out kernel log
 	if ctx.args.log:
 		Process(["dmesg"], ctx=ctx, wait=True)