diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1462e47..f856af60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,6 +115,7 @@ jobs:
           - { build: 'autotools', sys: clang64, env: clang-x86_64 }
           - { build: 'cmake'    , sys: ucrt64,  env: ucrt-x86_64 }
           - { build: 'cmake'    , sys: clang64, env: clang-x86_64 }
+          - { build: 'make'     , sys: mingw64, env: x86_64 }
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -179,21 +180,13 @@ jobs:
         timeout-minutes: 10
         shell: msys2 {0}
         run: cd bld && ctest -VV --output-on-failure
-
-  build_msys2_gnu_make:
-    name: 'msys2 (mingw64, x86_64, Makefile.mk)'
-    runs-on: windows-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          install: mingw-w64-x86_64-cc make
-      - name: 'Makefile.mk build'
+      - name: 'make build'
+        if: ${{ matrix.build == 'make' }}
         env:
           CPPFLAGS: -DLIBSSH2_NO_MD5 -DLIBSSH2_NO_HMAC_RIPEMD -DLIBSSH2_NO_DSA -DLIBSSH2_NO_AES_CTR -DLIBSSH2_NO_BLOWFISH -DLIBSSH2_NO_RC4 -DLIBSSH2_NO_CAST -DLIBSSH2_NO_3DES
           LIBSSH2_CPPFLAGS_LIB: -DLIBSSH2_EXPORTS
+          ZLIB_PATH: /${{ matrix.sys }}
+          OPENSSL_PATH: /${{ matrix.sys }}
         shell: msys2 {0}
         run: mkdir bld && cd bld && BLD_DIR=bld make -C .. -j3 -f Makefile.mk dyn example test