diff --git a/.github/workflows/CMake-MSVC-noyasm.yml b/.github/workflows/CMake-MSVC-noyasm.yml
deleted file mode 100644
index 00bb68f5..00000000
--- a/.github/workflows/CMake-MSVC-noyasm.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: CMake MSVC noyasm
-
-on: push
-
-jobs:
-  build:
-    defaults:
-      run:
-        shell: cmd
-    strategy:
-      matrix:
-        # currently windows-latest==windows-2022
-        # windows-2022: VS2022
-        # windows-2019: VS2019
-        os: [windows-2022, windows-2019]
-        arch: [x86, x64, amd64_arm, amd64_arm64]
-        shared: [ON, OFF]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup vcvars
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{ matrix.arch }}
-          sdK: ${{ (matrix.arch == 'amd64_arm' && '10.0.22621.0') || '' }}
-      - name: Setup ninja
-        uses: ./.github/actions/setup-ninja
-      - name: CMake (configure)
-        run: cmake -S ports\cmake -B build -GNinja -DBUILD_SHARED_LIBS=${{ matrix.shared }}
-      - name: CMake --build
-        run: cmake --build build
diff --git a/.github/workflows/CMake-MSVC.yml b/.github/workflows/CMake-MSVC.yml
index 1125b73b..481bfb72 100644
--- a/.github/workflows/CMake-MSVC.yml
+++ b/.github/workflows/CMake-MSVC.yml
@@ -55,16 +55,19 @@ jobs:
         os: [windows-2022, windows-2019]
         arch: [x86, x64, amd64_arm, amd64_arm64]
         shared: [ON, OFF]
+        yasm: [true, false]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Restore yasm
+        if: ${{ matrix.yasm }}
         uses: actions/cache/restore@v4
         with:
           path: |
             ${{ github.workspace }}/yasm
           key: yasm
       - name: Add yasm to PATH
+        if: ${{ matrix.yasm }}
         run: echo "${{ github.workspace }}/yasm/bin" >> %GITHUB_PATH%"
       - name: Setup vcvars
         uses: ilammy/msvc-dev-cmd@v1
@@ -74,6 +77,6 @@ jobs:
       - name: Setup ninja
         uses: ./.github/actions/setup-ninja
       - name: CMake (configure)
-        run: cmake -S ports/cmake -B build -GNinja -DYASM_ASSEMBLER=${{ github.workspace }}/yasm/bin/vsyasm.exe -DBUILD_SHARED_LIBS=${{ matrix.shared }}
+        run: cmake -S ports/cmake -B build -GNinja ${{ (matrix.yasm && format('-DYASM_ASSEMBLER={0}/yasm/bin/vsyasm.exe', github.workspace)) || '' }} -DBUILD_SHARED_LIBS=${{ matrix.shared }}
       - name: CMake (Build)
         run: cmake --build build --verbose