diff --git a/tests/hwsim/run-p2p-tests.py b/tests/hwsim/run-p2p-tests.py
index 4c252454e..4f97b69ec 100755
--- a/tests/hwsim/run-p2p-tests.py
+++ b/tests/hwsim/run-p2p-tests.py
@@ -70,6 +70,10 @@ def main():
         for d in dev:
             d.request("NOTE TEST-STOP " + t.__name__)
 
+    if not test_filter:
+        for d in dev:
+            d.reset()
+
     print "passed tests: " + str(passed)
     print "failed tests: " + str(failed)
     if len(failed):