diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7ab48d6d93..22e4acc7fb 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,12 +4,20 @@ jobs:
   make:
     strategy:
       matrix:
-        test_task: [check] # to make job names consistent
-        os: [windows-2019, windows-2022]
+        include:
+          - vs: 2019
+            os: windows-2019
+            vcvars: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
+          - vs: 2022
+            os: windows-2022
+            vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvars64.bat"'
+            continue-on-error: true
       fail-fast: false
     runs-on: ${{ matrix.os }}
+    name: VisualStudio ${{ matrix.vs }}
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+      VCVARS: ${{ matrix.vcvars }}
       PATCH: D:\a\_temp\msys\msys64\usr\bin\patch.exe
     steps:
       - run: md build
@@ -26,13 +34,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-
             ${{ runner.os }}-vcpkg-download-
-      - name: Set VCVARS
-        run: |
-          IF ${{ matrix.os }}==windows-2022 (
-            echo VCVARS="C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvars64.bat" >> %GITHUB_ENV%
-          ) ELSE IF ${{ matrix.os }}==windows-2019 (
-            echo VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" >> %GITHUB_ENV%
-          )
       - name: Install libraries with vcpkg
         run: |
           vcpkg --triplet x64-windows install readline zlib
@@ -85,19 +86,19 @@ jobs:
           set TMP=%USERPROFILE%\AppData\Local\Temp
           set TEMP=%USERPROFILE%\AppData\Local\Temp
           nmake test-all
-        continue-on-error: ${{ matrix.os == 'windows-2022' }}
+        continue-on-error: ${{ matrix.continue-on-error }}
       - name: nmake test-spec
         timeout-minutes: 10
         run: |
           call %VCVARS%
           nmake test-spec
-        continue-on-error: ${{ matrix.os == 'windows-2022' }}
+        continue-on-error: ${{ matrix.continue-on-error }}
       - uses: k0kubun/action-slack@v2.0.0
         with:
           payload: |
             {
               "ci": "GitHub Actions",
-              "env": "${{ matrix.os }} / ${{ matrix.test_task }}",
+              "env": "VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }}",
               "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
               "commit": "${{ github.sha }}",
               "branch": "${{ github.ref }}".split('/').reverse()[0]