diff --git a/tests/usbprotocol/test.sh b/tests/usbprotocol/test.sh
index b4c32166b9..5b7b310288 100755
--- a/tests/usbprotocol/test.sh
+++ b/tests/usbprotocol/test.sh
@@ -2,7 +2,9 @@
 set -e
 
 # Loops over all HW_TYPEs, see board/boards/board_declarations.h
-for hw_type in {0..7}; do
-  echo "Testing HW_TYPE: $hw_type"
-  HW_TYPE=$hw_type python3 -m unittest discover .
+for hw_type in {0..50}; do
+  for hw_type in {0..7}; do
+    echo "Testing HW_TYPE: $hw_type"
+    HW_TYPE=$hw_type python3 -m unittest discover .
+  done
 done
diff --git a/tests/usbprotocol/test_comms.py b/tests/usbprotocol/test_comms.py
index e649bdaeab..0296ef15f8 100755
--- a/tests/usbprotocol/test_comms.py
+++ b/tests/usbprotocol/test_comms.py
@@ -101,8 +101,6 @@ def test_comms_reset_tx(self):
 
 
   def test_can_send_usb(self):
-    lpp.set_safety_hooks(Panda.SAFETY_ALLOUTPUT, 0)
-
     for bus in range(3):
       with self.subTest(bus=bus):
         for _ in range(100):