diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a85fc66..85d1fcb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,9 +41,9 @@ jobs:
     - name: Configure Windows cgo environment
       if: runner.os == 'Windows'
       run: |
-        echo "CC=gcc" >> $GITHUB_ENV
-        echo "CXX=g++" >> $GITHUB_ENV
-      shell: msys2 {0}
+        echo "C:/msys64/mingw64/bin" >> $GITHUB_PATH
+        echo "CC=C:/msys64/mingw64/bin/gcc.exe" >> $GITHUB_ENV
+        echo "CXX=C:/msys64/mingw64/bin/g++.exe" >> $GITHUB_ENV
 
     - name: Build (Unix)
       if: runner.os != 'Windows'
@@ -52,7 +52,6 @@ jobs:
     - name: Build (Windows)
       if: runner.os == 'Windows'
       run: go build -v ./...
-      shell: msys2 {0}
 
     - name: Test with coverage (Linux)
       if: runner.os == 'Linux'
@@ -68,7 +67,6 @@ jobs:
       if: runner.os == 'Windows'
       run: |
         go test -v -race -coverprofile=coverage.out -covermode=atomic ./...
-      shell: msys2 {0}
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v5.5.3