diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index eb379cac91..1e9f29bdb8 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -249,7 +249,7 @@ jobs:
       timeout-minutes: 40
       run: |
         ${{ env.RUN }} "export SKIP_LONG_TESTS=1 && \
-                        $PYTEST -n auto --dist=loadscope && \
+                        $PYTEST -n auto --dist=loadscope --timeout 30 && \
                         selfdrive/locationd/test/_test_locationd_lib.py && \
                         ./system/ubloxd/tests/test_glonass_runner && \
                         ./selfdrive/ui/tests/create_test_translations.sh && \
diff --git a/selfdrive/car/tests/test_fw_fingerprint.py b/selfdrive/car/tests/test_fw_fingerprint.py
index 7d5bd85e99..378b68e43e 100755
--- a/selfdrive/car/tests/test_fw_fingerprint.py
+++ b/selfdrive/car/tests/test_fw_fingerprint.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import pytest
 import random
 import time
 import unittest
@@ -224,6 +225,7 @@ class TestFwFingerprintTiming(unittest.TestCase):
     self._assert_timing(vin_time / self.N, vin_ref_time)
     print(f'get_vin, query time={vin_time / self.N} seconds')
 
+  @pytest.mark.timeout(60)
   def test_fw_query_timing(self):
     total_ref_time = 6.07
     brand_ref_times = {
diff --git a/system/ubloxd/tests/test_ublox_processing.py b/system/ubloxd/tests/test_ublox_processing.py
index cfba486279..311604881a 100755
--- a/system/ubloxd/tests/test_ublox_processing.py
+++ b/system/ubloxd/tests/test_ublox_processing.py
@@ -99,7 +99,7 @@ class TestUbloxProcessing(unittest.TestCase):
       rcv_msgs = []
       for msg in self.ublox_raw:
         ur_pm.send(msg.which(), msg.as_builder())
-        time.sleep(0.01)
+        time.sleep(0.001)
         rcv_msgs += messaging.drain_sock(ugs)
 
       time.sleep(0.1)