diff --git a/.github/workflows/build-all-and-publish.yml b/.github/workflows/build-all-and-publish.yml
index 97a4df3..a386008 100644
--- a/.github/workflows/build-all-and-publish.yml
+++ b/.github/workflows/build-all-and-publish.yml
@@ -156,15 +156,6 @@ jobs:
           submodules: true
           fetch-depth: 0
 
-      - name: Setup MSYS2 with Mingw-w64
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: >-
-            base-devel
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-lz4
-
       - name: Setup Zulu JDK 7
         uses: actions/setup-java@v5
         with:
@@ -177,8 +168,22 @@ jobs:
           java-version: '21'
           cache: maven
 
-      - name: Build (mvn verify) using MSYS2 shell
-        shell: msys2 {0}
+      # See LZ4FrameIOStreamTest
+      - name: Download LZ4 CLI for tests
+        shell: powershell
+        run: |
+          curl.exe --fail-with-body --no-progress-meter --output lz4_win64.zip --location https://github.com/lz4/lz4/releases/download/v1.10.0/lz4_win64_v1_10_0.zip
+          mkdir lz4-cli
+          tar -x -v -f lz4_win64.zip -C lz4-cli lz4.exe
+          echo "$(Get-Location)\lz4-cli" >> "$env:GITHUB_PATH"
+          rm lz4_win64.zip
+      # Separate step because the change to PATH (through GITHUB_PATH) is not visible in the step which modified it
+      # See https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-commands#adding-a-system-path
+      - name: Check LZ4 CLI
+        run: lz4 -V
+
+      - name: Build (mvn verify)
+        shell: bash
         run: |
           ./mvnw -B -V \
             -Darch.id=amd64 \