diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml
index 5721eca9da22f..0a280b6b22489 100644
--- a/.github/workflows/sycl_precommit.yml
+++ b/.github/workflows/sycl_precommit.yml
@@ -48,7 +48,7 @@ jobs:
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       ref: ${{ github.event.pull_request.head.sha }}
-      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda_aws"
+      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda_aws;win_l0_gen12"
 
   linux_default:
     name: Linux
@@ -66,3 +66,12 @@ jobs:
       build_cache_suffix: "default"
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
+
+  windows_default:
+    name: Windows
+    needs: test_matrix
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_windows_build_and_test.yml
+    with:
+      lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
+      build_ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/windows_test_comment_trigger.yml b/.github/workflows/windows_test_comment_trigger.yml
index 2c09ae0894f38..15ca911bc9b1e 100644
--- a/.github/workflows/windows_test_comment_trigger.yml
+++ b/.github/workflows/windows_test_comment_trigger.yml
@@ -42,19 +42,27 @@ jobs:
     outputs:
       PR_SHA: ${{ steps.sha.outputs.result }}
 
+  test_matrix:
+    name: Generate Test Matrix
+    needs: [windows_test_preparation]
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_gen_test_matrix.yml
+    with:
+      lts_config: "win_l0_gen12"
 
   windows_default:
     name: Windows
-    needs: [windows_test_preparation]
+    needs: [windows_test_preparation, test_matrix]
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_windows_build_and_test.yml
     with:
       build_ref: ${{ needs.windows_test_preparation.outputs.PR_SHA }}
+      lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
 
   windows_test_completion:
     runs-on: ubuntu-20.04
     needs: [windows_test_preparation, windows_default]
-    if: always()
+    if: ${{ always() && needs.windows_test_preparation.result != 'skipped' }}
     steps:
     - name: update_pr_status_success
       if: needs.windows_default.result == 'success'