diff --git a/.github/workflows/md5.yml b/.github/workflows/md5.yml
index 06280ed..13ba82b 100644
--- a/.github/workflows/md5.yml
+++ b/.github/workflows/md5.yml
@@ -75,17 +75,13 @@ jobs:
           # 64-bit Windows (GNU)
           - target: x86_64-pc-windows-gnu
             toolchain: 1.48.0 # MSRV
-            msystem: MINGW64
           - target: x86_64-pc-windows-gnu
             toolchain: stable
-            msystem: MINGW64
           # 32-bit Windows (GNU)
           - target: i686-pc-windows-gnu
             toolchain: 1.48.0 # MSRV
-            msystem: MINGW32
           - target: i686-pc-windows-gnu
             toolchain: stable
-            msystem: MINGW32
 
     runs-on: windows-latest
     steps:
@@ -96,7 +92,7 @@ jobs:
           targets: ${{ matrix.target }}
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: ${{ matrix.msystem }}
+          msystem: MINGW${{ startsWith(matrix.target, 'i686-') && '32' || '64' }}
           pacboy: cc:p
           path-type: inherit
       - run: cargo test --target ${{ matrix.target }} --release