diff --git a/.github/workflows/msys2-ci.yml b/.github/workflows/msys2-ci.yml
index 310900a0b..2ebc47047 100644
--- a/.github/workflows/msys2-ci.yml
+++ b/.github/workflows/msys2-ci.yml
@@ -36,27 +36,21 @@ jobs:
             mingw-w64-${{ matrix.MSYS2_ARCH }}-gobject-introspection
             mingw-w64-${{ matrix.MSYS2_ARCH }}-graphite2
             mingw-w64-${{ matrix.MSYS2_ARCH }}-icu
+            mingw-w64-${{ matrix.MSYS2_ARCH }}-meson
             mingw-w64-${{ matrix.MSYS2_ARCH }}-ninja
             mingw-w64-${{ matrix.MSYS2_ARCH }}-pkg-config
+            mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fonttools
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python3
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-python3-pip
             mingw-w64-${{ matrix.MSYS2_ARCH }}-ragel
-      - name: Install extra dependencies
-        run: |
-          pip install fonttools
-          pip install --upgrade meson==0.53.0
-          curl "https://raw.githubusercontent.com/mirror/mingw-w64/023eb04c396d4e8d8fcf604cfababc53dae13398/mingw-w64-headers/include/dwrite_1.h" > "$MINGW_PREFIX/$MINGW_CHOST/include/dwrite_1.h"
       - name: Build
         run: |
           meson build \
-            --wrap-mode=nofallback \
-            -Dfreetype=enabled \
-            -Dglib=enabled \
-            -Dcairo=enabled \
-            -Dgobject=enabled \
-            -Dgdi=enabled \
+            --wrap-mode=nodownload \
+            --auto-features=enabled \
             -Ddirectwrite=enabled \
-            -Dgraphite=enabled
+            -Dgdi=enabled \
+            -Dgraphite=enabled \
+            -Dbenchmark=disabled
           ninja -C build
       - name: Test
         run: |