From 2027cae21c8346b9709b12ce99ba394b81a29c30 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Mon, 29 Sep 2025 09:58:01 +0200
Subject: [PATCH] Enable preloading on Windows

---
 .../opcache_validator_errors.phpt             |  4 ---
 ext/ffi/tests/bug78761.phpt                   |  1 -
 ext/opcache/ZendAccelerator.c                 | 27 +++++--------------
 .../tests/api/opcache_preloading_001.phpt     |  4 ---
 .../tests/api/opcache_preloading_002.phpt     |  2 +-
 ext/opcache/tests/bug78014.phpt               |  4 ---
 ext/opcache/tests/bug78175.phpt               |  4 ---
 ext/opcache/tests/bug78175_2.phpt             |  4 ---
 ext/opcache/tests/bug78376.phpt               |  4 ---
 ext/opcache/tests/bug78937_1.phpt             |  4 ---
 ext/opcache/tests/bug78937_2.phpt             |  4 ---
 ext/opcache/tests/bug78937_3.phpt             |  4 ---
 ext/opcache/tests/bug78937_4.phpt             |  4 ---
 ext/opcache/tests/bug78937_5.phpt             |  4 ---
 ext/opcache/tests/bug78937_6.phpt             |  4 ---
 ext/opcache/tests/gh10405.phpt                |  2 +-
 ext/opcache/tests/gh10914.phpt                |  4 ---
 ext/opcache/tests/gh13433/gh13433.phpt        |  4 ---
 ext/opcache/tests/gh15021.phpt                |  4 ---
 ext/opcache/tests/gh16577.phpt                |  4 ---
 ext/opcache/tests/gh18567.phpt                |  4 ---
 ext/opcache/tests/gh18639.phpt                |  4 ---
 ext/opcache/tests/gh8133.phpt                 |  4 ---
 ext/opcache/tests/gh9968.phpt                 |  4 ---
 ext/opcache/tests/jit/bug80634.phpt           |  4 ---
 ext/opcache/tests/jit/bug81256.phpt           |  4 ---
 ext/opcache/tests/jit/gh14082.phpt            |  4 ---
 ext/opcache/tests/jit/gh15490.phpt            |  4 ---
 ext/opcache/tests/jit/gh18898_1.phpt          |  4 ---
 ext/opcache/tests/jit/gh18898_2.phpt          |  4 ---
 ext/opcache/tests/jit/gh8461-007.phpt         |  4 ---
 ext/opcache/tests/jit/gh8591-006.phpt         |  4 ---
 ext/opcache/tests/preload_001.phpt            |  4 ---
 ext/opcache/tests/preload_002.phpt            |  4 ---
 ext/opcache/tests/preload_003.phpt            |  4 ---
 ext/opcache/tests/preload_004.phpt            |  4 ---
 ext/opcache/tests/preload_005.phpt            |  4 ---
 ext/opcache/tests/preload_006.phpt            |  1 -
 ext/opcache/tests/preload_007.phpt            |  4 ---
 ext/opcache/tests/preload_008.phpt            |  4 ---
 ext/opcache/tests/preload_009.phpt            |  4 ---
 ext/opcache/tests/preload_010.phpt            |  4 ---
 ext/opcache/tests/preload_011.phpt            |  4 ---
 ext/opcache/tests/preload_012.phpt            |  4 ---
 ext/opcache/tests/preload_013.phpt            |  4 ---
 ext/opcache/tests/preload_bug79114.phpt       |  4 ---
 ext/opcache/tests/preload_class_alias.phpt    |  4 ---
 ext/opcache/tests/preload_class_alias_2.phpt  |  4 ---
 .../tests/preload_dynamic_def_removal.phpt    |  4 ---
 .../tests/preload_dynamic_function.phpt       |  4 ---
 ext/opcache/tests/preload_early_binding.phpt  |  4 ---
 ext/opcache/tests/preload_enum.phpt           |  4 ---
 ext/opcache/tests/preload_enum_observed.phpt  |  4 ---
 ext/opcache/tests/preload_error_handler.phpt  |  4 ---
 ext/opcache/tests/preload_ind.phpt            |  4 ---
 .../tests/preload_loadable_classes_1.phpt     |  4 ---
 .../tests/preload_loadable_classes_2.phpt     |  4 ---
 .../tests/preload_loadable_classes_3.phpt     |  4 ---
 .../tests/preload_method_static_vars.phpt     |  4 ---
 ext/opcache/tests/preload_optimizer.phpt      |  4 ---
 ext/opcache/tests/preload_parse_error.phpt    |  1 -
 .../tests/preload_prop_info_table.phpt        |  4 ---
 .../tests/preload_static_var_inheritance.phpt |  4 ---
 ext/opcache/tests/preload_trait_alias.phpt    |  4 ---
 .../tests/preload_trait_multiple_fixup.phpt   |  4 ---
 ext/opcache/tests/preload_trait_static.phpt   |  4 ---
 .../tests/preload_unresolved_prop_type.phpt   |  4 ---
 ext/opcache/tests/preload_user_001.phpt       |  2 +-
 ext/opcache/tests/preload_user_002.phpt       |  2 +-
 ext/opcache/tests/preload_user_003.phpt       |  2 +-
 ext/opcache/tests/preload_user_004.phpt       |  2 +-
 ext/opcache/tests/preload_user_005.phpt       |  2 +-
 ext/opcache/tests/preload_windows.phpt        | 17 ------------
 .../tests/preloading_no_auto_globals_jit.phpt |  4 ---
 ext/zend_test/tests/observer_preload.phpt     |  4 ---
 75 files changed, 13 insertions(+), 300 deletions(-)
 delete mode 100644 ext/opcache/tests/preload_windows.phpt

