diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abab1b2..d18a6cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,12 @@ jobs:
     - run: make test
   
   buildwindows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
     defaults:
       run:
         shell: msys2 {0}
@@ -33,7 +38,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: msys2/setup-msys2@v2
       with: 
-        msystem: MINGW64
-        install: make mingw-w64-x86_64-toolchain
+        msystem: ${{matrix.sys}}
+        install: make mingw-w64-${{matrix.env}}-toolchain
     - run: make
     - run: make test