diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index b27824d..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Run unit tests using CTest and go tests
-name: Tests
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-    branches:
-      - master
-      - dev
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: lukka/get-cmake@v3.18.3
-    - uses: actions/setup-go@v2
-    - uses: actions/checkout@v2
-    - uses: ilammy/setup-nasm@v1.1.0
-    - run: /home/runner/nasm/nasm -version
-    - name: Running ctests
-      env:
-        ASM_NASM: /home/runner/nasm/nasm
-      run: |
-        mkdir build
-        cd build
-        cmake -GNinja ..
-        ninja
-        ctest --output-on-failure
-    - name: Running go tests
-      run: |
-        cd go4k
-        go test . ./bridge
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..bef0a91
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,50 @@
+# Run unit tests using CTest and go tests
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - master
+      - dev
+
+jobs:
+  test:
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      matrix:
+        config:
+          - os: ubuntu-latest
+            asmnasm: /home/runner/nasm/nasm
+            cmakeflags: -GNinja
+            maker: ninja
+            gotests: yes
+          - os: windows-latest
+            cmakeflags: -GNinja
+            maker: ninja
+            asmnasm: C:\Users\runneradmin\nasm\nasm
+            gotests: yes
+          # TODO: win32 builds didn't quite work out, complains gcc broken
+    steps:
+    - uses: lukka/get-cmake@v3.18.3
+    - uses: actions/setup-go@v2
+      if: ${{ matrix.config.gotests == 'yes' }}
+    - uses: actions/checkout@v2
+    - uses: ilammy/setup-nasm@v1.1.0
+    - name: Run ctest
+      env:
+        ASM_NASM: ${{ matrix.config.asmnasm }}
+      run: |
+        mkdir build
+        cd build
+        cmake ${{ matrix.config.cmakeflags }} ..
+        ${{ matrix.config.maker }}
+        ctest --output-on-failure
+    - name: Run go test
+      if: ${{ matrix.config.gotests == 'yes' }}
+      run: |
+        cd go4k
+        go test . ./bridge