diff --git a/Zend/tests/attributes/delayed_target_validation/opcache_validator_errors.phpt b/Zend/tests/attributes/delayed_target_validation/opcache_validator_errors.phpt
index 68d1ae43bd46a..ba6ea7a41ca44 100644
--- a/Zend/tests/attributes/delayed_target_validation/opcache_validator_errors.phpt
+++ b/Zend/tests/attributes/delayed_target_validation/opcache_validator_errors.phpt
@@ -7,10 +7,6 @@ opcache.preload={PWD}/opcache_validator_errors.inc
 opcache.file_cache_only=0
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $r = new ReflectionClass('DemoTrait');
diff --git a/ext/ffi/tests/bug78761.phpt b/ext/ffi/tests/bug78761.phpt
index fc1c661291142..9fb1219b3457b 100644
--- a/ext/ffi/tests/bug78761.phpt
+++ b/ext/ffi/tests/bug78761.phpt
@@ -5,7 +5,6 @@ ffi
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 if (posix_geteuid() == 0) die('skip Cannot run test as root.');
 ?>
 --INI--
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index f0d3379534591..7f8a44e911036 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -139,15 +139,9 @@ static zend_result (*orig_post_startup_cb)(void);
 static zend_result accel_post_startup(void);
 static zend_result accel_finish_startup(void);
 
-#ifndef ZEND_WIN32
-# define PRELOAD_SUPPORT
-#endif
-
-#ifdef PRELOAD_SUPPORT
 static void preload_shutdown(void);
 static void preload_activate(void);
 static void preload_restart(void);
-#endif
 
 #ifdef ZEND_WIN32
 # define INCREMENT(v) InterlockedIncrement64(&ZCSG(v))
@@ -2731,11 +2725,9 @@ ZEND_RINIT_FUNCTION(zend_accelerator)
 				}
 
 				zend_shared_alloc_restore_state();
-#ifdef PRELOAD_SUPPORT
 				if (ZCSG(preload_script)) {
 					preload_restart();
 				}
-#endif
 
 #ifdef HAVE_JIT
 				zend_jit_restart();
@@ -2777,11 +2769,9 @@ ZEND_RINIT_FUNCTION(zend_accelerator)
 	zend_jit_activate();
 #endif
 
-#ifdef PRELOAD_SUPPORT
 	if (ZCSG(preload_script)) {
 		preload_activate();
 	}
-#endif
 
 	return SUCCESS;
 }
@@ -3482,11 +3472,9 @@ void accel_shutdown(void)
 		return;
 	}
 
-#ifdef PRELOAD_SUPPORT
 	if (ZCSG(preload_script)) {
 		preload_shutdown();
 	}
-#endif
 
 	_file_cache_only = file_cache_only;
 
@@ -3599,7 +3587,6 @@ void accelerator_shm_read_unlock(void)
 }
 
 /* Preloading */
-#ifdef PRELOAD_SUPPORT
 static HashTable *preload_scripts = NULL;
 static zend_op_array *(*preload_orig_compile_file)(zend_file_handle *file_handle, int type);
 
@@ -4972,6 +4959,7 @@ static zend_result accel_finish_startup_preload(bool in_child)
 	return ret;
 }
 
+#ifndef ZEND_WIN32
 static zend_result accel_finish_startup_preload_subprocess(pid_t *pid)
 {
 	uid_t euid = geteuid();
@@ -5038,7 +5026,7 @@ static zend_result accel_finish_startup_preload_subprocess(pid_t *pid)
 
 	return SUCCESS;
 }
-#endif /* ZEND_WIN32 */
+#endif /* !ZEND_WIN32 */
 
 static zend_result accel_finish_startup(void)
 {
@@ -5050,11 +5038,6 @@ static zend_result accel_finish_startup(void)
 		return SUCCESS;
 	}
 
-#ifdef ZEND_WIN32
-	zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Preloading is not supported on Windows");
-	return FAILURE;
-#else /* ZEND_WIN32 */
-
 	if (UNEXPECTED(file_cache_only)) {
 		zend_accel_error(ACCEL_LOG_WARNING, "Preloading doesn't work in \"file_cache_only\" mode");
 		return SUCCESS;
@@ -5070,7 +5053,9 @@ static zend_result accel_finish_startup(void)
 		return SUCCESS;
 	}
 
