diff --git a/.github/bin/mingw64.cmd b/.github/bin/mingw64.cmd
new file mode 100755
index 000000000..715161ceb
--- /dev/null
+++ b/.github/bin/mingw64.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set MSYS=winsymlinks:nativestrict
+C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here %*
diff --git a/.github/mingw64 b/.github/mingw64
deleted file mode 100755
index d296f48d6..000000000
--- a/.github/mingw64
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-MSYS=winsymlinks:nativestrict C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f4606dc02..bfe3fe93a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,6 @@ jobs:
 
 
   lin:
-
     strategy:
       fail-fast: false
       matrix:
@@ -42,10 +41,15 @@ jobs:
     runs-on: windows-latest
     name: '🧊 Windows'
     defaults:
-      shell: bash
+      run:
+        shell: mingw64 {0}
     steps:
 
-    - run: git config --global core.autocrlf input
+    - name: Setup
+      shell: bash
+      run: |
+        git config --global core.autocrlf input
+        echo "$(cygpath -w $(pwd)/.github/bin)" >> $GITHUB_PATH
 
     - uses: actions/checkout@v2
 
@@ -58,11 +62,8 @@ jobs:
           mingw-w64-x86_64-toolchain
         update: true
 
-    - name: Add .github to PATH
-      run: echo "$(cygpath -w $(pwd)/.github)" >> $GITHUB_PATH
-
     - name: Build
-      run: mingw64 ./.github/build.sh
+      run: ./.github/build.sh
 
     - name: Test
-      run: mingw64 ./.github/test.sh
+      run: ./.github/test.sh