diff --git a/tools/test-runner b/tools/test-runner
index 412998ba..7c1498d0 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -1179,6 +1179,10 @@ def post_test(ctx, to_copy):
 	finally:
 		ctx.stop_test_processes()
 
+	allowed = ['phonesim.conf', 'certs', 'secrets', 'iwd']
+	for f in [f for f in os.listdir('/tmp') if f not in allowed]:
+		dbg("File %s was not cleaned up!" % f)
+
 	if ctx.args.valgrind:
 		with open('/tmp/valgrind.log', 'r') as f:
 				dbg(f.read())
@@ -1274,6 +1278,7 @@ def run_auto_tests(ctx, args):
 		finally:
 			post_test(ctx, copied)
 
+	shutil.rmtree('/tmp/iwd')
 	shutil.rmtree('/tmp/certs')
 	shutil.rmtree('/tmp/secrets')
 	os.remove('/tmp/phonesim.conf')