diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f2725c3ef..d7d575430 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,26 +15,16 @@ jobs:
       matrix:
         include:
           - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-24.04' }}
+            flags: ''
+          - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-24.04' }}
+            flags: '--ubsan'
           - os: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-macos-8x14' || 'macos-latest' }}
+            flags: ''
     steps:
     - uses: commaai/timeout@v1
     - uses: actions/checkout@v4
     - uses: ./.github/workflows/cache
-    - run: ./test.sh
-
-  safety_tests:
-    name: safety
-    runs-on: ${{ github.repository == 'commaai/opendbc' && 'namespace-profile-amd64-8x16' || 'ubuntu-latest' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        flags: ['--ubsan']
-    steps:
-    - uses: commaai/timeout@v1
-    - uses: actions/checkout@v4
-    - uses: ./.github/workflows/cache
-    - name: Run safety tests
-      run: ./opendbc/safety/tests/test.sh ${{ matrix.flags }}
+    - run: ./test.sh ${{ matrix.flags }}
 
   mutation:
     name: Safety mutation tests
diff --git a/test.sh b/test.sh
index d91afb035..f0f6c483b 100755
--- a/test.sh
+++ b/test.sh
@@ -7,7 +7,7 @@ cd $DIR
 source ./setup.sh
 
 # *** build ***
-scons -j8
+scons -j8 "$@"
 
 # *** lint + test ***
 lefthook run test