diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index bd088f49..0191ac22 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -11,14 +11,13 @@ jobs:
     name: Test with MSYS2 ${{ matrix.sys }}
     runs-on: windows-2022
     strategy:
+      fail-fast: false
       matrix:
         include:
-          # - { sys: msys }, setup fails
-          # - { sys: mingw32 }, impossible asm constraints when building base64
-          - { sys: mingw64 }
-          - { sys: ucrt64  }
-          - { sys: clang32 }
-          - { sys: clang64 }
+          - { sys: msys, env: "" }
+          - { sys: mingw64, env: mingw-w64-x86_64- }
+          - { sys: ucrt64, env: mingw-w64-ucrt-x86_64- }
+          - { sys: clang64, env: mingw-w64-clang-x86_64- }
     steps:
     - uses: actions/checkout@v4
       with:
@@ -29,18 +28,16 @@ jobs:
         msystem: ${{matrix.sys}}
         update: true
         install: >-
-          git
           make
-        pacboy: >-
-          toolchain:p
-          cmake:p
-          ninja:p
-          python:p
-          python-pip:p
-          python-pytest:p
-          python-setuptools:p
-          python-typing_extensions:p
-          python-wheel:p
+          ${{matrix.env}}cmake
+          ${{matrix.env}}ninja
+          ${{matrix.env}}toolchain
+          ${{matrix.env}}python
+          ${{matrix.env}}python-pip
+          ${{matrix.env}}python-pytest
+          ${{matrix.env}}python-setuptools
+          ${{matrix.env}}python-typing_extensions
+          ${{matrix.env}}python-wheel
     - name: "Run tests"
       shell: msys2 {0}
       env: