diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index af27e1ed409..0d58defe3cc 100644
--- a/ext/iconv/tests/bug16069.phpt
+++ b/ext/iconv/tests/bug16069.phpt
@@ -2,7 +2,7 @@
 Bug #16069
 --SKIPIF--
 <?php
-include( 'skipif.inc' );
+/* include( 'skipif.inc' ); */
 if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
 	die("skip  CP932 translit not available\n");
 }
@@ -11,7 +11,7 @@ if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=CP932, KOI8-R */
 $str = "\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d";
 print iconv( "CP932", "EUC-JP//TRANSLIT", $str );
diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index ae275fe1db4..b0177af8174 100644
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to ISO-2022-JP
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "
diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 90d791a7916..c1cac62e854 100644
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to SJIS
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 00fa454572c..2100385cd60 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -1,12 +1,12 @@
 --TEST--
 EUC-JP to UTF8
 --SKIPIF--
-<?php include('skipif.inc');?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "
diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index ae0329397b2..2fa0158fecc 100644
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -1,12 +1,12 @@
 --TEST--
 iconv test
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 echo "iconv extension is available\n";
 $test = "זרו";
 var_dump("ISO-8859-1: $test");
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index f5015800bcc..834fb4bb05e 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -1,12 +1,12 @@
 --TEST--
 UCS4BE to ASCII
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 /*
 Expected output:
 &#97;&#98;&#99;&#100;
diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index 4055e95ea68..0b8797521a4 100644
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -1,12 +1,12 @@
 --TEST--
 ob_output_handler
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 iconv_set_encoding('internal_encoding', 'EUC-JP');
 iconv_set_encoding('output_encoding', 'Shift_JIS');
 ob_start('ob_iconv_handler');
diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index ef3f5f059af..d0fbf5c86ad 100644
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -2,14 +2,14 @@
 Translit failure
 --SKIPIF--
 <?php
-include('skipif.inc');
+/* include('skipif.inc'); */
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--
 error_reporting=2039
 --FILE--
 <?php
-include('test.inc');
+/* include('test.inc'); */
 // Should be ok.
 // Content from file is from libiconv testkit. Tested both
 // with a string as an implode, no difference.
diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index fd6452bf96e..dc73981f9b7 100644
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -2,14 +2,14 @@
 Translit UTF-8 quotes
 --SKIPIF--
 <?php
-include('skipif.inc');
+/* include('skipif.inc'); */
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--
 error_reporting=2047
 --FILE--
 <?php // vim600: syn=php
-include('test.inc');
+/* include('test.inc'); */
 //error_reporting(E_ALL);
 $utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
 
diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index ac93c1b2e84..341bb0ae212 100644
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -4,18 +4,22 @@ htmlentities() test 5 (mbstring / cp1252)
 output_handler=
 --SKIPIF--
 <?php
+/*
 if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 	$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 	@dl("mbstring$dlext");
 }
+*/
 extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
+/*
 	if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 		$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 		@dl("mbstring$dlext");
 	}
+*/
 	mb_internal_encoding('cp1252');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, ''));
diff --git a/ext/standard/tests/strings/htmlentities06.phpt b/ext/standard/tests/strings/htmlentities06.phpt
index de698b23833..e7bf55b2e6f 100644
--- a/ext/standard/tests/strings/htmlentities06.phpt
+++ b/ext/standard/tests/strings/htmlentities06.phpt
@@ -4,18 +4,22 @@ htmlentities() test 6 (mbstring / ISO-8859-15)
 output_handler=
 --SKIPIF--
 <?php
+/*
 if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 	$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 	@dl("mbstring$dlext");
 }
+*/
 extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
+/*
 	if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 		$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 		@dl("mbstring$dlext");
 	}
+*/
 	mb_internal_encoding('ISO-8859-15');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\xbc\xbd\xbe", ENT_QUOTES, ''));
diff --git a/ext/standard/tests/strings/htmlentities07.phpt b/ext/standard/tests/strings/htmlentities07.phpt
index 4b4be0e5df5..f2308992b64 100644
--- a/ext/standard/tests/strings/htmlentities07.phpt
+++ b/ext/standard/tests/strings/htmlentities07.phpt
@@ -4,18 +4,22 @@ htmlentities() test 7 (mbstring / ISO-8859-1)
 output_handler=
 --SKIPIF--
 <?php
+/*
 if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 	$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 	@dl("mbstring$dlext");
 }
+*/
 extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
+/*
 	if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 		$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 		@dl("mbstring$dlext");
 	}
+*/
 	mb_internal_encoding('ISO-8859-1');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\xe4\xf6\xfc", ENT_QUOTES, ''));
diff --git a/ext/standard/tests/strings/htmlentities08.phpt b/ext/standard/tests/strings/htmlentities08.phpt
index c0fe54997ff..dd256de8387 100644
--- a/ext/standard/tests/strings/htmlentities08.phpt
+++ b/ext/standard/tests/strings/htmlentities08.phpt
@@ -4,18 +4,22 @@ htmlentities() test 8 (mbstring / EUC-JP)
 output_handler=
 --SKIPIF--
 <?php
+/*
 if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 	$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 	@dl("mbstring$dlext");
 }
+*/
 extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
+/*
 	if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 		$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 		@dl("mbstring$dlext");
 	}
+*/
 	mb_internal_encoding('EUC-JP');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\xa1\xa2\xa1\xa3\xa1\xa4", ENT_QUOTES, ''));
diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt
index 17dc5cca1a7..bafdf66e8ca 100644
--- a/ext/standard/tests/strings/htmlentities09.phpt
+++ b/ext/standard/tests/strings/htmlentities09.phpt
@@ -4,18 +4,22 @@ htmlentities() test 9 (mbstring / Shift_JIS)
 output_handler=
 --SKIPIF--
 <?php
+/*
 if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 	$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 	@dl("mbstring$dlext");
 }
+*/
 extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
+/*
 	if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
 		$dlext = (substr(PHP_OS, 0, 3) == "WIN" ? ".dll" : ".so");
 		@dl("mbstring$dlext");
 	}
+*/
 	mb_internal_encoding('Shift_JIS');
 	print mb_internal_encoding()."\n";
 	var_dump(htmlentities("\x81\x41\x81\x42\x81\x43", ENT_QUOTES, ''));