diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index d2ae15f4..16b96b46 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -106,12 +106,14 @@ jobs:
       run: cmake --build build --config ${{matrix.buildType}} --target tests
 
     # Run test with both bash and powershell and watch for "Using std::cin" on bash but not on powershell
+    # Except for MinGW where the bash shell makes it use the wrong DLLs
     - name: Test
       working-directory: build
+      if: "! (runner.os == 'Windows' && endsWith(matrix.generator, 'Makefiles'))"
       run: ctest --output-on-failure -C ${{matrix.buildType}} --verbose
     - name: Test on PowerShell
       working-directory: build
-      shell: powershell
+      shell: pwsh
       if: runner.os == 'Windows'
       run: ctest --output-on-failure -C ${{matrix.buildType}} --verbose