4 files changed, 23 insertions, 3 deletions
diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt
index 533743323f..1ba94f27ef 100644
--- a/sapi/cgi/tests/003.phpt
+++ b/sapi/cgi/tests/003.phpt
@@ -2,6 +2,11 @@
 strip comments and whitespace with -w
 --SKIPIF--
 <?php 
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	die ("skip not for Windows");
+}
+
 include "skipif.inc"; 
 ?>
 --FILE--
diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt
index 8769126561..0e7117080d 100644
--- a/sapi/cgi/tests/004.phpt
+++ b/sapi/cgi/tests/004.phpt
@@ -26,7 +26,11 @@ var_dump(test::$pri);
 
 file_put_contents($filename, $code);
 
-var_dump(`$php -n -f "$filename" 2>/dev/null`);
+if (defined("PHP_WINDOWS_VERSION_MAJOR")) {
+	var_dump(`$php -n -f "$filename"`);
+} else {
+	var_dump(`$php -n -f "$filename" 2>/dev/null`);
+}
 var_dump(`$php -n -f "wrong"`);
 
 @unlink($filename);
diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt
index 34a28f9c5e..259005f3d9 100644
--- a/sapi/cgi/tests/005.phpt
+++ b/sapi/cgi/tests/005.phpt
@@ -1,7 +1,14 @@
 --TEST--
 using invalid combinations of cmdline options
 --SKIPIF--
-<?php include "skipif.inc"; ?>
+<?php
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	die ("skip not for Windows");
+}
+
+include "skipif.inc";
+?>
 --FILE--
 <?php
 
diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt
index a2b2b2903a..08bfbf5d6c 100644
--- a/sapi/cgi/tests/006.phpt
+++ b/sapi/cgi/tests/006.phpt
@@ -44,7 +44,11 @@ class test
 
 file_put_contents($filename, $code);
 
-var_dump(`"$php" -n -l "$filename" 2>/dev/null`);
+if (defined("PHP_WINDOWS_VERSION_MAJOR")) {
+	var_dump(`"$php" -n -l "$filename"`);
+} else {
+	var_dump(`"$php" -n -l "$filename" 2>/dev/null`);
+}
 
 @unlink($filename);