diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b61ea766dfe..ab1040e7cee 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -94,27 +94,20 @@ jobs:
       - name: Build
         run: dotnet run --project build/Build.csproj -- --target=Default
 
-      - name: Test
-        run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release --filter="TestCategory!=Audio"
+      - name: Run Tests
+        run:   |
+              if [ "$RUNNER_OS" == "Linux" ]; then
+                    dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release --filter="TestCategory!=Audio"
+              elif [ "$RUNNER_OS" == "Windows" ]; then
+                    dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release --filter="TestCategory!=Audio"
+              else
+                    dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release
+              fi
         env:
           DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /home/runner/.winemonogame
           CI: true
-        if: runner.os == 'Linux'
-
-      - name: Test
-        run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release --filter="TestCategory!=Audio"
-        env:
-          DOTNET_ROOT: ${{github.workspace}}/dotnet64
-          MGFXC_WINE_PATH: /Users/runner/.winemonogame
-          CI: true
-        if: runner.os == 'macOS'
-
-      - name: Test
-        run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 5m -c Release
-        env:
-          CI: true
-        if: runner.os == 'Windows'
+        shell: bash
 
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v3