diff --git a/tools/test-runner b/tools/test-runner
index 4e06df84..62653de7 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -546,6 +546,9 @@ class Hostapd:
 			print("Failed to remove %s" % self.global_ctrl_iface)
 
 		for hapd in self.instances:
+			if not hapd.cli:
+				continue
+
 			hapd.cli._instances[hapd.config] = None
 			hapd.cli = None