diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index 8bd16f80e..ad021606c 100755
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -36,7 +36,10 @@ def reset_devs(dev, apdev):
 
     try:
         wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
-        wpas.interface_remove("wlan5")
+        ifaces = wpas.global_request("INTERFACES").splitlines()
+        for iface in ifaces:
+            if iface.startswith("wlan"):
+                wpas.interface_remove(iface)
     except Exception, e:
         pass