diff --git a/.github/workflows/msys2-ci.yml b/.github/workflows/msys2-ci.yml
index bb57cb9f7..cdd28a0e0 100644
--- a/.github/workflows/msys2-ci.yml
+++ b/.github/workflows/msys2-ci.yml
@@ -21,6 +21,8 @@ jobs:
             MSYS2_ARCH: i686
           - MSYSTEM: MINGW64
             MSYS2_ARCH: x86_64
+          - MSYSTEM: CLANG64
+            MSYS2_ARCH: clang-x86_64
     name: ${{ matrix.MSYSTEM }}
 
     env:
@@ -42,8 +44,7 @@ jobs:
         install: >-
           mingw-w64-${{ matrix.MSYS2_ARCH }}-cairo
           mingw-w64-${{ matrix.MSYS2_ARCH }}-freetype
-          mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc
-          mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc-libs
+          mingw-w64-${{ matrix.MSYS2_ARCH }}-cc
           mingw-w64-${{ matrix.MSYS2_ARCH }}-gettext
           mingw-w64-${{ matrix.MSYS2_ARCH }}-glib2
           mingw-w64-${{ matrix.MSYS2_ARCH }}-gobject-introspection
@@ -56,7 +57,7 @@ jobs:
           mingw-w64-${{ matrix.MSYS2_ARCH }}-python-pip
     - name: Remove installed HarfBuzz DLLs
       run: |
-        rm -f -v /ming*/bin/libharfbuzz-*.dll
+        rm -f -v "$MSYSTEM_PREFIX"/bin/libharfbuzz-*.dll
     - name: Install Python Dependencies
       run: |
         pip3 install -r .ci/requirements-fonttools.txt --require-hashes