diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index cef018cc969..47d1d413ab0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -883,13 +883,13 @@ jobs:
       matrix:
         include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.windows-matrix-include) }}
     name: "${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
       PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
-      PHP_BUILD_CRT: vs16
+      PHP_BUILD_CRT: vs17
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
       INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 7e3033ac4bc..5d6ee756638 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -236,13 +236,13 @@ jobs:
   WINDOWS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     name: WINDOWS_X64_ZTS
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
       PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
-      PHP_BUILD_CRT: vs16
+      PHP_BUILD_CRT: vs17
       PLATFORM: x64
       THREAD_SAFE: "1"
       INTRINSICS: AVX2
diff --git a/Zend/tests/gh8841.phpt b/Zend/tests/gh8841.phpt
index 5587c5ad822..9133fd4d4ae 100644
--- a/Zend/tests/gh8841.phpt
+++ b/Zend/tests/gh8841.phpt
@@ -1,5 +1,16 @@
 --TEST--
 GH-8841 (php-cli core dump calling a badly formed function)
+--SKIPIF--
+<?php
+$tracing = extension_loaded("Zend OPcache")
+    && ($conf = opcache_get_configuration()["directives"])
+    && array_key_exists("opcache.jit", $conf)
+    &&  $conf["opcache.jit"] === "tracing";
+if (PHP_OS_FAMILY === "Windows" && PHP_INT_SIZE == 8 && $tracing) {
+    $url = "https://github.com/php/php-src/pull/14919#issuecomment-2259003979";
+    die("xfail Test fails on Windows x64 (VS17) and tracing JIT; see $url");
+}
+?>
 --FILE--
 <?php
 register_shutdown_function(function() {