diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 9893603e3..51f34cf14 100755
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+errors=0
 ./start-p2p.sh
-./run-p2p-tests.py
+./run-p2p-tests.py || errors=1
 ./stop-wifi.sh
+if [ $errors -gt 0 ]; then
+    exit 1
+fi