diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f40f279..88a7534 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,11 +28,11 @@ jobs:
       - name: Check compatibility with old Zig compilers
         run: ci/compat.sh
       
-  test:
-    name: Unit Test
+  test-linux_mac:
+    name: Unit Tests
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:
@@ -46,3 +46,20 @@ jobs:
 
       - name: Run unit tests
         run: zig build test
+        
+  test-windows:
+    name: Unit Test Windows
+    runs-on: windows-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Zig
+        uses: goto-bus-stop/setup-zig@v2
+        with:
+          version: master
+
+      - name: Run unit tests
+        run: zig build test
+        shell: pwsh
diff --git a/.github/workflows/eowyn.yml b/.github/workflows/eowyn.yml
index 1b94a48..244deef 100644
--- a/.github/workflows/eowyn.yml
+++ b/.github/workflows/eowyn.yml
@@ -13,10 +13,10 @@ defaults:
     shell: bash
 
 jobs:
-  build:
+  build-linux_mac:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:
@@ -30,3 +30,19 @@ jobs:
           
       - name: Run Eowyn
         run: patches/eowyn.sh
+        
+  build-windows:
+    runs-on: windows-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        
+      - name: Setup Zig
+        uses: goto-bus-stop/setup-zig@v2
+        with:
+          version: master
+          
+      - name: Run Eowyn
+        run: patches/eowyn.sh
+        shell: pwsh