diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt
index 8b0db68a547..ff0f9f2e6f1 100644
--- a/ext/standard/tests/general_functions/parse_ini_file.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_file.phpt
@@ -1,7 +1,5 @@
 --TEST--
 parse_ini_file() multiple calls
---SKIPIF--
-<?php if( substr(PHP_OS, 0, 3) == 'WIN' ) die("skip Windows has different error message");?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt
index 6f6e418ffcc..8322a0912de 100644
--- a/ext/standard/tests/network/tcp6loop.phpt
+++ b/ext/standard/tests/network/tcp6loop.phpt
@@ -2,11 +2,13 @@
 Streams Based IPv6 TCP Loopback test
 --SKIPIF--
 <?php
-	/* If IPv6 is supported on the platform this will error out with code 111 - Connection refused.
+	/* If IPv6 is supported on the platform this will error out with code 111 - Connection refused (or code 10049 on Windows).
 	   If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error)
 	   Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */
 	@stream_socket_client('tcp://[::1]:0', $errno);
-	if ($errno != 111) die('skip IPv6 not supported.');
+	if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
+		die('skip IPv6 is not supported.');
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt
index 06d9bf48119..533d9afb2ae 100644
--- a/ext/standard/tests/network/udp6loop.phpt
+++ b/ext/standard/tests/network/udp6loop.phpt
@@ -3,7 +3,7 @@ Streams Based IPv6 UDP Loopback test
 --SKIPIF--
 <?php
 	/* If IPv6 is supported on the platform this will error out with code 111 -
-	 * Connection refused.  If IPv6 is NOT supported, $errno will be set to
+	 * Connection refused (or code 10049 on Windows).  If IPv6 is NOT supported, $errno will be set to
 	 * something else (indicating parse/getaddrinfo error)
 	 * Note: Might be a good idea to export an IPv6 support indicator
 	 * (such as AF_INET6 exported by ext/sockets), however, since we
@@ -12,7 +12,9 @@ Streams Based IPv6 UDP Loopback test
    	 */
 
 	@stream_socket_client('tcp://[::1]:0', $errno);
-	if ($errno != 111) die('skip IPv6 not supported.');
+	if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
+		die('skip IPv6 is not supported.');
+	}
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/streams/bug76136.phpt b/ext/standard/tests/streams/bug76136.phpt
index 687d4ae9211..df45a841e7c 100644
--- a/ext/standard/tests/streams/bug76136.phpt
+++ b/ext/standard/tests/streams/bug76136.phpt
@@ -3,7 +3,7 @@ Bug #76136: stream_socket_get_name should enclose IPv6 in brackets
 --SKIPIF--
 <?php
 @stream_socket_client('tcp://[::1]:0', $errno);
-if ($errno != 111) {
+if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
     die('skip IPv6 is not supported.');
 }
 ?>
diff --git a/ext/standard/tests/strings/bug24098.phpt b/ext/standard/tests/strings/bug24098.phpt
index 16d2f7720e5..5ae998cf9c9 100644
--- a/ext/standard/tests/strings/bug24098.phpt
+++ b/ext/standard/tests/strings/bug24098.phpt
@@ -1,15 +1,13 @@
 --TEST--
 Bug #24098 (pathinfo() crash)
---SKIPIF--
-<?php if (DIRECTORY_SEPARATOR == '\\') die("skip directory separator won't match expected output"); ?>
 --FILE--
 <?php
     var_dump(pathinfo("/dsds.asa"));
 ?>
---EXPECT--
+--EXPECTF--
 array(4) {
   ["dirname"]=>
-  string(1) "/"
+  string(1) "%e"
   ["basename"]=>
   string(8) "dsds.asa"
   ["extension"]=>