diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abab1b2..8c6ab9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,15 +25,29 @@ jobs:
     - run: make test
   
   buildwindows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows-latest
+        julia-arch:
+          - x64
+          - x86
     steps:
-    - uses: actions/checkout@v2
-    - uses: msys2/setup-msys2@v2
-      with: 
-        msystem: MINGW64
-        install: make mingw-w64-x86_64-toolchain
-    - run: make
-    - run: make test
+      - uses: actions/checkout@v2
+      - name: Install i686-w64-mingw32-gcc
+        if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x86' }}
+        shell: bash
+        run: |
+          choco install mingw -y --x86 --force --params "/exception:sjlj"
+          choco install make -y
+          echo "CC=i686-w64-mingw32-gcc" >> "${GITHUB_ENV}"
+      - name: Set compiler for 64-bit Windows
+        if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x64' }}
+        shell: bash
+        run: |
+          echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}"
+      - name: Build and run tests
+      - run: make
+      - run: make test