diff --git a/ext/standard/tests/file/windows_mb_path/bug54028.phpt b/ext/standard/tests/file/windows_mb_path/bug54028.phpt
index 61913a1a7218f..3603bced34d8a 100644
--- a/ext/standard/tests/file/windows_mb_path/bug54028.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug54028.phpt
@@ -4,12 +4,8 @@ Bug #54028 Directory::read() cannot handle non-unicode chars properly
 mbstring
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt
index af27036701560..42dde0f96c68a 100644
--- a/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug54028_2.phpt
@@ -2,12 +2,8 @@
 Bug #54028 realpath(".") return false
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt
index 5edead63edb02..d7a32d95b9f04 100644
--- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt
@@ -2,12 +2,8 @@
 Bug #54977 UTF-8 files and folder are not shown
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug61315.phpt b/ext/standard/tests/file/windows_mb_path/bug61315.phpt
index 8729aafe09e2e..02531b8dd4edd 100644
--- a/ext/standard/tests/file/windows_mb_path/bug61315.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug61315.phpt
@@ -2,12 +2,8 @@
 Bug #61315 stat() fails with specific DBCS characters
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt
index 0bcf0d778cd6d..5785ce1a19898 100644
--- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt
@@ -2,12 +2,8 @@
 PHP can not read or write file correctly if file name have special char like š
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug64699.phpt b/ext/standard/tests/file/windows_mb_path/bug64699.phpt
index 20d4182b71977..0bde1ea1bfa58 100644
--- a/ext/standard/tests/file/windows_mb_path/bug64699.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug64699.phpt
@@ -2,12 +2,8 @@
 Bug #64699 is_dir() is inaccurate result on Windows with japanese locale.
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
@@ -16,8 +12,9 @@ skip_if_no_required_exts();
 
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-$old_cp = get_active_cp();
-set_active_cp(65001);
+$old_cp = sapi_windows_cp_get();
+sapi_windows_cp_set(65001);
+echo "Active code page: ", sapi_windows_cp_get(), "\n";
 
 $prefix = __DIR__ . DIRECTORY_SEPARATOR . "testBug64699" . DIRECTORY_SEPARATOR;
 
@@ -45,10 +42,10 @@ foreach ($dirs as $d) {
 }
 rmdir($prefix);
 
-set_active_cp($old_cp);
+sapi_windows_cp_set($old_cp);
 
 ?>
---EXPECTF--
+--EXPECT--
 Active code page: 65001
 filetype()[dir ] == is_dir()[dir ] -> OK: .
 filetype()[dir ] == is_dir()[dir ] -> OK: ..
@@ -58,4 +55,3 @@ filetype()[dir ] == is_dir()[dir ] -> OK: ソ
 filetype()[dir ] == is_dir()[dir ] -> OK: ゾ
 filetype()[dir ] == is_dir()[dir ] -> OK: 多国語
 filetype()[dir ] == is_dir()[dir ] -> OK: 表
-Active code page: %d
diff --git a/ext/standard/tests/file/windows_mb_path/bug70903.phpt b/ext/standard/tests/file/windows_mb_path/bug70903.phpt
index 48cbf524c96d8..25a6f92b0abcc 100644
--- a/ext/standard/tests/file/windows_mb_path/bug70903.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug70903.phpt
@@ -2,12 +2,8 @@
 Bug #70903 scandir wrongly interprets the Turkish "ı" character
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt
index 8238072d14804..f7606a26e5976 100644
--- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Bug #71509 Zip problem with swedish letters in filename.
+--EXTENSIONS--
+zip
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts("zip");
-
 ?>
 --CONFLICTS--
 bug71509
