diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d8aef2c3b..1ad16770b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,30 +60,12 @@ jobs:
         sudo -E make -C crit unit-test
         sudo -E make -C test crit-test
 
-  crit-macos:
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        go-version: [1.20.x, 1.21.x, 1.22.x]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Install Go ${{ matrix.go-version }}
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go-version }}
-
-    - name: Test CRIT
-      run: |
-        make -C crit clean bin/crit
-
-  crit-windows:
-    runs-on: windows-latest
+  crit-build-test:
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: [windows-latest, macos-latest]
         go-version: [1.20.x, 1.21.x, 1.22.x]
     steps:
     - name: Checkout