diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5f263962f3..aa21bab957 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,13 +14,12 @@ jobs:
   unit-tests:
     name: unit tests
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 1
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-latest]
-        #run: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
     steps:
+    - uses: commaai/timeout@v1
     - uses: actions/checkout@v4
     - name: install uv and dependencies
       run: |
@@ -34,8 +33,8 @@ jobs:
   static-analysis:
     name: static analysis
     runs-on: ubuntu-24.04
-    timeout-minutes: 1
     steps:
+    - uses: commaai/timeout@v1
     - uses: actions/checkout@v4
     - run: sudo apt install --no-install-recommends -y cppcheck
     - name: setup python