diff --git a/ext/standard/tests/file/windows_mb_path/bug74923.phpt b/ext/standard/tests/file/windows_mb_path/bug74923.phpt
index 9cffd5860f601..fb87f2b266d54 100644
--- a/ext/standard/tests/file/windows_mb_path/bug74923.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug74923.phpt
@@ -2,11 +2,8 @@
 Bug #74923 Crash when crawling through network share
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt
index ec1d88a10e1bb..e6f76affcc2e2 100644
--- a/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug75063_cp1251.phpt
@@ -2,12 +2,8 @@
 Bug #75063 Many filesystem-related functions do not work with multibyte file names, cp1251
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --INI--
 default_charset=cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
index a1878bb88a37c..615b76d196fb6 100644
--- a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
@@ -2,12 +2,8 @@
 Bug #75063 Many filesystem-related functions do not work with multibyte file names, UTF-8
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
index fb97086b2bcd0..ff4713551a8fd 100644
--- a/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
+++ b/ext/standard/tests/file/windows_mb_path/recursive_it.phpt
@@ -2,10 +2,7 @@
 RecursiveDirectoryIterator with dir path long or of edge case length
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
-
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (strlen(__DIR__) > 259) die("skip Unsuitable starting path length");
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
index 794c1a2f7b878..7dc11a6167b5d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading big5 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(950, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
index d4821b23be0e4..7a88f57b7cf0d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir big5 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(950, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
index d7652615dea4e..89a8970344814 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write big5 to UTF-8 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(950, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
index b355267f851d9..c68bd58be0fc6 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading big5 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_big5
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
index 5076768c955b3..33573f04ec39e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir big5 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_big5
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
index 4f94f898796f3..2451ebca18e95 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write big5 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_big5
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
index 98c716678a6d7..20e5de98e07f9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
index ad09ff1967caf..1411911f6d54c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
index 61e1b4eaa598b..72cf60068d246 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write to UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
index 2f3ae9afd608d..4c07d5a6de656 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
index 8992a847eb507..9d2a13de2b949 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
index 392c486a767f7..4ed862f08b086 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write to UTF-8 path with cp1250 specific symbols
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1250
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
index bf30b4baeb040..7766d6dfd327e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading CP1251 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1251, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
index 0ea67f575e563..1ea343ae30ce1 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir CP1251 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1251, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
index f65b38eafdad0..60a7dbf07fd89 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write CP1251 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1251, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
index 0cd657e94c596..6cb74e468eaeb 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading CP1251 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
index 6e53ff48c99d9..7776b908a8de9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir CP1251 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
index 95b75985c6188..90c9ddf01254c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write CP1251 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
index 8b800ed3bdeab..f962c5c0b0240 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
@@ -7,12 +7,8 @@ zend.multibyte=1
 zend.script_encoding=cp1251
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
index 31db615f4d2c8..6d8a1f5d0050f 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
@@ -7,12 +7,8 @@ zend.multibyte=1
 zend.script_encoding=cp1251
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
index d6075da559c92..63745231771de 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
@@ -7,12 +7,8 @@ zend.multibyte=1
 zend.script_encoding=cp1251
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1251
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
index f2671aa6054a5..aa3bc38dded21 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
@@ -4,9 +4,8 @@ cp1252 cmd test
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(437, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
index 45234243cee44..c7631eb601538 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
index 5f5a6a78385a7..ea14608ad4c03 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
index 04baef95b0252..381b64eda6045 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
index f6559253d2de4..ef441bcbbfddf 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file2_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
index a3359f686c1b3..739413dd74848 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir2_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
index 42212d027126c..9cf7a31feea1b 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write cp1252 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir2_cp1252
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
index 93b63a536e839..11116849036b1 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp1253 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1253, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
index 9ffdb11b2b83e..998ab348a0dc3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp1253 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1253, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
index 642e4aaabd194..01177620bd549 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write cp1253
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1253, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
index d12a174a7feaf..a592ed1f85bc6 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading cp1253 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1253
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
index c84e9c95b3694..addc407f3e976 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir cp1253 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1253
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
index c0723d18b1228..cf88d95a4c696 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write cp1253 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1253
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
index 77b52e0f1a2d6..83a413549ab31 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp1254 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(857, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
index 82d74c750961b..9dc8225598358 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp1254 to UTF-8 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(857, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
index f14a4c3de086e..2e386b3af45b9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write cp1254 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(857, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
index 0e0e83d285a3b..076bf2eba50ea 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
@@ -4,9 +4,8 @@ cp1254 cmd test
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1254, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
index 211233de1c8e4..8dff7615dbfb5 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading cp1254 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1254
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
index 42b241176ffb6..7b83cdbb395b3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir cp1254 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1254
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
index b0c4f5ec83f0e..5ec63de4bc6e8 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write cp1254 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1254
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
index 67549daf601d2..1e70dc8fe5b14 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
@@ -2,12 +2,8 @@
 cp1254 cmd test
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1254
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
index e9adaf843fb6a..61bb6b4155dc0 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp1255 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1255, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
index 2cf42239267ad..a539ce8fd34e3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp1255 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1255, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
index e4779b721ba92..7fe2fecb7ea39 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write cp1255 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1255, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
index 1b65143553425..e8b35687e2fa8 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading cp1255 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1255
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
index 356143ca7876a..48fa4f26a4b73 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir cp1255 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1255
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
index b378a7231d15e..358908ae56bd2 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write cp1255 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1255
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
index 40910894b8ee7..9c0abe4c83269 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp1256 to UTF-8 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1256, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
index 244758fe7bd67..f19bd04e9da98 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp1256 to UTF-8 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1256, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
index f5b5db8935277..c734e24205d6a 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write cp1256 to UTF-8 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(1256, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
index 901026f3899b0..9af7d83df2ad9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading cp1256 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp1256
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
index b630f37648bc4..6da6d789e45ee 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir cp1256 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1256
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
index 6aa29f43c4268..2cce0b5411169 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write cp1256 to UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp1256
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
index e8bc394a5d0d1..cbab58e84855c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
@@ -4,9 +4,8 @@ Thai cp874 basic test
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(874, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
index 9d948d4023aa6..cd438c52f361e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
@@ -4,9 +4,8 @@ Thai cp874 cmd test
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(874, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
index c21f124b6e195..b8ed1c23758a3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
@@ -2,12 +2,8 @@
 Thai UTF-8 basic test
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
index 2019b1245102c..a75c43a9a7421 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
@@ -2,12 +2,8 @@
 Thai UTF-8 cmd test
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp874
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
index ccb273a94ce0f..d2a8e06a61cb0 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp932 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(932, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
index 744d1a592be95..3f58aa5614f5c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp932
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(932, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
index 737a4d3eb869b..dc474cf9dff38 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write to cp932 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(932, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
index 4fdfb925a82db..d54d90e17beed 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
@@ -4,9 +4,8 @@ cp932 cmd test
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(932, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
index df855aaca4e3b..925e0558ab26a 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading cp932 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp932
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
index b9575302c8abc..8346c86a4d195 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir cp932 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp932
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
index 7c3870593692e..5d0f10f647acd 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write cp932 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp932
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
index b1a4f8744f94c..3199aa979355e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
@@ -4,9 +4,8 @@ Test fopen() for reading cp936 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(936, "ansi");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
index 529808aad5fb2..8ee68392ff318 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
@@ -4,9 +4,8 @@ Test mkdir/rmdir cp936 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(936, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
index e872c05942a68..024e84d4317fc 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
@@ -4,9 +4,8 @@ Test fopen() for write cp936 path
 <?php
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
 skip_if_wrong_cp(936, "oem");
 
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
index 2797d25904f7f..39f989371968d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading cp936 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp936
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
index f9730b6fe9a08..7321ea0ed9d59 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir cp936 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_cp936
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
index 31ff1db318b84..8b3eb208f12fe 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write cp936 to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_cp936
diff --git a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt
index 3cb09f777d37f..9f9d1f24e6cdc 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cwd_mb_names.phpt
@@ -2,15 +2,8 @@
 Test chdir()/getcwd() with a dir for multibyte filenames
 --SKIPIF--
 <?php
-
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
-
 ?>
 --CONFLICTS--
 dir_mb
@@ -24,8 +17,9 @@ $prefix = create_data("dir_mb");
 $dirw = $prefix . DIRECTORY_SEPARATOR . "テストマルチバイト・パス42";
 touch($dirw . DIRECTORY_SEPARATOR . "dummy.txt");
 
-$old_cp = get_active_cp();
-set_active_cp(65001);
+$old_cp = sapi_windows_cp_get();
+sapi_windows_cp_set(65001);
+echo "Active code page: ", sapi_windows_cp_get(), "\n";
 
 $oldcwd = getcwd();
 var_dump(chdir($dirw));
@@ -33,7 +27,7 @@ var_dump(getcwd());
 
 var_dump(file_exists("dummy.txt"));
 
-set_active_cp($old_cp);
+sapi_windows_cp_set($old_cp);
 
 chdir($oldcwd);
 remove_data("dir_mb");
@@ -44,4 +38,3 @@ Active code page: 65001
 bool(true)
 string(%d) "%s\テストマルチバイト・パス42"
 bool(true)
-Active code page: %d
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
index 7a06f53b7dd0c..48f2443017d6c 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for reading eucjp to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_eucjp
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
index e3111ba33af7e..922f9e8290644 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test mkdir/rmdir eucjp to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_eucjp
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
index 9425a1cc1cea8..b4a9895428d53 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
@@ -1,13 +1,11 @@
 --TEST--
 Test fopen() for write eucjp to UTF-8 path
+--EXTENSIONS--
+iconv
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_eucjp
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
index 0840610c2058e..f3c4f18131fa7 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
@@ -2,12 +2,8 @@
 Test fopen() for reading Kartuli UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_kartuli
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
index d348ccfd3c8fd..16f68f0f0ecb8 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
@@ -2,12 +2,8 @@
 Test mkdir/rmdir Kartuli UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_kartuli
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
index 2e57dc0c91fa0..ca6c887a24ed9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
@@ -2,12 +2,8 @@
 Test fopen() for write Kartuli UTF-8 path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 dir_kartuli
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
index 8d498d19907b1..e0984b0dd73bd 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
@@ -2,12 +2,8 @@
 Kartuli UTF-8 cmd test
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 file_kartuli
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
index 6a5b60f08bbeb..daabfaad17fe4 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
@@ -4,12 +4,8 @@ Basic long path test
 mbstring
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
index 427f0e9cf5d09..28783b19c52a9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
@@ -2,11 +2,8 @@
 Basic long path test with file I/O
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
index 09ccebc0c0766..fcbadcc9b6a92 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
@@ -4,12 +4,8 @@ Basic long path test with file I/O, multibyte path and realpath() check
 mbstring
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt
index 6acdddd4c2360..146f10d61f640 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt
@@ -2,11 +2,8 @@
 Bug #30730 Filename path length limit broken on NTFS volume, using rename
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt
index 5b797d293b3bc..cebfc35f31bc7 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt
@@ -2,11 +2,8 @@
 Bug #70943 fopen() can't open a file if path is 259 characters long
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt
index 3e024c5e56203..8529380c4a6fe 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug71103.phpt
@@ -2,11 +2,8 @@
 Bug #71103 file_exists and is_readable fail silently
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
index 1502d62e02286..683edbb95b2b6 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
@@ -2,12 +2,10 @@
 Mkdir with path length < 260 and > 248 has be a long path
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 
 $start = realpath(__DIR__);
-if (strlen($start) > 260 || strlen($start) > 248) {
+if (strlen($start) > 260 || strlen($start) < 248) {
     die("skip the starting path length is unsuitable for this test");
 }
 
diff --git a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt
index 84fe5e327335b..65a0dada9f4c4 100644
--- a/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_readdir_mb_names.phpt
@@ -2,12 +2,8 @@
 Test readdir() with a dir for multibyte filenames
 --SKIPIF--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
 ?>
 --CONFLICTS--
 mb_names
@@ -38,8 +34,9 @@ create_verify_dir($prefix, "żółć");
 
 $dirw = $prefix . DIRECTORY_SEPARATOR;
 
-$old_cp = get_active_cp();
-set_active_cp(65001);
+$old_cp = sapi_windows_cp_get();
+sapi_windows_cp_set(65001);
+echo "Active code page: ", sapi_windows_cp_get(), "\n";
 
 if (is_dir($dirw)) {
     if ($dh = opendir($dirw)) {
@@ -51,12 +48,12 @@ if (is_dir($dirw)) {
 } else {
     echo "is_dir failed\n";
 }
-set_active_cp($old_cp);
+sapi_windows_cp_set($old_cp);
 
 remove_data("mb_names");
 
 ?>
---EXPECTF--
+--EXPECT--
 Active code page: 65001
 filename: . : filetype: dir
 filename: .. : filetype: dir
@@ -76,4 +73,3 @@ filename: テストマルチバイト・パス : filetype: file
 filename: テストマルチバイト・パス42 : filetype: dir
 filename: 測試多字節路徑 : filetype: file
 filename: 測試多字節路徑5 : filetype: dir
-Active code page: %d
diff --git a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt
index 53dd1bd3ea862..ce040d1eda545 100644
--- a/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_rename_mb_names.phpt
@@ -2,62 +2,42 @@
 Test rename() with a dir for multibyte filenames
 --SKIPIF--
 <?php
-
-include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
-
-
-skip_if_not_win();
+if (PHP_OS_FAMILY !== 'Windows') die('skip windows only test');
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-skip_if_no_required_exts();
-
-
 ?>
 --CONFLICTS--
 file2_mb
 --FILE--
 <?php
 
-
 include __DIR__ . DIRECTORY_SEPARATOR . "util.inc";
 
-
 $prefix = create_data("file2_mb");
 
 $fw_orig = $prefix . DIRECTORY_SEPARATOR . "Ελλάδα.txt";
-
-
-
 $fw_copied = $prefix . DIRECTORY_SEPARATOR . "Ελλάδα_copy.txt";
-
-
 $fw_renamed = $prefix . DIRECTORY_SEPARATOR . "測試多字節路徑17.txt";
 
-
-
-$old_cp = get_active_cp();
-
-set_active_cp(65001);
-
-
-
-
+$old_cp = sapi_windows_cp_get();
+sapi_windows_cp_set(65001);
+echo "Active code page: ", sapi_windows_cp_get(), "\n";
 
 var_dump(copy($fw_orig, $fw_copied));
-var_dump(get_basename_with_cp($fw_copied, get_active_cp(), false));
+var_dump(get_basename($fw_copied, false));
 var_dump(file_exists($fw_copied));
 
 var_dump(rename($fw_copied, $fw_renamed));
-var_dump(get_basename_with_cp($fw_renamed, get_active_cp(), false));
+var_dump(get_basename($fw_renamed, false));
 var_dump(file_exists($fw_renamed));
 
 var_dump(unlink($fw_renamed));
 
-set_active_cp($old_cp);
+sapi_windows_cp_set($old_cp);
 
 remove_data("file2_mb");
 
 ?>
---EXPECTF--
+--EXPECT--
 Active code page: 65001
 bool(true)
 string(21) "Ελλάδα_copy.txt"
@@ -66,4 +46,3 @@ bool(true)
 string(27) "測試多字節路徑17.txt"
 bool(true)
 bool(true)
-Active code page: %d
diff --git a/ext/standard/tests/file/windows_mb_path/util.inc b/ext/standard/tests/file/windows_mb_path/util.inc
index a26a66c01751b..a94e2d75c5104 100644
--- a/ext/standard/tests/file/windows_mb_path/util.inc
+++ b/ext/standard/tests/file/windows_mb_path/util.inc
@@ -1,36 +1,7 @@
 <?php
 
-function get_active_cp($kind = "")
+function get_basename($path, $echo = true)
 {
-    if (version_compare(PHP_VERSION, '7.1', '<')) {
-        $s = exec("chcp");
-        preg_match(",.*: (\d+),", $s, $m);
-
-        return $m[1];
-    } else {
-        return sapi_windows_cp_get($kind);
-    }
-}
-
-function set_active_cp($cp, $echo = true)
-{
-    if (version_compare(PHP_VERSION, '7.1', '<')) {
-        $ret = exec("chcp $cp");
-    } else {
-        if (!sapi_windows_cp_set($cp)) {
-            echo "Failed to set cp $cp\n";
-            return;
-        }
-
-        if ($echo) echo "Active code page: ", get_active_cp(), "\n";
-    }
-}
-
-function get_basename_with_cp($path, $cp, $echo = true)
-{
-    $old_cp = get_active_cp();
-    set_active_cp($cp, $echo);
-
     if ($echo) echo "getting basename of $path\n";
 
     $cmd = "powershell -command \"Get-Item -Path '$path' | Format-Table -HideTableHeaders Name\"";
@@ -39,34 +10,27 @@ function get_basename_with_cp($path, $cp, $echo = true)
     if ($echo) var_dump($out, $out == basename($path));
     if ($echo) var_dump(realpath($path));
 
-    set_active_cp($old_cp, $echo);
-
     return $out;
 }
 
-function skip_if_wrong_cp($cp, $kind = "")
+function get_basename_with_cp($path, $cp, $echo = true)
 {
-    if (get_active_cp($kind) != $cp) {
-        die("skip this test expect codepage $cp");
-    }
-}
+    $old_cp = sapi_windows_cp_get();
+    sapi_windows_cp_set($cp);
+    if ($echo) echo "Active code page: ", sapi_windows_cp_get(), "\n";
 
-function skip_if_no_required_exts()
-{
-    $exts = func_get_args();
-    $exts[] = "iconv";
+    $out = get_basename($path, $echo);
 
-    foreach ($exts as $ext) {
-        if (!extension_loaded($ext)) {
-            die("skip $ext is not loaded");
-        }
-    }
+    sapi_windows_cp_set($old_cp);
+    if ($echo) echo "Active code page: ", sapi_windows_cp_get(), "\n";
+
+    return $out;
 }
 
-function skip_if_not_win()
+function skip_if_wrong_cp($cp, $kind = "")
 {
-    if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-        die('skip windows only test');
+    if (sapi_windows_cp_get($kind) != $cp) {
+        die("skip this test expect codepage $cp");
     }
 }
 
@@ -126,29 +90,9 @@ function remove_data($id, $dir = NULL)
     }
 }
 
-function create_data($id, $item = "", $cp = 65001, $utf8 = true)
+/* Keep this file ASCII, so zend.multibyte related stuff can be tasted as well. */
+include __DIR__ . DIRECTORY_SEPARATOR . "util_utf8.inc";
+function create_data($id, $item = "", $cp = 65001)
 {
-    if ($utf8) {
-        /* Keep this file ASCII, so zend.multibyte related stuff can be tasted as well. */
-        include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util_utf8.inc";
-        return create_data_from_utf8($id, $item, $cp);
-    } else {
-
-        $prefix = dirname(__FILE__) . DIRECTORY_SEPARATOR . $id;
-
-        if (!is_dir($prefix)) {
-            mkdir($prefix);
-        }
-
-        if (0 === strpos($id, "dir")) {
-            create_verify_dir($prefix, $item, $cp);
-        } else if (0 === strpos($id, "file")) {
-            /* a bit unhandy, but content can be put from outside, if needed */
-            create_verify_file($prefix, $item, "dummy content", $cp);
-        } else {
-            echo "Item has either to start with \"dir\" or \"file\"";
-        }
-    }
-
-    return $prefix;
+    return create_data_from_utf8($id, $item, $cp);
 }