-
+#ifdef ZEND_WIN32
+	return accel_finish_startup_preload(false);
+#else
 	pid_t pid;
 	if (accel_finish_startup_preload_subprocess(&pid) == FAILURE) {
 		zend_shared_alloc_unlock();
@@ -5104,7 +5089,7 @@ static zend_result accel_finish_startup(void)
 			return FAILURE;
 		}
 	}
-#endif /* ZEND_WIN32 */
+#endif /* !ZEND_WIN32 */
 }
 
 static void accel_activate(void) {
diff --git a/ext/opcache/tests/api/opcache_preloading_001.phpt b/ext/opcache/tests/api/opcache_preloading_001.phpt
index e30cbbd7d159d..9727ae9334d2c 100644
--- a/ext/opcache/tests/api/opcache_preloading_001.phpt
+++ b/ext/opcache/tests/api/opcache_preloading_001.phpt
@@ -6,10 +6,6 @@ zend_test
 opcache.enable=1
 opcache.enable_cli=1
 opcache.preload={PWD}/opcache_preloading.inc
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/api/opcache_preloading_002.phpt b/ext/opcache/tests/api/opcache_preloading_002.phpt
index 30bf5a5bc03b1..026a69467edd3 100644
--- a/ext/opcache/tests/api/opcache_preloading_002.phpt
+++ b/ext/opcache/tests/api/opcache_preloading_002.phpt
@@ -10,7 +10,7 @@ posix
 zend_test
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/bug78014.phpt b/ext/opcache/tests/bug78014.phpt
index df497e6894998..b8f263e8709df 100644
--- a/ext/opcache/tests/bug78014.phpt
+++ b/ext/opcache/tests/bug78014.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78014.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $c = new C;
diff --git a/ext/opcache/tests/bug78175.phpt b/ext/opcache/tests/bug78175.phpt
index 3e87314607d81..11a14d21eecc2 100644
--- a/ext/opcache/tests/bug78175.phpt
+++ b/ext/opcache/tests/bug78175.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78175.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 OK
 --EXPECT--
diff --git a/ext/opcache/tests/bug78175_2.phpt b/ext/opcache/tests/bug78175_2.phpt
index a994c3568617d..06539cde6e745 100644
--- a/ext/opcache/tests/bug78175_2.phpt
+++ b/ext/opcache/tests/bug78175_2.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78175_2.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(get_class(Loader::getLoader()));
diff --git a/ext/opcache/tests/bug78376.phpt b/ext/opcache/tests/bug78376.phpt
index d6b2dd7cf5c04..e423d4b92a4f8 100644
--- a/ext/opcache/tests/bug78376.phpt
+++ b/ext/opcache/tests/bug78376.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78376.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 const CNST = 'bbbb';
diff --git a/ext/opcache/tests/bug78937_1.phpt b/ext/opcache/tests/bug78937_1.phpt
index 657b306d68d4d..fa7b43605a8dd 100644
--- a/ext/opcache/tests/bug78937_1.phpt
+++ b/ext/opcache/tests/bug78937_1.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 class Bar {
diff --git a/ext/opcache/tests/bug78937_2.phpt b/ext/opcache/tests/bug78937_2.phpt
index eb359cee96bea..d20ab4c03a84a 100644
--- a/ext/opcache/tests/bug78937_2.phpt
+++ b/ext/opcache/tests/bug78937_2.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 include(__DIR__ . "/preload_bug78937.inc");
diff --git a/ext/opcache/tests/bug78937_3.phpt b/ext/opcache/tests/bug78937_3.phpt
index b17f8d0a08c3b..83a78ba3238df 100644
--- a/ext/opcache/tests/bug78937_3.phpt
+++ b/ext/opcache/tests/bug78937_3.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 include(__DIR__ . "/preload_bug78937.inc");
diff --git a/ext/opcache/tests/bug78937_4.phpt b/ext/opcache/tests/bug78937_4.phpt
index 2598b5db9c166..8e4a2a24f2b9c 100644
--- a/ext/opcache/tests/bug78937_4.phpt
+++ b/ext/opcache/tests/bug78937_4.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 class Bar {
diff --git a/ext/opcache/tests/bug78937_5.phpt b/ext/opcache/tests/bug78937_5.phpt
index dc67b9045696b..a3b087353763e 100644
--- a/ext/opcache/tests/bug78937_5.phpt
+++ b/ext/opcache/tests/bug78937_5.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 include(__DIR__ . "/preload_bug78937.inc");
diff --git a/ext/opcache/tests/bug78937_6.phpt b/ext/opcache/tests/bug78937_6.phpt
index fe9d5176aacb2..08f2fbc3931b9 100644
--- a/ext/opcache/tests/bug78937_6.phpt
+++ b/ext/opcache/tests/bug78937_6.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_bug78937.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 include(__DIR__ . "/preload_bug78937.inc");
diff --git a/ext/opcache/tests/gh10405.phpt b/ext/opcache/tests/gh10405.phpt
index decc538ca46e0..8543e116877c1 100644
--- a/ext/opcache/tests/gh10405.phpt
+++ b/ext/opcache/tests/gh10405.phpt
@@ -12,7 +12,7 @@ opcache
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/gh10914.phpt b/ext/opcache/tests/gh10914.phpt
index 043eb8a8c7d03..45563255d698c 100644
--- a/ext/opcache/tests/gh10914.phpt
+++ b/ext/opcache/tests/gh10914.phpt
@@ -7,10 +7,6 @@ opcache.protect_memory=1
 opcache.preload={PWD}/preload_gh10914.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $x = new ReflectionEnum(ExampleEnum::class);
diff --git a/ext/opcache/tests/gh13433/gh13433.phpt b/ext/opcache/tests/gh13433/gh13433.phpt
index edb3db83ebfc3..ee6ec89024ecc 100644
--- a/ext/opcache/tests/gh13433/gh13433.phpt
+++ b/ext/opcache/tests/gh13433/gh13433.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=0
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $instance = new TheClass;
diff --git a/ext/opcache/tests/gh15021.phpt b/ext/opcache/tests/gh15021.phpt
index 81bf48cde2224..a72b14780c3f3 100644
--- a/ext/opcache/tests/gh15021.phpt
+++ b/ext/opcache/tests/gh15021.phpt
@@ -6,10 +6,6 @@ opcache.enable_cli=1
 opcache.preload={PWD}/gh15021_preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 putenv('RUNTIME=1');
diff --git a/ext/opcache/tests/gh16577.phpt b/ext/opcache/tests/gh16577.phpt
index 9fb1d1149fb9a..ff58a7d90ac4d 100644
--- a/ext/opcache/tests/gh16577.phpt
+++ b/ext/opcache/tests/gh16577.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/gh16577.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 echo "Done\n";
diff --git a/ext/opcache/tests/gh18567.phpt b/ext/opcache/tests/gh18567.phpt
index e1d2a68af6775..756d8f0d7a95a 100644
--- a/ext/opcache/tests/gh18567.phpt
+++ b/ext/opcache/tests/gh18567.phpt
@@ -6,10 +6,6 @@ opcache.enable_cli=1
 opcache.preload={PWD}/preload_gh18567.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 abstract class Test implements MyStringable {
diff --git a/ext/opcache/tests/gh18639.phpt b/ext/opcache/tests/gh18639.phpt
index 28424032931ab..45cf0690c7414 100644
--- a/ext/opcache/tests/gh18639.phpt
+++ b/ext/opcache/tests/gh18639.phpt
@@ -8,10 +8,6 @@ opcache.jit_buffer_size=16M
 opcache.preload={PWD}/preload_gh18567.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 echo "ok\n";
diff --git a/ext/opcache/tests/gh8133.phpt b/ext/opcache/tests/gh8133.phpt
index d341e3f70a6c6..050d3b020a219 100644
--- a/ext/opcache/tests/gh8133.phpt
+++ b/ext/opcache/tests/gh8133.phpt
@@ -7,10 +7,6 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/gh8133.inc
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/gh9968.phpt b/ext/opcache/tests/gh9968.phpt
index 4beb39d133487..2ab2212e79fe3 100644
--- a/ext/opcache/tests/gh9968.phpt
+++ b/ext/opcache/tests/gh9968.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/gh9968-1.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/jit/bug80634.phpt b/ext/opcache/tests/jit/bug80634.phpt
index e7a1d39fae5bf..27f1d4185f88d 100644
--- a/ext/opcache/tests/jit/bug80634.phpt
+++ b/ext/opcache/tests/jit/bug80634.phpt
@@ -9,10 +9,6 @@ opcache.jit=function
 opcache.preload={PWD}/preload_bug80634.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $v = new SomeClass(5);
diff --git a/ext/opcache/tests/jit/bug81256.phpt b/ext/opcache/tests/jit/bug81256.phpt
index 57adff5df0119..803f9bebc85cc 100644
--- a/ext/opcache/tests/jit/bug81256.phpt
+++ b/ext/opcache/tests/jit/bug81256.phpt
@@ -2,10 +2,6 @@
 Bug #81256: Assertion `zv != ((void *)0)' failed for "preload" with JIT
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY === "Windows") die("skip Windows does not support preloading");
-?>
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
diff --git a/ext/opcache/tests/jit/gh14082.phpt b/ext/opcache/tests/jit/gh14082.phpt
index eba67a096b82c..ff17a304fdc15 100644
--- a/ext/opcache/tests/jit/gh14082.phpt
+++ b/ext/opcache/tests/jit/gh14082.phpt
@@ -8,10 +8,6 @@ opcache.jit_buffer_size=16M
 opcache.preload={PWD}/preload_gh14082.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 Foo::test();
diff --git a/ext/opcache/tests/jit/gh15490.phpt b/ext/opcache/tests/jit/gh15490.phpt
index 95dc4aed8cea5..ba3c9d1cd5f87 100644
--- a/ext/opcache/tests/jit/gh15490.phpt
+++ b/ext/opcache/tests/jit/gh15490.phpt
@@ -8,10 +8,6 @@ opcache.enable_cli=1
 opcache.file_update_protection=0
 opcache.preload={PWD}/gh15490.inc
 opcache.jit=1235
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 foo();
diff --git a/ext/opcache/tests/jit/gh18898_1.phpt b/ext/opcache/tests/jit/gh18898_1.phpt
index 6038f006f5e5c..9b88cbefda386 100644
--- a/ext/opcache/tests/jit/gh18898_1.phpt
+++ b/ext/opcache/tests/jit/gh18898_1.phpt
@@ -8,10 +8,6 @@ opcache.jit_buffer_size=16M
 opcache.preload={PWD}/../gh18534_preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $test = new DummyModel;
diff --git a/ext/opcache/tests/jit/gh18898_2.phpt b/ext/opcache/tests/jit/gh18898_2.phpt
index 0ce79b859a979..61d3a5f94fa1e 100644
--- a/ext/opcache/tests/jit/gh18898_2.phpt
+++ b/ext/opcache/tests/jit/gh18898_2.phpt
@@ -8,10 +8,6 @@ opcache.jit_buffer_size=16M
 opcache.preload={PWD}/../gh18534_preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $test = new DummyModel;
diff --git a/ext/opcache/tests/jit/gh8461-007.phpt b/ext/opcache/tests/jit/gh8461-007.phpt
index a2b4879e4e64c..c1e372ac47945 100644
--- a/ext/opcache/tests/jit/gh8461-007.phpt
+++ b/ext/opcache/tests/jit/gh8461-007.phpt
@@ -2,10 +2,6 @@
 Bug GH-8461 007 (JIT does not account for function re-compile)
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY === "Windows") die("skip Windows does not support preloading");
-?>
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
diff --git a/ext/opcache/tests/jit/gh8591-006.phpt b/ext/opcache/tests/jit/gh8591-006.phpt
index 0b9cd3fded5f7..2c1e4523fb8df 100644
--- a/ext/opcache/tests/jit/gh8591-006.phpt
+++ b/ext/opcache/tests/jit/gh8591-006.phpt
@@ -10,10 +10,6 @@ opcache.file_update_protection=0
 opcache.revalidate_freq=0
 opcache.protect_memory=1
 opcache.preload={PWD}/gh8591-006.inc
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/preload_001.phpt b/ext/opcache/tests/preload_001.phpt
index 2a94b2ca754d8..85d2326c392cb 100644
--- a/ext/opcache/tests/preload_001.phpt
+++ b/ext/opcache/tests/preload_001.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(function_exists("f1"));
diff --git a/ext/opcache/tests/preload_002.phpt b/ext/opcache/tests/preload_002.phpt
index b09955379a4f7..86645cb3838cb 100644
--- a/ext/opcache/tests/preload_002.phpt
+++ b/ext/opcache/tests/preload_002.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump((new ReflectionMethod('x', 'foo'))->getPrototype()->class);
diff --git a/ext/opcache/tests/preload_003.phpt b/ext/opcache/tests/preload_003.phpt
index a2b2870118020..2f4df35cddfe2 100644
--- a/ext/opcache/tests/preload_003.phpt
+++ b/ext/opcache/tests/preload_003.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 Y::foo();
diff --git a/ext/opcache/tests/preload_004.phpt b/ext/opcache/tests/preload_004.phpt
index 76047bde62229..9d73e0fbdaae5 100644
--- a/ext/opcache/tests/preload_004.phpt
+++ b/ext/opcache/tests/preload_004.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_undef_const.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(class_exists('Foo'));
diff --git a/ext/opcache/tests/preload_005.phpt b/ext/opcache/tests/preload_005.phpt
index 563256ede22df..c71947c26676c 100644
--- a/ext/opcache/tests/preload_005.phpt
+++ b/ext/opcache/tests/preload_005.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_globals.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $x = 123;
diff --git a/ext/opcache/tests/preload_006.phpt b/ext/opcache/tests/preload_006.phpt
index c72532f41c7b8..70fb45b9ea734 100644
--- a/ext/opcache/tests/preload_006.phpt
+++ b/ext/opcache/tests/preload_006.phpt
@@ -9,7 +9,6 @@ opcache.preload={PWD}/preload_inheritance_error_ind.inc
 opcache
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 if (getenv('SKIP_ASAN')) die('xleak Startup failure leak');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_007.phpt b/ext/opcache/tests/preload_007.phpt
index 71cdfe444f495..416104f029928 100644
--- a/ext/opcache/tests/preload_007.phpt
+++ b/ext/opcache/tests/preload_007.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_include.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 echo "Foobar";
diff --git a/ext/opcache/tests/preload_008.phpt b/ext/opcache/tests/preload_008.phpt
index c6ae2ce1d3b0f..92bb292e132cb 100644
--- a/ext/opcache/tests/preload_008.phpt
+++ b/ext/opcache/tests/preload_008.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(get_anon());
diff --git a/ext/opcache/tests/preload_009.phpt b/ext/opcache/tests/preload_009.phpt
index bb15998f7ab00..9017b76dacbb1 100644
--- a/ext/opcache/tests/preload_009.phpt
+++ b/ext/opcache/tests/preload_009.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_undef_const_2.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(trait_exists('T'));
diff --git a/ext/opcache/tests/preload_010.phpt b/ext/opcache/tests/preload_010.phpt
index 6e431d1ca8d18..a7e2d25067fc3 100644
--- a/ext/opcache/tests/preload_010.phpt
+++ b/ext/opcache/tests/preload_010.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_overwritten_prop_init.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump((new Bar)->prop);
diff --git a/ext/opcache/tests/preload_011.phpt b/ext/opcache/tests/preload_011.phpt
index 23bceed19b9ba..6d9f1056bb229 100644
--- a/ext/opcache/tests/preload_011.phpt
+++ b/ext/opcache/tests/preload_011.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_variance_ind.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 interface K {}
diff --git a/ext/opcache/tests/preload_012.phpt b/ext/opcache/tests/preload_012.phpt
index 836d4707a0d9c..5e979486e2506 100644
--- a/ext/opcache/tests/preload_012.phpt
+++ b/ext/opcache/tests/preload_012.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_const_autoload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/preload_013.phpt b/ext/opcache/tests/preload_013.phpt
index f0e9df4b438b4..e9e7fafa801d8 100644
--- a/ext/opcache/tests/preload_013.phpt
+++ b/ext/opcache/tests/preload_013.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_nested_function.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 test();
diff --git a/ext/opcache/tests/preload_bug79114.phpt b/ext/opcache/tests/preload_bug79114.phpt
index b845e0141e28c..4d8161e082a4f 100644
--- a/ext/opcache/tests/preload_bug79114.phpt
+++ b/ext/opcache/tests/preload_bug79114.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(class_exists(Foo::class));
diff --git a/ext/opcache/tests/preload_class_alias.phpt b/ext/opcache/tests/preload_class_alias.phpt
index 72c88fe7a3e0e..cce241c29a23a 100644
--- a/ext/opcache/tests/preload_class_alias.phpt
+++ b/ext/opcache/tests/preload_class_alias.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_class_alias.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(class_exists('A'));
diff --git a/ext/opcache/tests/preload_class_alias_2.phpt b/ext/opcache/tests/preload_class_alias_2.phpt
index b697110083ed3..ae47207c4eb89 100644
--- a/ext/opcache/tests/preload_class_alias_2.phpt
+++ b/ext/opcache/tests/preload_class_alias_2.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_class_alias_2.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(class_exists('B'));
diff --git a/ext/opcache/tests/preload_dynamic_def_removal.phpt b/ext/opcache/tests/preload_dynamic_def_removal.phpt
index acc26873e1867..50a4ef29216e8 100644
--- a/ext/opcache/tests/preload_dynamic_def_removal.phpt
+++ b/ext/opcache/tests/preload_dynamic_def_removal.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_dynamic_def_removal.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 dynamic();
diff --git a/ext/opcache/tests/preload_dynamic_function.phpt b/ext/opcache/tests/preload_dynamic_function.phpt
index 68c552aec8a7f..7002074152222 100644
--- a/ext/opcache/tests/preload_dynamic_function.phpt
+++ b/ext/opcache/tests/preload_dynamic_function.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_dynamic_function.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(function_exists("f"));
diff --git a/ext/opcache/tests/preload_early_binding.phpt b/ext/opcache/tests/preload_early_binding.phpt
index 557d71d096698..7c9185d2c38d3 100644
--- a/ext/opcache/tests/preload_early_binding.phpt
+++ b/ext/opcache/tests/preload_early_binding.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_early_binding.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 OK
 --EXPECT--
diff --git a/ext/opcache/tests/preload_enum.phpt b/ext/opcache/tests/preload_enum.phpt
index 55ce7afdb35cf..18783746b0b93 100644
--- a/ext/opcache/tests/preload_enum.phpt
+++ b/ext/opcache/tests/preload_enum.phpt
@@ -7,10 +7,6 @@ opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
 opcache.preload={PWD}/preload_enum.inc
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/preload_enum_observed.phpt b/ext/opcache/tests/preload_enum_observed.phpt
index 7898fa084a5ff..7c706c4c5ddc1 100644
--- a/ext/opcache/tests/preload_enum_observed.phpt
+++ b/ext/opcache/tests/preload_enum_observed.phpt
@@ -11,10 +11,6 @@ opcache.preload={PWD}/preload_enum.inc
 zend_test.observer.enabled=1
 zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 
diff --git a/ext/opcache/tests/preload_error_handler.phpt b/ext/opcache/tests/preload_error_handler.phpt
index d788862d47472..164ba8262b4b0 100644
--- a/ext/opcache/tests/preload_error_handler.phpt
+++ b/ext/opcache/tests/preload_error_handler.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_error_handler.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 ===DONE===
 --EXPECTF--
diff --git a/ext/opcache/tests/preload_ind.phpt b/ext/opcache/tests/preload_ind.phpt
index f1b6b26ead2ca..f90c5be7d1eb6 100644
--- a/ext/opcache/tests/preload_ind.phpt
+++ b/ext/opcache/tests/preload_ind.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_ind.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 OK
 --EXPECT--
diff --git a/ext/opcache/tests/preload_loadable_classes_1.phpt b/ext/opcache/tests/preload_loadable_classes_1.phpt
index 4fd463b49c45b..fc3913a6b3009 100644
--- a/ext/opcache/tests/preload_loadable_classes_1.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_1.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_1.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(class_exists('Test'));
diff --git a/ext/opcache/tests/preload_loadable_classes_2.phpt b/ext/opcache/tests/preload_loadable_classes_2.phpt
index 9ad9800377c88..43fbf684e1b6f 100644
--- a/ext/opcache/tests/preload_loadable_classes_2.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_2.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_2.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 const UNDEF = 1;
diff --git a/ext/opcache/tests/preload_loadable_classes_3.phpt b/ext/opcache/tests/preload_loadable_classes_3.phpt
index f9928c8e54cff..16d94cc76be47 100644
--- a/ext/opcache/tests/preload_loadable_classes_3.phpt
+++ b/ext/opcache/tests/preload_loadable_classes_3.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_loadable_classes_3.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 class Foo {
diff --git a/ext/opcache/tests/preload_method_static_vars.phpt b/ext/opcache/tests/preload_method_static_vars.phpt
index 52edfc0fd338a..c62fe299ba28b 100644
--- a/ext/opcache/tests/preload_method_static_vars.phpt
+++ b/ext/opcache/tests/preload_method_static_vars.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_method_static_vars.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 Foo::test();
diff --git a/ext/opcache/tests/preload_optimizer.phpt b/ext/opcache/tests/preload_optimizer.phpt
index 168e94dc19564..57a0558052a91 100644
--- a/ext/opcache/tests/preload_optimizer.phpt
+++ b/ext/opcache/tests/preload_optimizer.phpt
@@ -7,10 +7,6 @@ opcache.preload={PWD}/preload_optimizer.inc
 opcache.opt_debug_level=0x20000
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 echo foo();
diff --git a/ext/opcache/tests/preload_parse_error.phpt b/ext/opcache/tests/preload_parse_error.phpt
index 5eb8d877f0445..68ccf531eb40f 100644
--- a/ext/opcache/tests/preload_parse_error.phpt
+++ b/ext/opcache/tests/preload_parse_error.phpt
@@ -9,7 +9,6 @@ opcache.preload={PWD}/preload_parse_error.inc
 opcache
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
 if (getenv('SKIP_ASAN')) die('xleak Startup failure leak');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_prop_info_table.phpt b/ext/opcache/tests/preload_prop_info_table.phpt
index 4c93496bf161e..040dfd39522dc 100644
--- a/ext/opcache/tests/preload_prop_info_table.phpt
+++ b/ext/opcache/tests/preload_prop_info_table.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $e = new MyException("foo");
diff --git a/ext/opcache/tests/preload_static_var_inheritance.phpt b/ext/opcache/tests/preload_static_var_inheritance.phpt
index bb013a9983bcc..13e164756693a 100644
--- a/ext/opcache/tests/preload_static_var_inheritance.phpt
+++ b/ext/opcache/tests/preload_static_var_inheritance.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_static_var_inheritance.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump((new B)->test());
diff --git a/ext/opcache/tests/preload_trait_alias.phpt b/ext/opcache/tests/preload_trait_alias.phpt
index a931d838a2476..7efca2fea92f3 100644
--- a/ext/opcache/tests/preload_trait_alias.phpt
+++ b/ext/opcache/tests/preload_trait_alias.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 var_dump(get_class_methods('TraitAliasTest'));
diff --git a/ext/opcache/tests/preload_trait_multiple_fixup.phpt b/ext/opcache/tests/preload_trait_multiple_fixup.phpt
index 5f12de5bcbde8..22b117b8d3c24 100644
--- a/ext/opcache/tests/preload_trait_multiple_fixup.phpt
+++ b/ext/opcache/tests/preload_trait_multiple_fixup.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_trait_multiple_fixup.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 (new C2)->method();
diff --git a/ext/opcache/tests/preload_trait_static.phpt b/ext/opcache/tests/preload_trait_static.phpt
index cbf09c57a07d0..59710188e0407 100644
--- a/ext/opcache/tests/preload_trait_static.phpt
+++ b/ext/opcache/tests/preload_trait_static.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_trait_static.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $bar = new Bar;
diff --git a/ext/opcache/tests/preload_unresolved_prop_type.phpt b/ext/opcache/tests/preload_unresolved_prop_type.phpt
index 0ec301b5c88e7..81b77daffa02a 100644
--- a/ext/opcache/tests/preload_unresolved_prop_type.phpt
+++ b/ext/opcache/tests/preload_unresolved_prop_type.phpt
@@ -7,10 +7,6 @@ opcache.optimization_level=-1
 opcache.preload={PWD}/preload_unresolved_prop_type.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 class Unknown {
diff --git a/ext/opcache/tests/preload_user_001.phpt b/ext/opcache/tests/preload_user_001.phpt
index 2a7cb2955441a..350365845f1d3 100644
--- a/ext/opcache/tests/preload_user_001.phpt
+++ b/ext/opcache/tests/preload_user_001.phpt
@@ -12,7 +12,7 @@ opcache
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() === 0) die('skip Test needs non-root user');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_user_002.phpt b/ext/opcache/tests/preload_user_002.phpt
index 90b2be8c27640..a6a7fa3144711 100644
--- a/ext/opcache/tests/preload_user_002.phpt
+++ b/ext/opcache/tests/preload_user_002.phpt
@@ -12,7 +12,7 @@ opcache
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_user_003.phpt b/ext/opcache/tests/preload_user_003.phpt
index 56f69644cb587..8410f46a100a4 100644
--- a/ext/opcache/tests/preload_user_003.phpt
+++ b/ext/opcache/tests/preload_user_003.phpt
@@ -12,7 +12,7 @@ opcache
 posix
 --SKIPIF--
 <?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 if (posix_getpwnam('root') === false) die('skip Root user does not exist');
 ?>
diff --git a/ext/opcache/tests/preload_user_004.phpt b/ext/opcache/tests/preload_user_004.phpt
index 71cb5e09cf1c2..5778373598cc8 100644
--- a/ext/opcache/tests/preload_user_004.phpt
+++ b/ext/opcache/tests/preload_user_004.phpt
@@ -7,7 +7,7 @@ posix
 --SKIPIF--
 <?php
 require dirname(__DIR__, 3) . '/sapi/fpm/tests/skipif.inc';
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 ?>
 --FILE--
diff --git a/ext/opcache/tests/preload_user_005.phpt b/ext/opcache/tests/preload_user_005.phpt
index 2276b1a5cf268..6af881db40135 100644
--- a/ext/opcache/tests/preload_user_005.phpt
+++ b/ext/opcache/tests/preload_user_005.phpt
@@ -7,7 +7,7 @@ posix
 --SKIPIF--
 <?php
 require dirname(__DIR__, 3) . '/sapi/fpm/tests/skipif.inc';
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
+if (PHP_OS_FAMILY == 'Windows') die('skip opcache.preload_user is not supported on Windows');
 if (posix_geteuid() !== 0) die('skip Test needs root user');
 if (posix_getpwnam('root') === false) die('skip Root user does not exist');
 ?>
diff --git a/ext/opcache/tests/preload_windows.phpt b/ext/opcache/tests/preload_windows.phpt
deleted file mode 100644
index 24e043d7320c9..0000000000000
--- a/ext/opcache/tests/preload_windows.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Preloading is not supported on Windows
---INI--
-opcache.enable=1
-opcache.enable_cli=1
-opcache.optimization_level=-1
-opcache.preload={PWD}/preload.inc
---EXTENSIONS--
-opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY != 'Windows') die('skip Windows only test');
-?>
---FILE--
-Unreachable
---EXPECTF--
-%s: Error Preloading is not supported on Windows
diff --git a/ext/opcache/tests/preloading_no_auto_globals_jit.phpt b/ext/opcache/tests/preloading_no_auto_globals_jit.phpt
index e57a50e27634d..d4820202eae48 100644
--- a/ext/opcache/tests/preloading_no_auto_globals_jit.phpt
+++ b/ext/opcache/tests/preloading_no_auto_globals_jit.phpt
@@ -7,10 +7,6 @@ opcache.enable_cli=1
 opcache.preload={PWD}/preloading_no_auto_globals_jit.inc
 --EXTENSIONS--
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --FILE--
 <?php
 $test = new Test;
diff --git a/ext/zend_test/tests/observer_preload.phpt b/ext/zend_test/tests/observer_preload.phpt
index 042c9e088e53f..6518dfe1304da 100644
--- a/ext/zend_test/tests/observer_preload.phpt
+++ b/ext/zend_test/tests/observer_preload.phpt
@@ -3,10 +3,6 @@ Observer: Test with basic preloading
 --EXTENSIONS--
 zend_test
 opcache
---SKIPIF--
-<?php
-if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows');
-?>
 --INI--
 opcache.enable=1
 opcache.enable_cli=1