diff --git a/Zend/tests/temporary_cleaning_014.phpt b/Zend/tests/temporary_cleaning_014.phpt
index 39effae18ab7a..99ff038c85b73 100644
--- a/Zend/tests/temporary_cleaning_014.phpt
+++ b/Zend/tests/temporary_cleaning_014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Leak in JMP_SET
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 set_error_handler(function() { throw new Exception; });
diff --git a/ext/bcmath/tests/bcadd.phpt b/ext/bcmath/tests/bcadd.phpt
index 61552eecded0e..aeee385ea42de 100644
--- a/ext/bcmath/tests/bcadd.phpt
+++ b/ext/bcmath/tests/bcadd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcadd() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcadd_error1.phpt b/ext/bcmath/tests/bcadd_error1.phpt
index c7d526eec741e..c4a1cd212d643 100644
--- a/ext/bcmath/tests/bcadd_error1.phpt
+++ b/ext/bcmath/tests/bcadd_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcadd() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
@@ -9,4 +9,4 @@ bcmath.scale=0
 echo bcadd();
 ?>
 --EXPECTF--
-Warning: bcadd() expects at least 2 parameters, 0 given in %s on line %d
\ No newline at end of file
+Warning: bcadd() expects at least 2 parameters, 0 given in %s on line %d
diff --git a/ext/bcmath/tests/bcadd_variation001.phpt b/ext/bcmath/tests/bcadd_variation001.phpt
index 4d80a280b0222..a34024a934320 100644
--- a/ext/bcmath/tests/bcadd_variation001.phpt
+++ b/ext/bcmath/tests/bcadd_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcadd() with non-integers
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=5
 --FILE--
diff --git a/ext/bcmath/tests/bccomp.phpt b/ext/bcmath/tests/bccomp.phpt
index b2bf9f4ac2b9b..2067bbe34fedd 100644
--- a/ext/bcmath/tests/bccomp.phpt
+++ b/ext/bcmath/tests/bccomp.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bccomp() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bccomp_variation001.phpt b/ext/bcmath/tests/bccomp_variation001.phpt
index f8ca5b9da59b0..694c5a63ad435 100644
--- a/ext/bcmath/tests/bccomp_variation001.phpt
+++ b/ext/bcmath/tests/bccomp_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bccomp() with non-integers
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bccomp_variation002.phpt b/ext/bcmath/tests/bccomp_variation002.phpt
index c451a281ffe61..d6ae7232146a1 100644
--- a/ext/bcmath/tests/bccomp_variation002.phpt
+++ b/ext/bcmath/tests/bccomp_variation002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bccomp() with negative value
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcdiv.phpt b/ext/bcmath/tests/bcdiv.phpt
index cda19496d5569..ac40b4258f8de 100644
--- a/ext/bcmath/tests/bcdiv.phpt
+++ b/ext/bcmath/tests/bcdiv.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcdiv() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcdiv_error1.phpt b/ext/bcmath/tests/bcdiv_error1.phpt
index c69d36bb9ce4e..befe621f5e984 100644
--- a/ext/bcmath/tests/bcdiv_error1.phpt
+++ b/ext/bcmath/tests/bcdiv_error1.phpt
@@ -5,7 +5,7 @@ TestFest2009
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcdiv('10.99', '0');
diff --git a/ext/bcmath/tests/bcdiv_error2.phpt b/ext/bcmath/tests/bcdiv_error2.phpt
index a90c79e459f0c..eeedd559ea4a4 100644
--- a/ext/bcmath/tests/bcdiv_error2.phpt
+++ b/ext/bcmath/tests/bcdiv_error2.phpt
@@ -4,7 +4,7 @@ bcdiv — Divide two arbitrary precision numbers
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcdiv('1', '2', '3', '4');
diff --git a/ext/bcmath/tests/bcmod.phpt b/ext/bcmath/tests/bcmod.phpt
index 3e9ab25cb8915..19b5e44e28115 100644
--- a/ext/bcmath/tests/bcmod.phpt
+++ b/ext/bcmath/tests/bcmod.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcmod() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmod_error1.phpt b/ext/bcmath/tests/bcmod_error1.phpt
index 68a6dae470e7b..3c68aeee35f99 100644
--- a/ext/bcmath/tests/bcmod_error1.phpt
+++ b/ext/bcmath/tests/bcmod_error1.phpt
@@ -4,7 +4,7 @@ bcmod — Get modulus of an arbitrary precision number
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcmod('1', '2', '3', '4');
diff --git a/ext/bcmath/tests/bcmod_error2.phpt b/ext/bcmath/tests/bcmod_error2.phpt
index bac49c8e920f6..0e489845a6c85 100644
--- a/ext/bcmath/tests/bcmod_error2.phpt
+++ b/ext/bcmath/tests/bcmod_error2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcmod() - mod by 0
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmul.phpt b/ext/bcmath/tests/bcmul.phpt
index 20893552dafae..0ef64f578d375 100644
--- a/ext/bcmath/tests/bcmul.phpt
+++ b/ext/bcmath/tests/bcmul.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcmul() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmul_error1.phpt b/ext/bcmath/tests/bcmul_error1.phpt
index ec366336c2aab..476fd7b5cb6a8 100644
--- a/ext/bcmath/tests/bcmul_error1.phpt
+++ b/ext/bcmath/tests/bcmul_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcmul() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpow.phpt b/ext/bcmath/tests/bcpow.phpt
index ad642a57be2c8..8a74e2480415c 100644
--- a/ext/bcmath/tests/bcpow.phpt
+++ b/ext/bcmath/tests/bcpow.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcpow() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpow_error3.phpt b/ext/bcmath/tests/bcpow_error3.phpt
index 4b937a180bda4..d671b41472487 100644
--- a/ext/bcmath/tests/bcpow_error3.phpt
+++ b/ext/bcmath/tests/bcpow_error3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcpow() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpow_variation001.phpt b/ext/bcmath/tests/bcpow_variation001.phpt
index 049374ba4090b..cd78209d6a4e8 100644
--- a/ext/bcmath/tests/bcpow_variation001.phpt
+++ b/ext/bcmath/tests/bcpow_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcpow() with a negative exponent
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpowmod.phpt b/ext/bcmath/tests/bcpowmod.phpt
index 6b1f30e577047..53debeceda8af 100644
--- a/ext/bcmath/tests/bcpowmod.phpt
+++ b/ext/bcmath/tests/bcpowmod.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcpowmod() - Raise an arbitrary precision number to another, reduced by a specified modulus
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpowmod_error1.phpt b/ext/bcmath/tests/bcpowmod_error1.phpt
index 2dc292eb54c2e..3651b05aad001 100644
--- a/ext/bcmath/tests/bcpowmod_error1.phpt
+++ b/ext/bcmath/tests/bcpowmod_error1.phpt
@@ -4,7 +4,7 @@ bcpowmod — Raise an arbitrary precision number to another, reduced by a specif
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcpowmod('1');
diff --git a/ext/bcmath/tests/bcpowmod_error2.phpt b/ext/bcmath/tests/bcpowmod_error2.phpt
index e0a99637caf5f..aacc2ff72efc7 100644
--- a/ext/bcmath/tests/bcpowmod_error2.phpt
+++ b/ext/bcmath/tests/bcpowmod_error2.phpt
@@ -4,7 +4,7 @@ bcpowmod — Raise an arbitrary precision number to another, reduced by a specif
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcpowmod('1', '2');
diff --git a/ext/bcmath/tests/bcpowmod_error3.phpt b/ext/bcmath/tests/bcpowmod_error3.phpt
index c3f8df8269181..39e6002d70d38 100644
--- a/ext/bcmath/tests/bcpowmod_error3.phpt
+++ b/ext/bcmath/tests/bcpowmod_error3.phpt
@@ -4,7 +4,7 @@ bcpowmod — Raise an arbitrary precision number to another, reduced by a specif
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcpowmod('1', '2', '3', '4', '5');
diff --git a/ext/bcmath/tests/bcscale.phpt b/ext/bcmath/tests/bcscale.phpt
index 4fc2f85eb92c1..b7705708b3190 100644
--- a/ext/bcmath/tests/bcscale.phpt
+++ b/ext/bcmath/tests/bcscale.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcscale() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation001.phpt b/ext/bcmath/tests/bcscale_variation001.phpt
index 1e6dd372a5ea6..7359f3ac8f916 100644
--- a/ext/bcmath/tests/bcscale_variation001.phpt
+++ b/ext/bcmath/tests/bcscale_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcscale() with negative argument
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation002.phpt b/ext/bcmath/tests/bcscale_variation002.phpt
index 117756f1d1689..d149a9c97497e 100644
--- a/ext/bcmath/tests/bcscale_variation002.phpt
+++ b/ext/bcmath/tests/bcscale_variation002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcadd() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=-2
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation003.phpt b/ext/bcmath/tests/bcscale_variation003.phpt
index b1c541644c6d8..49de8d3d0bb92 100644
--- a/ext/bcmath/tests/bcscale_variation003.phpt
+++ b/ext/bcmath/tests/bcscale_variation003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcscale() return value
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsqrt.phpt b/ext/bcmath/tests/bcsqrt.phpt
index 9f4a8ec6a577c..71a54d6a0bddb 100644
--- a/ext/bcmath/tests/bcsqrt.phpt
+++ b/ext/bcmath/tests/bcsqrt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcsqrt() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsqrt_error1.phpt b/ext/bcmath/tests/bcsqrt_error1.phpt
index 1f213dbc82120..1fadf82712a82 100644
--- a/ext/bcmath/tests/bcsqrt_error1.phpt
+++ b/ext/bcmath/tests/bcsqrt_error1.phpt
@@ -4,7 +4,7 @@ bcsqrt — Get the square root of an arbitrary precision number
 Antoni Torrents
 antoni@solucionsinternet.com
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --FILE--
 <?php
 echo bcsqrt('-9');
diff --git a/ext/bcmath/tests/bcsqrt_error2.phpt b/ext/bcmath/tests/bcsqrt_error2.phpt
index c52e2f3cf5e18..66e6c6e65b5b0 100644
--- a/ext/bcmath/tests/bcsqrt_error2.phpt
+++ b/ext/bcmath/tests/bcsqrt_error2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcsqrt() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsqrt_variation001.phpt b/ext/bcmath/tests/bcsqrt_variation001.phpt
index 67d1efc2eac2b..a5ebee8e3c035 100644
--- a/ext/bcmath/tests/bcsqrt_variation001.phpt
+++ b/ext/bcmath/tests/bcsqrt_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcsqrt() with argument of 0
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsub.phpt b/ext/bcmath/tests/bcsub.phpt
index 8d85d23233063..a0cb5b054b6d9 100644
--- a/ext/bcmath/tests/bcsub.phpt
+++ b/ext/bcmath/tests/bcsub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcsub() function
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsub_error1.phpt b/ext/bcmath/tests/bcsub_error1.phpt
index 51c020e785e3d..ca0b53ec61151 100644
--- a/ext/bcmath/tests/bcsub_error1.phpt
+++ b/ext/bcmath/tests/bcsub_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcsub() incorrect argument count
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+<?php if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded"); ?>
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bug72093.phpt b/ext/bcmath/tests/bug72093.phpt
index 3aca87a39c41f..8470d2cff090f 100644
--- a/ext/bcmath/tests/bug72093.phpt
+++ b/ext/bcmath/tests/bug72093.phpt
@@ -2,7 +2,7 @@
 Bug 72093: bcpowmod accepts negative scale and corrupts _one_ definition
 --SKIPIF--
 <?php
-if(!extension_loaded("bcmath")) print "skip";
+if(!extension_loaded("bcmath")) die("skip bcmath extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
index 47dbfe84990ca..444232b12e5b1 100644
--- a/ext/bz2/tests/001.phpt
+++ b/ext/bz2/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzopen() and invalid parameters
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
@@ -18,7 +18,7 @@ var_dump(bzopen($fp, "r"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index c55e22d0af666..84ddd4b5489bb 100644
--- a/ext/bz2/tests/002.phpt
+++ b/ext/bz2/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzopen() using fd opened in wrong mode
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt
index fbc683cb726c7..577c795f5ae38 100644
--- a/ext/bz2/tests/003-mb.phpt
+++ b/ext/bz2/tests/003-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzread() tests
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt
index 1432600087a51..b042ad05e1487 100644
--- a/ext/bz2/tests/003.phpt
+++ b/ext/bz2/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzread() tests
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt
index 7467d84a901af..940ced77607ab 100644
--- a/ext/bz2/tests/004.phpt
+++ b/ext/bz2/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzread() tests with invalid files
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt
index da29a6d0b4079..d84b26e17e6ac 100644
--- a/ext/bz2/tests/005.phpt
+++ b/ext/bz2/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzcompress()/bzdecompress() tests
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index c53deacc5f3dd..d9320d666a934 100644
--- a/ext/bz2/tests/bug51997.phpt
+++ b/ext/bz2/tests/bug51997.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #51997 (SEEK_CUR with 0 value, returns a warning)
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/bug72447.phpt b/ext/bz2/tests/bug72447.phpt
index 939a3c289b6e5..659624fcfd6d9 100644
--- a/ext/bz2/tests/bug72447.phpt
+++ b/ext/bz2/tests/bug72447.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72447: Type Confusion in php_bz2_filter_create()
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 $input = "AAAAAAAA";
diff --git a/ext/bz2/tests/bug72613.phpt b/ext/bz2/tests/bug72613.phpt
index 82547e6ae071c..5bdaf62fcfde8 100644
--- a/ext/bz2/tests/bug72613.phpt
+++ b/ext/bz2/tests/bug72613.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72613 (Inadequate error handling in bzread())
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php
 $fp = bzopen(__DIR__.'/72613.bz2', 'r');
diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt
index 3de9a9d3ecb43..acd5fd8efd540 100644
--- a/ext/bz2/tests/bz2_filter_compress.phpt
+++ b/ext/bz2/tests/bz2_filter_compress.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzip2.compress (with convert.base64-encode)
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
diff --git a/ext/bz2/tests/bz2_filter_decompress.phpt b/ext/bz2/tests/bz2_filter_decompress.phpt
index 951d572cb2d8f..23ae9f14c0a41 100644
--- a/ext/bz2/tests/bz2_filter_decompress.phpt
+++ b/ext/bz2/tests/bz2_filter_decompress.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzip2.decompress (with convert.base64-decode)
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $text = 'QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA==';
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index 3763398a14d61..2c8ebc796bfde 100644
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -1,7 +1,7 @@
 --TEST--
 BZ2 with files
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php // $Id$
 
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index adf07e16f9f58..501a42eed63f1 100644
--- a/ext/bz2/tests/with_strings.phpt
+++ b/ext/bz2/tests/with_strings.phpt
@@ -1,7 +1,7 @@
 --TEST--
 BZ2 with strings
 --SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --FILE--
 <?php // $Id$
 
diff --git a/ext/curl/tests/bug61948-win32.phpt b/ext/curl/tests/bug61948-win32.phpt
index b91ccb78154ce..b41ce3707f4ae 100644
--- a/ext/curl/tests/bug61948-win32.phpt
+++ b/ext/curl/tests/bug61948-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); 
 if(substr(PHP_OS, 0, 3) != 'WIN' )
   die("skip Not Valid for Linux");
 ?>
diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt
index 00df07d73e285..dd30e98d3ce81 100644
--- a/ext/curl/tests/bug61948.phpt
+++ b/ext/curl/tests/bug61948.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); 
 if(substr(PHP_OS, 0, 3) == 'WIN' )
   die("skip Not Valid for Windows");
 ?>
diff --git a/ext/curl/tests/bug62839.phpt b/ext/curl/tests/bug62839.phpt
index be8646ea99dc6..2c531c3d27ffa 100644
--- a/ext/curl/tests/bug62839.phpt
+++ b/ext/curl/tests/bug62839.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62839 (curl_copy_handle segfault with CURLOPT_FILE)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt
index 539da71952301..df37498a98996 100644
--- a/ext/curl/tests/curl_basic_007.phpt
+++ b/ext/curl/tests/curl_basic_007.phpt
@@ -3,7 +3,7 @@ Test curl_error() & curl_errno() function without url
 --CREDITS--
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_basic_008.phpt b/ext/curl/tests/curl_basic_008.phpt
index 4f0a29d7ff494..13ee2345cd952 100644
--- a/ext/curl/tests/curl_basic_008.phpt
+++ b/ext/curl/tests/curl_basic_008.phpt
@@ -4,7 +4,7 @@ Test curl_error() & curl_errno() function with problematic host
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) print "skip"; 
+	if (!extension_loaded("curl")) die("skip curl extension not loaded"); 
 	$addr = "www.".uniqid().".".uniqid();
 	if (gethostbyname($addr) != $addr) {
 		print "skip catch all dns";
diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 99e94cd9b2f40..7838a001f788f 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -3,7 +3,7 @@ Test curl_error() & curl_errno() function with problematic protocol
 --CREDITS--
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
index 20bcc59be6b6b..e759dc2d5cef0 100644
--- a/ext/curl/tests/curl_basic_010.phpt
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -4,7 +4,7 @@ Test curl_error() & curl_errno() function with problematic proxy
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) print "skip";
+	if (!extension_loaded("curl")) die("skip curl extension not loaded");
 	$addr = "www.".uniqid().".".uniqid();
 	if (gethostbyname($addr) != $addr) {
 		print "skip catch all dns";
diff --git a/ext/curl/tests/curl_basic_022.phpt b/ext/curl/tests/curl_basic_022.phpt
index d4277a3f89966..bf609c50d5695 100644
--- a/ext/curl/tests/curl_basic_022.phpt
+++ b/ext/curl/tests/curl_basic_022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_getinfo() function with CURLINFO_COOKIELIST parameter
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); 
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x070e01) {
 	    exit("skip: test works only with curl >= 7.14.1");
diff --git a/ext/curl/tests/curl_multi_info_read.phpt b/ext/curl/tests/curl_multi_info_read.phpt
index ef83822b4a212..655b9a622078b 100644
--- a/ext/curl/tests/curl_multi_info_read.phpt
+++ b/ext/curl/tests/curl_multi_info_read.phpt
@@ -5,7 +5,7 @@ marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
 --SKIPIF--
 <?php
 if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); }
-if (!extension_loaded('curl')) { print("skip"); }
+if (!extension_loaded('curl')) die('skip curl extension not loaded')
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_multi_init_basic.phpt b/ext/curl/tests/curl_multi_init_basic.phpt
index 0fd865df790a2..bea68204f8ffa 100644
--- a/ext/curl/tests/curl_multi_init_basic.phpt
+++ b/ext/curl/tests/curl_multi_init_basic.phpt
@@ -4,7 +4,7 @@ Test curl_multi_init()
 Mark van der Velden
 #testfest Utrecht 2009
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype         : resource curl_multi_init(void)
diff --git a/ext/curl/tests/curl_multi_init_param.phpt b/ext/curl/tests/curl_multi_init_param.phpt
index e7848976aa66c..9aeca6d7fbf12 100644
--- a/ext/curl/tests/curl_multi_init_param.phpt
+++ b/ext/curl/tests/curl_multi_init_param.phpt
@@ -4,7 +4,7 @@ Test curl_multi_init() fail if any parameter is passed
 Paulo Eduardo <pauloelr [at] gmail [dot] com>
 #testfest SP 2014
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype         : resource curl_multi_init(void)
diff --git a/ext/curl/tests/curl_multi_select_basic1.phpt b/ext/curl/tests/curl_multi_select_basic1.phpt
index 7ae812412ea37..ff0488bb46640 100644
--- a/ext/curl/tests/curl_multi_select_basic1.phpt
+++ b/ext/curl/tests/curl_multi_select_basic1.phpt
@@ -4,7 +4,7 @@ Test curl_multi_select()
 Ivo Jansch <ivo@ibuildings.com>
 #testfest Utrecht 2009
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype         : resource curl_multi_select($mh, $timeout=1.0])
diff --git a/ext/curl/tests/curl_reset.phpt b/ext/curl/tests/curl_reset.phpt
index 3572e69543f2d..f29b9c50fe5f4 100644
--- a/ext/curl/tests/curl_reset.phpt
+++ b/ext/curl/tests/curl_reset.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_reset
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip";
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded");
 if (!function_exists("curl_reset")) exit("skip curl_reset doesn't exists (require libcurl >= 7.12.1)");
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index ab864d4b2da63..9f9d566c84183 100644
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -4,7 +4,7 @@ curl_setopt() basic parameter test
 Paul Sohier
 #phptestfest utrecht
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** curl_setopt() call with incorrect parameters\n";
diff --git a/ext/curl/tests/curl_write_callback.phpt b/ext/curl/tests/curl_write_callback.phpt
index c0b733ee4414d..f4071b2438961 100644
--- a/ext/curl/tests/curl_write_callback.phpt
+++ b/ext/curl/tests/curl_write_callback.phpt
@@ -6,7 +6,7 @@ Dutch UG, TestFest 2009, Utrecht
 --DESCRIPTION--
 Writes the value 'test' to a temporary file. Use curl to access this file, passing the output into a callback. Tests the PHP_CURL_USER case in curl_write.
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_write_file.phpt b/ext/curl/tests/curl_write_file.phpt
index 95d2b0ea4772a..d758246662cac 100644
--- a/ext/curl/tests/curl_write_file.phpt
+++ b/ext/curl/tests/curl_write_file.phpt
@@ -6,7 +6,7 @@ Dutch UG, TestFest 2009, Utrecht
 --DESCRIPTION--
 Writes the value 'test' to a temporary file. Use curl to access this file and store the output in another temporary file. Tests the PHP_CURL_FILE case in curl_write().
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_write_return.phpt b/ext/curl/tests/curl_write_return.phpt
index 1ddc55157798b..b2d6b23ef9078 100644
--- a/ext/curl/tests/curl_write_return.phpt
+++ b/ext/curl/tests/curl_write_return.phpt
@@ -7,7 +7,7 @@ Dutch UG, TestFest 2009, Utrecht
 Writes the value 'test' to a temporary file. Use curl to access this file and have it return the content from curl_exec(). Tests the PHP_CURL_RETURN case
 of curl_write().
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_write_stdout.phpt b/ext/curl/tests/curl_write_stdout.phpt
index 893b27e7df441..1b6996d95a8a8 100644
--- a/ext/curl/tests/curl_write_stdout.phpt
+++ b/ext/curl/tests/curl_write_stdout.phpt
@@ -6,7 +6,7 @@ Dutch UG, TestFest 2009, Utrecht
 --DESCRIPTION--
 Writes the value 'test' to a temporary file. Use curl to access this file and store the output in another temporary file. Tests the PHP_CURL_FILE case in curl_write().
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; ?>
+<?php if (!extension_loaded("curl")) die("skip curl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/skipif.inc b/ext/fileinfo/tests/skipif.inc
index 405800971e473..9112bb469e077 100644
--- a/ext/fileinfo/tests/skipif.inc
+++ b/ext/fileinfo/tests/skipif.inc
@@ -1,7 +1 @@
-<?php
-
-if (!extension_loaded('fileinfo')) {
-	die("skip");
-}
-
-?>
+<?php if (!extension_loaded('fileinfo')) die("skip fileinfo extension not loaded"); ?>
diff --git a/ext/filter/tests/004.phpt b/ext/filter/tests/004.phpt
index b89912493648f..bf0228da3d249 100644
--- a/ext/filter/tests/004.phpt
+++ b/ext/filter/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GET/POST/REQUEST Test with filtered data
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 filter.default=special_chars
 --POST--
diff --git a/ext/filter/tests/005.phpt b/ext/filter/tests/005.phpt
index b3735f5627f35..4e582ac946865 100644
--- a/ext/filter/tests/005.phpt
+++ b/ext/filter/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GET/REQUEST Test with fifa example data
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 filter.default=stripped
 --GET--
diff --git a/ext/filter/tests/006.phpt b/ext/filter/tests/006.phpt
index 74f85da7e38ef..ca148ae87c10f 100644
--- a/ext/filter/tests/006.phpt
+++ b/ext/filter/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_input() test
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --POST--
 foo=<b>abc</b>
 --FILE--
diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index 67c0b89f5f39c..27ec33127461c 100644
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_has_var()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --GET--
 a=qwe&abc=<a>href</a>
 --POST--
diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt
index 54880e59cc998..0f28b105e0e0e 100644
--- a/ext/filter/tests/008.phpt
+++ b/ext/filter/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_list()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt
index d09f996fd07dd..d192c088f8845 100644
--- a/ext/filter/tests/009.phpt
+++ b/ext/filter/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_id()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index 38b436f58dcb7..50b06783bd3f3 100644
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -3,7 +3,7 @@ filter_var()
 --INI--
 precision=14
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index b5075d182128c..1ea0a28076f34 100644
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -3,7 +3,7 @@ filter_input()
 --INI--
 precision=14
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --GET--
 a=<b>test</b>&b=http://example.com
 --POST--
diff --git a/ext/filter/tests/012.phpt b/ext/filter/tests/012.phpt
index 9a8ead944d6fc..7653e8ee521af 100644
--- a/ext/filter/tests/012.phpt
+++ b/ext/filter/tests/012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_input()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/013.phpt b/ext/filter/tests/013.phpt
index 421c5d55bfc03..f190d66eb356c 100644
--- a/ext/filter/tests/013.phpt
+++ b/ext/filter/tests/013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and flags
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("  234", FILTER_VALIDATE_INT));
diff --git a/ext/filter/tests/014.phpt b/ext/filter/tests/014.phpt
index 8837457147604..926cf954e0fed 100644
--- a/ext/filter/tests/014.phpt
+++ b/ext/filter/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_BOOLEAN
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt
index 03a78a8645407..315597d878728 100644
--- a/ext/filter/tests/015.phpt
+++ b/ext/filter/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_URL
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt
index c6783444d018f..6c9de14bf66df 100644
--- a/ext/filter/tests/016.phpt
+++ b/ext/filter/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_EMAIL
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $values = Array(
diff --git a/ext/filter/tests/017.phpt b/ext/filter/tests/017.phpt
index 518ee7925614c..05ec929cf4c39 100644
--- a/ext/filter/tests/017.phpt
+++ b/ext/filter/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_REGEXP
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index 833500fd3382d..d8bbb84015f80 100644
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_IP
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("192.168.0.1", FILTER_VALIDATE_IP));
diff --git a/ext/filter/tests/019.phpt b/ext/filter/tests/019.phpt
index 1665181cd2014..aecd7187d0a6b 100644
--- a/ext/filter/tests/019.phpt
+++ b/ext/filter/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() & FILTER_VALIDATE_IP and weird data
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt
index c2ab6096d529b..916fd6d2b8ea3 100644
--- a/ext/filter/tests/020.phpt
+++ b/ext/filter/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_MAGIC_QUOTES
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/021.phpt b/ext/filter/tests/021.phpt
index 994dac282b00b..cb6349c5560fb 100644
--- a/ext/filter/tests/021.phpt
+++ b/ext/filter/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_NUMBER_*
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt
index d8d118540e5db..aa076f9825aee 100644
--- a/ext/filter/tests/022.phpt
+++ b/ext/filter/tests/022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_EMAIL
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/023.phpt b/ext/filter/tests/023.phpt
index f8d4137bf0137..59dd3ce6386b5 100644
--- a/ext/filter/tests/023.phpt
+++ b/ext/filter/tests/023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_UNSAFE_RAW
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/024.phpt b/ext/filter/tests/024.phpt
index 7d7349fcd4a0e..f049aecf9ed3c 100644
--- a/ext/filter/tests/024.phpt
+++ b/ext/filter/tests/024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_ENCODED
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/025.phpt b/ext/filter/tests/025.phpt
index df8c3737bf30d..c7f317d8e56e4 100644
--- a/ext/filter/tests/025.phpt
+++ b/ext/filter/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_STRING
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt
index 7cfc557fcb011..64af4c3cbf297 100644
--- a/ext/filter/tests/026.phpt
+++ b/ext/filter/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_STRIPPED
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/027.phpt b/ext/filter/tests/027.phpt
index 759030a643f1a..d7cafff1ad72f 100644
--- a/ext/filter/tests/027.phpt
+++ b/ext/filter/tests/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_ENCODED
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/028.phpt b/ext/filter/tests/028.phpt
index c0ab16fe833ef..cee0408fb01ec 100644
--- a/ext/filter/tests/028.phpt
+++ b/ext/filter/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_SANITIZE_SPECIAL_CHARS
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/029.phpt b/ext/filter/tests/029.phpt
index c1ede74ab05bf..c9528837a515f 100644
--- a/ext/filter/tests/029.phpt
+++ b/ext/filter/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_CALLBACK
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/030.phpt b/ext/filter/tests/030.phpt
index c5af15e152648..093c848e9c22c 100644
--- a/ext/filter/tests/030.phpt
+++ b/ext/filter/tests/030.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and IPv6 
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $ipv6_test = array(
diff --git a/ext/filter/tests/031.phpt b/ext/filter/tests/031.phpt
index 23691fbbba739..d6647ab099a6b 100644
--- a/ext/filter/tests/031.phpt
+++ b/ext/filter/tests/031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FLOAT
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/filter/tests/032.phpt b/ext/filter/tests/032.phpt
index 7bdb685eb0715..d6411ce87b3b1 100644
--- a/ext/filter/tests/032.phpt
+++ b/ext/filter/tests/032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var_array()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $data = array(
diff --git a/ext/filter/tests/033.phpt b/ext/filter/tests/033.phpt
index 3819c6a01ca7d..4f0dddb5b85ec 100644
--- a/ext/filter/tests/033.phpt
+++ b/ext/filter/tests/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test all filters returned by filter_list()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 precision=14
 default_charset=UTF-8
diff --git a/ext/filter/tests/034.phpt b/ext/filter/tests/034.phpt
index 37481813a9c71..ace916233cdb6 100644
--- a/ext/filter/tests/034.phpt
+++ b/ext/filter/tests/034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Logical filter: boolean
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $booleans = array(
diff --git a/ext/filter/tests/035.phpt b/ext/filter/tests/035.phpt
index e2d3325270cd2..ef74e5e6a8fb2 100644
--- a/ext/filter/tests/035.phpt
+++ b/ext/filter/tests/035.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GET/POST/REQUEST Test with input_filter 
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --POST--
 d=379
 --GET--
diff --git a/ext/filter/tests/036.phpt b/ext/filter/tests/036.phpt
index 114b8f097f882..878874a36fd34 100644
--- a/ext/filter/tests/036.phpt
+++ b/ext/filter/tests/036.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var_array() and references
 --SKIPIF--
-<?php if (!extension_loaded("filter")) print "skip"; ?>
+<?php if(!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/037.phpt b/ext/filter/tests/037.phpt
index f8497c63b0545..232604a0ae790 100644
--- a/ext/filter/tests/037.phpt
+++ b/ext/filter/tests/037.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GET and data callback tests
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --GET--
 a=1&b=2
 --FILE--
diff --git a/ext/filter/tests/038.phpt b/ext/filter/tests/038.phpt
index 998c80fe8b8ab..424be34fac327 100644
--- a/ext/filter/tests/038.phpt
+++ b/ext/filter/tests/038.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test scalar, array
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt
index ae883db3e3251..4cbb941f3c969 100644
--- a/ext/filter/tests/039.phpt
+++ b/ext/filter/tests/039.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var_array() and different arguments
 --SKIPIF--
-<?php if (!extension_loaded("filter")) print "skip"; ?>
+<?php if(!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
@@ -49,7 +49,7 @@ var_dump($a, $b);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 -- (1)
 
 Warning: filter_var_array() expects parameter 1 to be array, null given in %s on line %d
diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt
index 1d578a4f13753..a33bcb73f2524 100644
--- a/ext/filter/tests/040.phpt
+++ b/ext/filter/tests/040.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_has_var() tests
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --GET--
 a=1&b=2&c=0
 --POST--
@@ -24,7 +24,7 @@ var_dump(filter_has_var("", "cc"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: filter_has_var() expects exactly 2 parameters, 0 given in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/041.phpt b/ext/filter/tests/041.phpt
index 0a2e3f0a1175e..cddada089fcc5 100644
--- a/ext/filter/tests/041.phpt
+++ b/ext/filter/tests/041.phpt
@@ -1,7 +1,7 @@
 --TEST--
 COOKIE multiple cookie test
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 filter.default=stripped
 filter.default_flags=0
diff --git a/ext/filter/tests/042.phpt b/ext/filter/tests/042.phpt
index 08f4dd633a2d6..f5b2f2435f6f0 100644
--- a/ext/filter/tests/042.phpt
+++ b/ext/filter/tests/042.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Combination of strip & sanitize filters
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php 
 $var = 'XYZ< script>alert(/ext/filter+bypass/);< /script>ABC';
diff --git a/ext/filter/tests/043.phpt b/ext/filter/tests/043.phpt
index 92ac0517d16cf..52ca5f9b8ae8c 100644
--- a/ext/filter/tests/043.phpt
+++ b/ext/filter/tests/043.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Character encoding test
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php 
 $flags = FILTER_FLAG_ENCODE_AMP|FILTER_FLAG_ENCODE_LOW|FILTER_FLAG_ENCODE_HIGH;
diff --git a/ext/filter/tests/044.phpt b/ext/filter/tests/044.phpt
index ff4689381d2f0..958d73a37cc9d 100644
--- a/ext/filter/tests/044.phpt
+++ b/ext/filter/tests/044.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Integer validation with spaces
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/filter/tests/045.phpt b/ext/filter/tests/045.phpt
index ad8f47ec9a42a..f0b472a4ba0ec 100644
--- a/ext/filter/tests/045.phpt
+++ b/ext/filter/tests/045.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Options must not be changed by filter_var()
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $a = array("flags"=>(string)FILTER_FLAG_ALLOW_HEX, "options" => array("min_range"=>"0", "max_range"=>"1024")); 
diff --git a/ext/filter/tests/046.phpt b/ext/filter/tests/046.phpt
index bc454420ad614..3e289f988008e 100644
--- a/ext/filter/tests/046.phpt
+++ b/ext/filter/tests/046.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Integer overflow
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $max = sprintf("%d", PHP_INT_MAX);
diff --git a/ext/filter/tests/047.phpt b/ext/filter/tests/047.phpt
index cc41eabd3d97f..97e30ea7149fc 100644
--- a/ext/filter/tests/047.phpt
+++ b/ext/filter/tests/047.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Octal integer overflow
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 function octal_inc($s) {
diff --git a/ext/filter/tests/048.phpt b/ext/filter/tests/048.phpt
index 92ab6908c711b..ebff9c5053a3d 100644
--- a/ext/filter/tests/048.phpt
+++ b/ext/filter/tests/048.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Hex integer overflow
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 function hex_inc($s) {
diff --git a/ext/filter/tests/049.phpt b/ext/filter/tests/049.phpt
index 5a9977b8ff3cb..36f69427ab14c 100644
--- a/ext/filter/tests/049.phpt
+++ b/ext/filter/tests/049.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and doubles with thousend separators
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $test = array(
diff --git a/ext/filter/tests/050.phpt b/ext/filter/tests/050.phpt
index 69a269f11f416..65b95e602e777 100644
--- a/ext/filter/tests/050.phpt
+++ b/ext/filter/tests/050.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and double overflow/underflow
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $test = array(
diff --git a/ext/filter/tests/051.phpt b/ext/filter/tests/051.phpt
index e34289d436005..0158eefac0599 100644
--- a/ext/filter/tests/051.phpt
+++ b/ext/filter/tests/051.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and default values
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $tmp = $default = 321;
diff --git a/ext/filter/tests/052.phpt b/ext/filter/tests/052.phpt
index 257613e9dd390..2931efcbc10b4 100644
--- a/ext/filter/tests/052.phpt
+++ b/ext/filter/tests/052.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() / filter_var_array() and passed data integrity
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 function filter_cb($var)
diff --git a/ext/filter/tests/053.phpt b/ext/filter/tests/053.phpt
index 36b0423471cd4..45de43dc2c29e 100644
--- a/ext/filter/tests/053.phpt
+++ b/ext/filter/tests/053.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() - using callback
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/054.phpt b/ext/filter/tests/054.phpt
index c8a5dad755fe4..64c03ce622a5a 100644
--- a/ext/filter/tests/054.phpt
+++ b/ext/filter/tests/054.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var_array() - using the add_empty option
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/055.phpt b/ext/filter/tests/055.phpt
index 688dbb2b54034..93cf4ac8171b4 100644
--- a/ext/filter/tests/055.phpt
+++ b/ext/filter/tests/055.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_MAC
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $values = Array(
diff --git a/ext/filter/tests/056.phpt b/ext/filter/tests/056.phpt
index 4a27a9fa10278..63f04f9c0187e 100644
--- a/ext/filter/tests/056.phpt
+++ b/ext/filter/tests/056.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() and FILTER_VALIDATE_DOMAIN
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/057.phpt b/ext/filter/tests/057.phpt
index 93ab3eed368bc..83612fb7194e3 100644
--- a/ext/filter/tests/057.phpt
+++ b/ext/filter/tests/057.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_input_array() and filter_var_array() with invalid $definition arguments
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 foreach (array(null, true, false, 1, "", new stdClass) as $invalid) {
diff --git a/ext/filter/tests/058.phpt b/ext/filter/tests/058.phpt
index f3fa483ed90d8..576c49410b57b 100644
--- a/ext/filter/tests/058.phpt
+++ b/ext/filter/tests/058.phpt
@@ -1,7 +1,7 @@
 --TEST--
 FILTER_VALIDATE_EMAIL unicode support (https://tools.ietf.org/html/rfc6531)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $values = Array(
diff --git a/ext/filter/tests/PMOPB45.phpt b/ext/filter/tests/PMOPB45.phpt
index 532eb219d3853..753b24b92452c 100644
--- a/ext/filter/tests/PMOPB45.phpt
+++ b/ext/filter/tests/PMOPB45.phpt
@@ -1,7 +1,7 @@
 --TEST--
 PMOPB-45-2007:PHP ext/filter Email Validation Vulnerability
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 	$var = "test@example.com\n";
diff --git a/ext/filter/tests/bug39846.phpt b/ext/filter/tests/bug39846.phpt
index 57407f1082c90..a65f79cc1ff4b 100644
--- a/ext/filter/tests/bug39846.phpt
+++ b/ext/filter/tests/bug39846.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39846 (ipv4 trailing data validation)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var('192.168.1.100random-text-here', FILTER_VALIDATE_IP));
diff --git a/ext/filter/tests/bug42718-2.phpt b/ext/filter/tests/bug42718-2.phpt
index ed210681d3621..d2df36a6276f5 100644
--- a/ext/filter/tests/bug42718-2.phpt
+++ b/ext/filter/tests/bug42718-2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42718 - 2 (unsafe_raw filter not applied when configured as default filter)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 display_errors=0
 filter.default=unsafe_raw
diff --git a/ext/filter/tests/bug42718.phpt b/ext/filter/tests/bug42718.phpt
index ba56d3988a6fd..6cfdb6d011164 100644
--- a/ext/filter/tests/bug42718.phpt
+++ b/ext/filter/tests/bug42718.phpt
@@ -3,7 +3,7 @@ Bug #42718 (unsafe_raw filter not applied when configured as default filter)
 --XFAIL--
 FILTER_UNSAFE_RAW not applied when configured as default filter, even with flags
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 filter.default=unsafe_raw
 filter.default_flags=4
diff --git a/ext/filter/tests/bug44445.phpt b/ext/filter/tests/bug44445.phpt
index 36a8641419b0d..bb497585b303e 100644
--- a/ext/filter/tests/bug44445.phpt
+++ b/ext/filter/tests/bug44445.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44445 (email validator does not handle domains starting/ending with a -)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("foo@-foo.com",FILTER_VALIDATE_EMAIL));
diff --git a/ext/filter/tests/bug44779.phpt b/ext/filter/tests/bug44779.phpt
index fb9dff1d46901..8945d848eedee 100644
--- a/ext/filter/tests/bug44779.phpt
+++ b/ext/filter/tests/bug44779.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44779 (filter returns NULL in CLI when it shouldn't)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_input(INPUT_SERVER, "PHP_SELF"));
diff --git a/ext/filter/tests/bug46973.phpt b/ext/filter/tests/bug46973.phpt
index 8c5d9db910734..a9c6d4a31b8f8 100644
--- a/ext/filter/tests/bug46973.phpt
+++ b/ext/filter/tests/bug46973.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46973 (IPv6 address filter rejects valid address)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/bug47435.phpt b/ext/filter/tests/bug47435.phpt
index 9388679ebb4b1..816578489cfa0 100644
--- a/ext/filter/tests/bug47435.phpt
+++ b/ext/filter/tests/bug47435.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47435 (FILTER_FLAG_NO_PRIV_RANGE and FILTER_FLAG_NO_RES_RANGE don't work with ipv6)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("FC00::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
diff --git a/ext/filter/tests/bug47745.phpt b/ext/filter/tests/bug47745.phpt
index feb0c2b6d863c..2e16318ab5dff 100644
--- a/ext/filter/tests/bug47745.phpt
+++ b/ext/filter/tests/bug47745.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47745 (FILTER_VALIDATE_INT doesn't allow minimum integer)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $s = (string)(-PHP_INT_MAX-1);
diff --git a/ext/filter/tests/bug48762.phpt b/ext/filter/tests/bug48762.phpt
index 195a616641bdf..754106588fc3c 100644
--- a/ext/filter/tests/bug48762.phpt
+++ b/ext/filter/tests/bug48762.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48762 (IPv6 address filter still rejects valid address)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/bug49274.phpt b/ext/filter/tests/bug49274.phpt
index c9141a3956919..b040d1362f9c9 100644
--- a/ext/filter/tests/bug49274.phpt
+++ b/ext/filter/tests/bug49274.phpt
@@ -1,7 +1,7 @@
 --TEST--
 #49274, fatal error when an object does not implement toString
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL));
diff --git a/ext/filter/tests/bug49510.phpt b/ext/filter/tests/bug49510.phpt
index 340c1ccd6b207..8638861ef484c 100644
--- a/ext/filter/tests/bug49510.phpt
+++ b/ext/filter/tests/bug49510.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #49510	boolean validation fails with FILTER_NULL_ON_FAILURE
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var(false, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE));
diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt
index 8b29e72b2db5c..ef601343ca498 100644
--- a/ext/filter/tests/bug50158.phpt
+++ b/ext/filter/tests/bug50158.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses containing = or ?)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/bug50632.phpt b/ext/filter/tests/bug50632.phpt
index 2f33b91ff7309..5c28b1191bbbc 100644
--- a/ext/filter/tests/bug50632.phpt
+++ b/ext/filter/tests/bug50632.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug 50632, filter_input() does not return default value if the variable does not exist
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $foo = filter_input(INPUT_GET, 'foo', FILTER_VALIDATE_INT, array('flags' => FILTER_REQUIRE_SCALAR, 'options' => array('default' => 23)));
diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt
index 96c67eae1de01..cc705f514519c 100644
--- a/ext/filter/tests/bug51192.phpt
+++ b/ext/filter/tests/bug51192.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-'
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var('http://example.com/path', FILTER_VALIDATE_URL));
diff --git a/ext/filter/tests/bug52929.phpt b/ext/filter/tests/bug52929.phpt
index 29332959f7de7..3b971c6d13b18 100644
--- a/ext/filter/tests/bug52929.phpt
+++ b/ext/filter/tests/bug52929.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var('valid@email.address', FILTER_VALIDATE_EMAIL));
diff --git a/ext/filter/tests/bug53037.phpt b/ext/filter/tests/bug53037.phpt
index 4a1e9e318b095..ccacb72cfc214 100644
--- a/ext/filter/tests/bug53037.phpt
+++ b/ext/filter/tests/bug53037.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(
diff --git a/ext/filter/tests/bug53150.phpt b/ext/filter/tests/bug53150.phpt
index 4906888bdf779..c4745f33cde19 100644
--- a/ext/filter/tests/bug53150.phpt
+++ b/ext/filter/tests/bug53150.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var('127.0.0.1', FILTER_VALIDATE_IP));
diff --git a/ext/filter/tests/bug55478.phpt b/ext/filter/tests/bug55478.phpt
index 243d7078e7aba..96bb63d397d5d 100644
--- a/ext/filter/tests/bug55478.phpt
+++ b/ext/filter/tests/bug55478.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized domain name addresses containing >1 -)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $email_address = "test@xn--example--7za.de"; // "example-ä.de"
diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
index 149079ec05323..4d1dd09f7a889 100644
--- a/ext/filter/tests/bug64441.phpt
+++ b/ext/filter/tests/bug64441.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var('http://example.com./', FILTER_VALIDATE_URL));
diff --git a/ext/filter/tests/bug67167.01.phpt b/ext/filter/tests/bug67167.01.phpt
index 91889f1980bd1..93f224d4668d8 100644
--- a/ext/filter/tests/bug67167.01.phpt
+++ b/ext/filter/tests/bug67167.01.phpt
@@ -2,7 +2,7 @@
 Bug #67167: object with VALIDATE_BOOLEAN and NULL_ON_FAILURE
 
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 
 --FILE--
 <?php
diff --git a/ext/filter/tests/bug67167.02.phpt b/ext/filter/tests/bug67167.02.phpt
index fd634334bb3cf..97d1fcf6ee78b 100644
--- a/ext/filter/tests/bug67167.02.phpt
+++ b/ext/filter/tests/bug67167.02.phpt
@@ -2,7 +2,7 @@
 Bug #67167: filter_var(null,FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE) returns null
 
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 
 --FILE--
 <?php
diff --git a/ext/filter/tests/bug69202.phpt b/ext/filter/tests/bug69202.phpt
index 992298611fb65..7be9b362e2eab 100644
--- a/ext/filter/tests/bug69202.phpt
+++ b/ext/filter/tests/bug69202.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("``a`b`c``", FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_BACKTICK));
diff --git a/ext/filter/tests/bug69203.phpt b/ext/filter/tests/bug69203.phpt
index 4bafe3311ca55..32fb6c7edfcdb 100644
--- a/ext/filter/tests/bug69203.phpt
+++ b/ext/filter/tests/bug69203.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(filter_var("\x7f", FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH));
diff --git a/ext/filter/tests/bug71063.phpt b/ext/filter/tests/bug71063.phpt
index 60c6a67cb909b..3158e0f99ad91 100644
--- a/ext/filter/tests/bug71063.phpt
+++ b/ext/filter/tests/bug71063.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71063 (filter_input(INPUT_ENV, ..) does not work)
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --ENV--
 PATH=/
 --INI--
diff --git a/ext/filter/tests/bug7715.phpt b/ext/filter/tests/bug7715.phpt
index b281db4f49357..720c95e56a854 100644
--- a/ext/filter/tests/bug7715.phpt
+++ b/ext/filter/tests/bug7715.phpt
@@ -3,7 +3,7 @@ bug 7715, floats value with integer or incomplete input
 --INI--
 precision=14
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $data = array(
diff --git a/ext/filter/tests/bug7733.phpt b/ext/filter/tests/bug7733.phpt
index 11fce11232621..8cbbff6660e17 100644
--- a/ext/filter/tests/bug7733.phpt
+++ b/ext/filter/tests/bug7733.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var() Float exponential weird result
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $data = array(
diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt
index 094d82f210529..897a92ad4a017 100644
--- a/ext/filter/tests/bug8315.phpt
+++ b/ext/filter/tests/bug8315.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug 8315, NULL values halt the validation 
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/filter/tests/callback_closure.phpt b/ext/filter/tests/callback_closure.phpt
index e27a31b37e663..101e30a7ebffb 100644
--- a/ext/filter/tests/callback_closure.phpt
+++ b/ext/filter/tests/callback_closure.phpt
@@ -1,7 +1,7 @@
 --TEST--
 callback function is a closure
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 $callback = function ($var) {
diff --git a/ext/filter/tests/callback_non_modified_var.phpt b/ext/filter/tests/callback_non_modified_var.phpt
index f0d557577b5de..b5e819dee0358 100644
--- a/ext/filter/tests/callback_non_modified_var.phpt
+++ b/ext/filter/tests/callback_non_modified_var.phpt
@@ -1,7 +1,7 @@
 --TEST--
 callback function returns non modified value
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 function callback($var) {
diff --git a/ext/filter/tests/filter_data.phpt b/ext/filter/tests/filter_data.phpt
index f83d98625c875..1dfa98fff78c9 100644
--- a/ext/filter/tests/filter_data.phpt
+++ b/ext/filter/tests/filter_data.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Simple filter_var() tests
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/filter/tests/filter_var_array_with_ref.phpt b/ext/filter/tests/filter_var_array_with_ref.phpt
index 22e4dc8702942..b802415694567 100644
--- a/ext/filter/tests/filter_var_array_with_ref.phpt
+++ b/ext/filter/tests/filter_var_array_with_ref.phpt
@@ -1,7 +1,7 @@
 --TEST--
 filter_var_array() on array with reference
 --SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
+<?php if (!extension_loaded("filter")) die("skip filter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/002.phpt b/ext/gmp/tests/002.phpt
index ac2a7a5494628..990423fca60d4 100644
--- a/ext/gmp/tests/002.phpt
+++ b/ext/gmp/tests/002.phpt
@@ -1,11 +1,11 @@
 --TEST--
 GMP functionality test - factorial
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 function fact($x) {
-  if($x <= 1) 
+  if($x <= 1)
         return 1;
   else
         return gmp_mul($x,fact($x-1));
diff --git a/ext/gmp/tests/003.phpt b/ext/gmp/tests/003.phpt
index 5179b73a1b6e7..ac2426cd27d3d 100644
--- a/ext/gmp/tests/003.phpt
+++ b/ext/gmp/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for number base recognition
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
         /* Binary */
diff --git a/ext/gmp/tests/bug32773.phpt b/ext/gmp/tests/bug32773.phpt
index 6823fa1a1bbcd..6a688331f06e7 100644
--- a/ext/gmp/tests/bug32773.phpt
+++ b/ext/gmp/tests/bug32773.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #32773 (binary GMP functions returns unexpected value, when second parameter is int(0))
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 echo '10 + 0 = ', gmp_strval(gmp_add(10, 0)), "\n";
diff --git a/ext/gmp/tests/bug50283.phpt b/ext/gmp/tests/bug50283.phpt
index 561cd3d68c697..d0a39cba07d88 100644
--- a/ext/gmp/tests/bug50283.phpt
+++ b/ext/gmp/tests/bug50283.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, and -2 to -36)
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 $a = gmp_init("0x41682179fbf5");
diff --git a/ext/gmp/tests/bug52906.phpt b/ext/gmp/tests/bug52906.phpt
index 2bcd6a4e57bec..f2062b2d8d4df 100644
--- a/ext/gmp/tests/bug52906.phpt
+++ b/ext/gmp/tests/bug52906.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52906 gmp_mod returns negative result when non-negative is expected
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug659967.phpt b/ext/gmp/tests/bug659967.phpt
index 6ba220274c4f7..a202d7370e538 100644
--- a/ext/gmp/tests/bug659967.phpt
+++ b/ext/gmp/tests/bug659967.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65997: Leak when using gc_collect_cycles with new GMP implementation
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug66872.phpt b/ext/gmp/tests/bug66872.phpt
index 434af30b81b41..fe4f096764e23 100644
--- a/ext/gmp/tests/bug66872.phpt
+++ b/ext/gmp/tests/bug66872.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66872: Crash when passing string to gmp_testbit
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/bug70284.phpt b/ext/gmp/tests/bug70284.phpt
index 49df5d0359816..44d97f1a46da6 100644
--- a/ext/gmp/tests/bug70284.phpt
+++ b/ext/gmp/tests/bug70284.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70284 (Use after free vulnerability in unserialize() with GMP)
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/cast.phpt b/ext/gmp/tests/cast.phpt
index f3d93af08c079..0ba00383a497e 100644
--- a/ext/gmp/tests/cast.phpt
+++ b/ext/gmp/tests/cast.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP casting using casting operators
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/clone.phpt b/ext/gmp/tests/clone.phpt
index 54e23a78ace9c..14dc21b6e8d9c 100644
--- a/ext/gmp/tests/clone.phpt
+++ b/ext/gmp/tests/clone.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Cloning GMP instances
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/comparison.phpt b/ext/gmp/tests/comparison.phpt
index 1f3a423267ee6..db214ded808f9 100644
--- a/ext/gmp/tests/comparison.phpt
+++ b/ext/gmp/tests/comparison.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Overloaded GMP comparison in sort() etc
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt
index bb35891f2a35f..93690b4581476 100644
--- a/ext/gmp/tests/gmp_abs.phpt
+++ b/ext/gmp/tests/gmp_abs.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_abs() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt
index 9bc401031b2f5..841570240f5fa 100644
--- a/ext/gmp/tests/gmp_and.phpt
+++ b/ext/gmp/tests/gmp_and.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_and() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_clrbit.phpt b/ext/gmp/tests/gmp_clrbit.phpt
index 0aab89dd37aef..13e74c2ebf00d 100644
--- a/ext/gmp/tests/gmp_clrbit.phpt
+++ b/ext/gmp/tests/gmp_clrbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_clrbit() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt
index 83e7910d1e6ec..e4b6f01b630cc 100644
--- a/ext/gmp/tests/gmp_cmp.phpt
+++ b/ext/gmp/tests/gmp_cmp.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_cmp() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt
index 1e0c1b4694ac8..d4c36a867123d 100644
--- a/ext/gmp/tests/gmp_com.phpt
+++ b/ext/gmp/tests/gmp_com.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_com() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt
index 3b75a48e1825b..3ebc5c7499e1a 100644
--- a/ext/gmp/tests/gmp_div_q.phpt
+++ b/ext/gmp/tests/gmp_div_q.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_q() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt
index 90099249db422..1a8a0e293124c 100644
--- a/ext/gmp/tests/gmp_div_qr.phpt
+++ b/ext/gmp/tests/gmp_div_qr.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_qr() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt
index c1874c86f901f..9bdca5f31eb49 100644
--- a/ext/gmp/tests/gmp_div_r.phpt
+++ b/ext/gmp/tests/gmp_div_r.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_div_r() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_export.phpt b/ext/gmp/tests/gmp_export.phpt
index fbc8901cfcd4a..6200fa173af21 100644
--- a/ext/gmp/tests/gmp_export.phpt
+++ b/ext/gmp/tests/gmp_export.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_export() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) echo "skip"; ?>
+<?php if(!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt
index 5cb8089b49e8d..0a09b9856ccdd 100644
--- a/ext/gmp/tests/gmp_fact.phpt
+++ b/ext/gmp/tests/gmp_fact.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_fact() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_gcd.phpt b/ext/gmp/tests/gmp_gcd.phpt
index 275f0bca35d20..7285e29340cab 100644
--- a/ext/gmp/tests/gmp_gcd.phpt
+++ b/ext/gmp/tests/gmp_gcd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_gcd() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt
index 57fb05822f3c8..160cb4dbb442a 100644
--- a/ext/gmp/tests/gmp_gcdext.phpt
+++ b/ext/gmp/tests/gmp_gcdext.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_gcdext() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip";
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt
index c21e03ccb25aa..9b3ade99f2eae 100644
--- a/ext/gmp/tests/gmp_hamdist.phpt
+++ b/ext/gmp/tests/gmp_hamdist.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_hamdist() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_import.phpt b/ext/gmp/tests/gmp_import.phpt
index b7ae6600edd4b..fd28bc81e03c7 100644
--- a/ext/gmp/tests/gmp_import.phpt
+++ b/ext/gmp/tests/gmp_import.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_import() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) echo "skip"; ?>
+<?php if(!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt
index 29640ba7049e1..fcbfb49f754ea 100644
--- a/ext/gmp/tests/gmp_init.phpt
+++ b/ext/gmp/tests/gmp_init.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_init() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt
index 088dd08fd8ee4..f82df9f6dd343 100644
--- a/ext/gmp/tests/gmp_intval.phpt
+++ b/ext/gmp/tests/gmp_intval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_intval() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt
index 81a90fe16ae9f..52a8565d6b6ee 100644
--- a/ext/gmp/tests/gmp_invert.phpt
+++ b/ext/gmp/tests/gmp_invert.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_invert() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt
index 04ddba4f08acc..145609b4e0eda 100644
--- a/ext/gmp/tests/gmp_jacobi.phpt
+++ b/ext/gmp/tests/gmp_jacobi.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_jacobi() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt
index 6dde34e1e7ef6..3c7c39512ab78 100644
--- a/ext/gmp/tests/gmp_legendre.phpt
+++ b/ext/gmp/tests/gmp_legendre.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_legendre() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt
index 12e7cad2b3239..48fcca3d0f397 100644
--- a/ext/gmp/tests/gmp_mod.phpt
+++ b/ext/gmp/tests/gmp_mod.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_mod tests()
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt
index 8ca3471cb8c35..c7aec5bb3d71d 100644
--- a/ext/gmp/tests/gmp_neg.phpt
+++ b/ext/gmp/tests/gmp_neg.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_neg() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt
index da89221c0af86..4087c9b86edfd 100644
--- a/ext/gmp/tests/gmp_nextprime.phpt
+++ b/ext/gmp/tests/gmp_nextprime.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_nextprime()
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip";
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt
index 035f070bd751b..e6dbabf4044dc 100644
--- a/ext/gmp/tests/gmp_or.phpt
+++ b/ext/gmp/tests/gmp_or.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_or() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt
index aa596ba9cd0bd..db0d123e5da9f 100644
--- a/ext/gmp/tests/gmp_perfect_square.phpt
+++ b/ext/gmp/tests/gmp_perfect_square.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_perfect_square() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_php_int_max.phpt b/ext/gmp/tests/gmp_php_int_max.phpt
index 1f680a14901ec..1816e620bc54e 100644
--- a/ext/gmp/tests/gmp_php_int_max.phpt
+++ b/ext/gmp/tests/gmp_php_int_max.phpt
@@ -2,7 +2,7 @@
 PHP_INT_MAX tests
 --SKIPIF--
 <?php
-if (!extension_loaded("gmp")) print "skip";
+if (!extension_loaded("gmp")) die("skip gmp extension not loaded");
 if (PHP_INT_SIZE != 8) print "skip";
 ?>
 --FILE--
diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt
index 4b45a044810b6..53581f8879a44 100644
--- a/ext/gmp/tests/gmp_popcount.phpt
+++ b/ext/gmp/tests/gmp_popcount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_popcount() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index b1b7b7d57e4f6..6a6eedc04623f 100644
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_pow() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt
index f5857b6995d24..3a011f5fa9c92 100644
--- a/ext/gmp/tests/gmp_pown.phpt
+++ b/ext/gmp/tests/gmp_pown.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_powm() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt
index f8f3e6921ca30..a27b57e2e3309 100644
--- a/ext/gmp/tests/gmp_prob_prime.phpt
+++ b/ext/gmp/tests/gmp_prob_prime.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_prob_prime() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt
index 5533224b2cec9..688b23452e0a7 100644
--- a/ext/gmp/tests/gmp_random.phpt
+++ b/ext/gmp/tests/gmp_random.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_bits.phpt b/ext/gmp/tests/gmp_random_bits.phpt
index b4aa5d7b732b2..d7e838822b5dc 100644
--- a/ext/gmp/tests/gmp_random_bits.phpt
+++ b/ext/gmp/tests/gmp_random_bits.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_bits() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_range.phpt b/ext/gmp/tests/gmp_random_range.phpt
index 654ffbefb369a..15497b62cfe3d 100644
--- a/ext/gmp/tests/gmp_random_range.phpt
+++ b/ext/gmp/tests/gmp_random_range.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_range() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_random_seed-32bit.phpt b/ext/gmp/tests/gmp_random_seed-32bit.phpt
index 95d8dd50f9b91..0601de8a0121e 100644
--- a/ext/gmp/tests/gmp_random_seed-32bit.phpt
+++ b/ext/gmp/tests/gmp_random_seed-32bit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_seed() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 <?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?>
 --INI--
 error_reporting=E_ALL&~E_DEPRECATED
diff --git a/ext/gmp/tests/gmp_random_seed.phpt b/ext/gmp/tests/gmp_random_seed.phpt
index e143a5153ec55..c96f756b6f4b4 100644
--- a/ext/gmp/tests/gmp_random_seed.phpt
+++ b/ext/gmp/tests/gmp_random_seed.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_random_seed() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 --INI--
 error_reporting=E_ALL&~E_DEPRECATED
diff --git a/ext/gmp/tests/gmp_remroot.phpt b/ext/gmp/tests/gmp_remroot.phpt
index 331f447aa2070..41d66c3e9f66b 100644
--- a/ext/gmp/tests/gmp_remroot.phpt
+++ b/ext/gmp/tests/gmp_remroot.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_rootrem() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_root.phpt b/ext/gmp/tests/gmp_root.phpt
index 70faf27051e8b..56ac6bd95c3ff 100644
--- a/ext/gmp/tests/gmp_root.phpt
+++ b/ext/gmp/tests/gmp_root.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_root() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt
index 2a87a968a24bb..35f0cd71a94cc 100644
--- a/ext/gmp/tests/gmp_scan0.phpt
+++ b/ext/gmp/tests/gmp_scan0.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_scan0() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt
index 7ebce9be7d1d5..fe963a667c678 100644
--- a/ext/gmp/tests/gmp_scan1.phpt
+++ b/ext/gmp/tests/gmp_scan1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_scan1() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_setbit.phpt b/ext/gmp/tests/gmp_setbit.phpt
index 2eac23db0edf8..e80e86b7de449 100644
--- a/ext/gmp/tests/gmp_setbit.phpt
+++ b/ext/gmp/tests/gmp_setbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_setbit() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_setbit_long.phpt b/ext/gmp/tests/gmp_setbit_long.phpt
index ce4e427132201..fe03c03b768d1 100644
--- a/ext/gmp/tests/gmp_setbit_long.phpt
+++ b/ext/gmp/tests/gmp_setbit_long.phpt
@@ -2,7 +2,7 @@
 gmp_setbit() with large index
 --SKIPIF--
 <?php if (getenv("TRAVIS") === "true") die("skip not suitable for Travis-CI"); ?>
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?>
 <?php
diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt
index 1efdc28c6f4bd..400d979bcc2be 100644
--- a/ext/gmp/tests/gmp_sign.phpt
+++ b/ext/gmp/tests/gmp_sign.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sign() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt
index d90f538213405..f91d6e3627912 100644
--- a/ext/gmp/tests/gmp_sqrt.phpt
+++ b/ext/gmp/tests/gmp_sqrt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sqrt() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt
index d30bb2b295359..7f83b9e072661 100644
--- a/ext/gmp/tests/gmp_sqrtrem.phpt
+++ b/ext/gmp/tests/gmp_sqrtrem.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sqrtrem() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index 4df78bdf7a7c8..81f6fc5b76861 100644
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_strval() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt
index e1d9df67db7da..005c4644b8f86 100644
--- a/ext/gmp/tests/gmp_sub.phpt
+++ b/ext/gmp/tests/gmp_sub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_sub() tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_testbit.phpt b/ext/gmp/tests/gmp_testbit.phpt
index ab40abed7f7a8..fc060f490d568 100644
--- a/ext/gmp/tests/gmp_testbit.phpt
+++ b/ext/gmp/tests/gmp_testbit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_testbit() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt
index 2b0d29a6206e5..b6381c44124e4 100644
--- a/ext/gmp/tests/gmp_xor.phpt
+++ b/ext/gmp/tests/gmp_xor.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gmp_xor() basic tests
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/overloading.phpt b/ext/gmp/tests/overloading.phpt
index 3520f58bdce47..86dc17cf271f6 100644
--- a/ext/gmp/tests/overloading.phpt
+++ b/ext/gmp/tests/overloading.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP operator overloading
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/gmp/tests/serialize.phpt b/ext/gmp/tests/serialize.phpt
index 5e308fa14ef16..6eab5bd6ae229 100644
--- a/ext/gmp/tests/serialize.phpt
+++ b/ext/gmp/tests/serialize.phpt
@@ -1,7 +1,7 @@
 --TEST--
 GMP serialization and unserialization
 --SKIPIF--
-<?php if (!extension_loaded("gmp")) print "skip"; ?>
+<?php if (!extension_loaded("gmp")) die("skip gmp extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/adler32.phpt b/ext/hash/tests/adler32.phpt
index eab2a3f1fd8af..31566ecb67694 100644
--- a/ext/hash/tests/adler32.phpt
+++ b/ext/hash/tests/adler32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ADLER32
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('adler32', ''), "\n";
diff --git a/ext/hash/tests/bug52240.phpt b/ext/hash/tests/bug52240.phpt
index 6e0c8f650d157..c7fbac8f6350a 100644
--- a/ext/hash/tests/bug52240.phpt
+++ b/ext/hash/tests/bug52240.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes)
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/bug64745.phpt b/ext/hash/tests/bug64745.phpt
index 427f89b72875f..27c7233b03f4c 100644
--- a/ext/hash/tests/bug64745.phpt
+++ b/ext/hash/tests/bug64745.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #64745 hash_pbkdf2() truncates data when using default length and hex output
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 $hash = hash_pbkdf2('sha1', 'password', 'salt', 1, 0);
diff --git a/ext/hash/tests/bug70312.phpt b/ext/hash/tests/bug70312.phpt
index 6978feb65b88d..5ff29a133ce9a 100644
--- a/ext/hash/tests/bug70312.phpt
+++ b/ext/hash/tests/bug70312.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70312 HAVAL gives wrong hashes in specific cases
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(hash('haval128,5', '1234567890123456789012345678901234567890123456789012345678901234'));
diff --git a/ext/hash/tests/crc32.phpt b/ext/hash/tests/crc32.phpt
index 3862fb17a6a00..29b30bfbaa69d 100644
--- a/ext/hash/tests/crc32.phpt
+++ b/ext/hash/tests/crc32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 CRC32
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('crc32', ''), "\n";
diff --git a/ext/hash/tests/gost.phpt b/ext/hash/tests/gost.phpt
index 6ce00242b1a40..0663792343574 100644
--- a/ext/hash/tests/gost.phpt
+++ b/ext/hash/tests/gost.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gost
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('gost', ''), "\n";
diff --git a/ext/hash/tests/hash-clone.phpt b/ext/hash/tests/hash-clone.phpt
index 9a067d73aef28..b920da093e9a0 100644
--- a/ext/hash/tests/hash-clone.phpt
+++ b/ext/hash/tests/hash-clone.phpt
@@ -1,7 +1,7 @@
 --TEST--
 hash_copy() via clone
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt
index 411b5d033dace..e00f8ea7995e0 100644
--- a/ext/hash/tests/hash_copy_001.phpt
+++ b/ext/hash/tests/hash_copy_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 hash_copy() basic tests
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt
index 5fbbf5b4d8b6c..46034a0f0ee3d 100644
--- a/ext/hash/tests/hash_copy_002.phpt
+++ b/ext/hash/tests/hash_copy_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 hash_copy() errors
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/haval.phpt b/ext/hash/tests/haval.phpt
index 16db2fa6949af..6710b9a0a5c09 100644
--- a/ext/hash/tests/haval.phpt
+++ b/ext/hash/tests/haval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 haval algorithm (multi-vector, multi-pass, multi-width)
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo "Empty String\n";
diff --git a/ext/hash/tests/hmac-md5.phpt b/ext/hash/tests/hmac-md5.phpt
index 283285a54420f..01c099965ec10 100644
--- a/ext/hash/tests/hmac-md5.phpt
+++ b/ext/hash/tests/hmac-md5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 hmac-md5 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 /* Test Vectors from RFC 2104 */
diff --git a/ext/hash/tests/md2.phpt b/ext/hash/tests/md2.phpt
index c98ad34054e10..4a429a5f293e6 100644
--- a/ext/hash/tests/md2.phpt
+++ b/ext/hash/tests/md2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 md2 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('md2', '') . "\n";
diff --git a/ext/hash/tests/md4.phpt b/ext/hash/tests/md4.phpt
index 8d90429076d90..85e44fb210f1b 100644
--- a/ext/hash/tests/md4.phpt
+++ b/ext/hash/tests/md4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 md4 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 /* RFC 1320 vectors */
diff --git a/ext/hash/tests/md5.phpt b/ext/hash/tests/md5.phpt
index d56f0b91a0f76..4672e9640c0da 100644
--- a/ext/hash/tests/md5.phpt
+++ b/ext/hash/tests/md5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 md5 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('md5', '') . "\n";
@@ -13,4 +13,3 @@ d41d8cd98f00b204e9800998ecf8427e
 0cc175b9c0f1b6a831c399e269772661
 1ced811af47ead374872fcca9d73dd71
 7707d6ae4e027c70eea2a935c2296f21
-
diff --git a/ext/hash/tests/new-context.phpt b/ext/hash/tests/new-context.phpt
index b4ddf64a0f919..da63eb5d4883b 100644
--- a/ext/hash/tests/new-context.phpt
+++ b/ext/hash/tests/new-context.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Attempt to instantiate a HashContext directly
 --SKIPIF--
-<?php if (!extension_loaded('hash')) echo 'skip';
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded");
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/reuse.phpt b/ext/hash/tests/reuse.phpt
index 481a6cfe0f58c..b284483ae97b3 100644
--- a/ext/hash/tests/reuse.phpt
+++ b/ext/hash/tests/reuse.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Attempt to reuse a closed hash context
 --SKIPIF--
-<?php if (!extension_loaded('hash')) echo 'skip';
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded");
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/ripemd128.phpt b/ext/hash/tests/ripemd128.phpt
index e7473e316cab2..abfb5324b4677 100644
--- a/ext/hash/tests/ripemd128.phpt
+++ b/ext/hash/tests/ripemd128.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ripemd128 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('ripemd128', '') . "\n";
diff --git a/ext/hash/tests/ripemd160.phpt b/ext/hash/tests/ripemd160.phpt
index 8fe7b05296a64..b89988f69ea44 100644
--- a/ext/hash/tests/ripemd160.phpt
+++ b/ext/hash/tests/ripemd160.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ripemd160 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('ripemd160', '') . "\n";
diff --git a/ext/hash/tests/ripemd256.phpt b/ext/hash/tests/ripemd256.phpt
index 6fc23794a5df2..4ad2578d5eaeb 100644
--- a/ext/hash/tests/ripemd256.phpt
+++ b/ext/hash/tests/ripemd256.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ripemd256 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('ripemd256', '') . "\n";
diff --git a/ext/hash/tests/ripemd320.phpt b/ext/hash/tests/ripemd320.phpt
index 152c922d5d932..bdbec9569e764 100644
--- a/ext/hash/tests/ripemd320.phpt
+++ b/ext/hash/tests/ripemd320.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ripemd320 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('ripemd320', '') . "\n";
diff --git a/ext/hash/tests/serialize-context.phpt b/ext/hash/tests/serialize-context.phpt
index 78177cda501d5..9719b2bc930b1 100644
--- a/ext/hash/tests/serialize-context.phpt
+++ b/ext/hash/tests/serialize-context.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Serialize a context
 --SKIPIF--
-<?php if (!extension_loaded('hash')) echo 'skip';
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded");
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/sha1.phpt b/ext/hash/tests/sha1.phpt
index b19378165331b..22fadbc7c0ce4 100644
--- a/ext/hash/tests/sha1.phpt
+++ b/ext/hash/tests/sha1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha1 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha1', '') . "\n";
diff --git a/ext/hash/tests/sha224.phpt b/ext/hash/tests/sha224.phpt
index ab2bd6d55f8ba..41f56bb6fdc41 100644
--- a/ext/hash/tests/sha224.phpt
+++ b/ext/hash/tests/sha224.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha224 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha224', '') . "\n";
diff --git a/ext/hash/tests/sha256.phpt b/ext/hash/tests/sha256.phpt
index 04b1c11abd314..2f1e6fab9498c 100644
--- a/ext/hash/tests/sha256.phpt
+++ b/ext/hash/tests/sha256.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha256 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha256', '') . "\n";
diff --git a/ext/hash/tests/sha3.phpt b/ext/hash/tests/sha3.phpt
index 67fb22f988899..21a1702e627ac 100644
--- a/ext/hash/tests/sha3.phpt
+++ b/ext/hash/tests/sha3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha3 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/hash/tests/sha384.phpt b/ext/hash/tests/sha384.phpt
index e5be2ab2747f5..35b218cd2ec39 100644
--- a/ext/hash/tests/sha384.phpt
+++ b/ext/hash/tests/sha384.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha384 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha384', '') . "\n";
diff --git a/ext/hash/tests/sha512-224.phpt b/ext/hash/tests/sha512-224.phpt
index 3769832ee6d58..2ed860847fbf1 100644
--- a/ext/hash/tests/sha512-224.phpt
+++ b/ext/hash/tests/sha512-224.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha512/224 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha512/224', '') . "\n";
diff --git a/ext/hash/tests/sha512-256.phpt b/ext/hash/tests/sha512-256.phpt
index 33ae5f177093d..c78a6d0dfe9b4 100644
--- a/ext/hash/tests/sha512-256.phpt
+++ b/ext/hash/tests/sha512-256.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha512/256 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha512/256', '') . "\n";
diff --git a/ext/hash/tests/sha512.phpt b/ext/hash/tests/sha512.phpt
index 93fbb20d635a4..41ba183d40748 100644
--- a/ext/hash/tests/sha512.phpt
+++ b/ext/hash/tests/sha512.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sha512 algorithm
 --SKIPIF--
-<?php if(!extension_loaded("hash")) print "skip"; ?>
+<?php if(!extension_loaded("hash")) die("skip hash extension not loaded"); ?>
 --FILE--
 <?php
 echo hash('sha512', '') . "\n";
diff --git a/ext/hash/tests/snefru.phpt b/ext/hash/tests/snefru.phpt
index 1b0dfa70fe154..ae49b2899f32b 100644
--- a/ext/hash/tests/snefru.phpt
+++ b/ext/hash/tests/snefru.phpt
@@ -1,7 +1,7 @@
 --TEST--
 snefru
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('snefru', ''), "\n";
diff --git a/ext/hash/tests/tiger.phpt b/ext/hash/tests/tiger.phpt
index 468fc8f699008..509841ddbdbac 100644
--- a/ext/hash/tests/tiger.phpt
+++ b/ext/hash/tests/tiger.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tiger
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('tiger192,3', ''),"\n";
diff --git a/ext/hash/tests/whirlpool.phpt b/ext/hash/tests/whirlpool.phpt
index 5f9dd164debb6..cecc306938854 100644
--- a/ext/hash/tests/whirlpool.phpt
+++ b/ext/hash/tests/whirlpool.phpt
@@ -1,7 +1,7 @@
 --TEST--
 whirlpool
 --SKIPIF--
-<?php extension_loaded('hash') or die('skip'); ?>
+<?php extension_loaded('hash') or die('skip hash extension not loaded'); ?>
 --FILE--
 <?php
 echo hash('whirlpool', ''), "\n";
diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index 8669af040c24d..f57cc723156dd 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv') or die("skip iconv() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_default_charset.phpt b/ext/iconv/tests/iconv_default_charset.phpt
index 4b44c1266e25a..9a09ce23c6709 100644
--- a/ext/iconv/tests/iconv_default_charset.phpt
+++ b/ext/iconv/tests/iconv_default_charset.phpt
@@ -2,7 +2,7 @@
 Test default_charset handling
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index 094a050e5a458..eb92dd7265c0d 100644
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv_get_encoding()/iconv_set_encoding() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt
index b0c3e0724d175..b92d56c7aecf1 100644
--- a/ext/iconv/tests/iconv_get_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_get_encoding_error.phpt
@@ -2,7 +2,7 @@
 Test iconv_get_encoding() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
index 7cc32c7e706c1..f00782eb9f049 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
@@ -2,7 +2,7 @@
 Test iconv_mime_encode() function : usage variations - Pass different data types to headers arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index 4e547c131f9ac..399c131a20d06 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -3,7 +3,7 @@ Test iconv_mime_encode() function : usage variations - Pass different data types
 --SKIPIF--
 <?php
 PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index e17525e0fe53a..315dfb7392ecb 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -3,7 +3,7 @@ Test iconv_mime_encode() function : usage variations - Pass different data types
 --SKIPIF--
 <?php
 PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode_headers') or die("skip iconv_mime_decode_headers() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
index 4d91d68add687..7d17a001318d8 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
@@ -2,7 +2,7 @@
 Test iconv_mime_decode() function : usage variations - Pass different data types to header arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index c4e3c4d400cb4..7d388ee5c559f 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -3,7 +3,7 @@ Test iconv_mime_decode() function : usage variations - Pass different data types
 --SKIPIF--
 <?php
 PHP_INT_SIZE == 4 or die('skip');
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
index c077aa10fa121..28e16d6babafc 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
@@ -2,7 +2,7 @@
 Test iconv_mime_decode() function : usage variations - Pass different data types to charset arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_mime_decode') or die("skip iconv_mime_decode() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt
index 4ba840067d5d3..1debf850e2a75 100644
--- a/ext/iconv/tests/iconv_set_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_error.phpt
@@ -2,7 +2,7 @@
 Test iconv_set_encoding() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_set_encoding') or die("skip iconv_set_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt
index 4e097569fda80..48803a78fb6b4 100644
--- a/ext/iconv/tests/iconv_set_encoding_variation.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt
@@ -2,7 +2,7 @@
 Test iconv_set_encoding() function : error functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_set_encoding') or die("skip iconv_set_encoding() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt
index f4f8d7fb9ba6c..ead139958ff1d 100644
--- a/ext/iconv/tests/iconv_strlen_basic.phpt
+++ b/ext/iconv/tests/iconv_strlen_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv_strlen() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strlen_error1.phpt b/ext/iconv/tests/iconv_strlen_error1.phpt
index 3c63b20f798ea..ca4295804d106 100644
--- a/ext/iconv/tests/iconv_strlen_error1.phpt
+++ b/ext/iconv/tests/iconv_strlen_error1.phpt
@@ -2,13 +2,13 @@
 Test iconv_strlen() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
 ?>
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt
index 6c760b14c8e93..2aeb6b62ceec9 100644
--- a/ext/iconv/tests/iconv_strlen_error2.phpt
+++ b/ext/iconv/tests/iconv_strlen_error2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strlen() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strlen_variation1.phpt b/ext/iconv/tests/iconv_strlen_variation1.phpt
index e3e25aa0dc6ae..280124fef85ff 100644
--- a/ext/iconv/tests/iconv_strlen_variation1.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation1.phpt
@@ -2,7 +2,7 @@
 Test iconv_strlen() function : usage variations - Pass different data types as $str arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt
index 85dd0483a69cc..51827d354f9cf 100644
--- a/ext/iconv/tests/iconv_strlen_variation2.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strlen() function : usage variations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 88f4903ca3688..cffeff359e15a 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_strpos_error1.phpt b/ext/iconv/tests/iconv_strpos_error1.phpt
index 232466562c47b..ea02c0f77708d 100644
--- a/ext/iconv/tests/iconv_strpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strpos_error1.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_error2.phpt b/ext/iconv/tests/iconv_strpos_error2.phpt
index 01e728ad9e072..c59d8d8a6503f 100644
--- a/ext/iconv/tests/iconv_strpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strpos_error2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : error conditions - Pass unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt
index 38dc353383ac1..00ab69d038c7a 100644
--- a/ext/iconv/tests/iconv_strpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation1.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt
index e702ca9869ec9..de192b4112e03 100644
--- a/ext/iconv/tests/iconv_strpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - pass different data types as $needle arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index 3983da6f84ff7..82485897a6d90 100644
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index d2dd8a7495ec4..d1e3a3c6ef3e6 100644
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt
index 539305541ada9..45c5108fc8aeb 100644
--- a/ext/iconv/tests/iconv_strpos_variation4.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation4.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - pass different data types as $charset arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index 759294f73a9fb..dae7d471c6772 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -2,7 +2,7 @@
 Test iconv_strpos() function : usage variations - Pass different integers as $offset argument
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index 5a6ee82d9f237..5866312553778 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt
index 9d185c744d8d5..bd393ea13e691 100644
--- a/ext/iconv/tests/iconv_strrpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error1.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt
index ea72322807d9c..3cfee6492e522 100644
--- a/ext/iconv/tests/iconv_strrpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt
index e4ed01133997d..b485a3b353af5 100644
--- a/ext/iconv/tests/iconv_strrpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt
index a0001f5269e0d..c7fdc20e66db1 100644
--- a/ext/iconv/tests/iconv_strrpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : usage variations - Pass different data types to $needle arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt
index 373e905173ce2..304d760efb277 100644
--- a/ext/iconv/tests/iconv_strrpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt
@@ -2,7 +2,7 @@
 Test iconv_strrpos() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 2e33c5aa9b35c..a48ad22da9e7f 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -2,7 +2,7 @@
 Test iconv_substr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt
index 7a30c7d509112..3fb3c3b20f1d3 100644
--- a/ext/iconv/tests/iconv_substr_error1.phpt
+++ b/ext/iconv/tests/iconv_substr_error1.phpt
@@ -2,7 +2,7 @@
 Test iconv_substr() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt
index ac5081331b208..bea007b47390a 100644
--- a/ext/iconv/tests/iconv_substr_error2.phpt
+++ b/ext/iconv/tests/iconv_substr_error2.phpt
@@ -2,7 +2,7 @@
 Test iconv_substr() function : error conditions - Pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('iconv') or die('skip');
+extension_loaded('iconv') or die('skip iconv extension not loaded');
 function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/intl/tests/bug53512.phpt b/ext/intl/tests/bug53512.phpt
index 872e5987be0dc..cff23f4ce00fe 100644
--- a/ext/intl/tests/bug53512.phpt
+++ b/ext/intl/tests/bug53512.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) die('skip');
+<?php if(!extension_loaded('intl')) die('skip intl extension not loaded');
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
diff --git a/ext/intl/tests/bug61487.phpt b/ext/intl/tests/bug61487.phpt
index 2270b25cce8cc..0e468e31b6eef 100644
--- a/ext/intl/tests/bug61487.phpt
+++ b/ext/intl/tests/bug61487.phpt
@@ -1,7 +1,7 @@
 --TEST--
 grapheme() str[i]pos limits
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) die('skip'); 
+<?php if(!extension_loaded('intl')) die('skip intl extension not loaded'); 
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
diff --git a/ext/intl/tests/dateformat_get_locale.phpt b/ext/intl/tests/dateformat_get_locale.phpt
index 48b7daa8d46a1..17c33fcee09fe 100644
--- a/ext/intl/tests/dateformat_get_locale.phpt
+++ b/ext/intl/tests/dateformat_get_locale.phpt
@@ -1,7 +1,7 @@
 --TEST--
 datefmt_get_locale_code()
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) die('skip');
+<?php if(!extension_loaded('intl')) die('skip intl extension not loaded');
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
diff --git a/ext/intl/tests/idn_uts46_errors.phpt b/ext/intl/tests/idn_uts46_errors.phpt
index 6a99bde64910c..a2070b8fd3fa0 100644
--- a/ext/intl/tests/idn_uts46_errors.phpt
+++ b/ext/intl/tests/idn_uts46_errors.phpt
@@ -3,7 +3,7 @@ IDN UTS #46 API error tests
 --SKIPIF--
 <?php
 	if (!extension_loaded('intl'))
-		die('skip');
+		die('skip intl extension not loaded');
 	if (!defined('INTL_IDNA_VARIANT_UTS46'))
 		die('skip no UTS #46 API');
 --FILE--
diff --git a/ext/json/tests/001.phpt b/ext/json/tests/001.phpt
index e908b44349f6a..611e41f20db58 100644
--- a/ext/json/tests/001.phpt
+++ b/ext/json/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_decode() tests
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt
index 48ecdc5d7bd0a..89712803c355d 100644
--- a/ext/json/tests/002.phpt
+++ b/ext/json/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() tests
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index b7a215cee7b72..c9cff96dbc054 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() & endless loop - 1
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 040973c9f3ac4..fa89d57f5ece0 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() & endless loop - 2
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/005.phpt b/ext/json/tests/005.phpt
index 48c4b38830363..86b6d63970f86 100644
--- a/ext/json/tests/005.phpt
+++ b/ext/json/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() & endless loop - 3
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/006.phpt b/ext/json/tests/006.phpt
index da2fe009f1f1a..7cedb1a51bf7b 100644
--- a/ext/json/tests/006.phpt
+++ b/ext/json/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() & extended encoding
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $a = array('<foo>', "'bar'", '"baz"', '&blong&');
diff --git a/ext/json/tests/007.phpt b/ext/json/tests/007.phpt
index 008d1dd5de454..7fe890a894c44 100644
--- a/ext/json/tests/007.phpt
+++ b/ext/json/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_last_error() tests
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(json_decode("[1]"));
diff --git a/ext/json/tests/008.phpt b/ext/json/tests/008.phpt
index f2354d381f7ed..506d1579fbec5 100644
--- a/ext/json/tests/008.phpt
+++ b/ext/json/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_decode() with large integers
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $json = '{"largenum":123456789012345678901234567890}';
diff --git a/ext/json/tests/bug40503.phpt b/ext/json/tests/bug40503.phpt
index 10896a428e9c3..aec87be43a2ce 100644
--- a/ext/json/tests/bug40503.phpt
+++ b/ext/json/tests/bug40503.phpt
@@ -3,7 +3,7 @@ Bug #40503 (json_encode() value corruption on 32bit systems with overflown value
 --INI--
 serialize_precision=-1
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 function json_test_show_eq($x, $y) {
diff --git a/ext/json/tests/bug41034.phpt b/ext/json/tests/bug41034.phpt
index 58ae281e6c40e..88350f15aec76 100644
--- a/ext/json/tests/bug41034.phpt
+++ b/ext/json/tests/bug41034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41034 (json_encode() ignores null byte started keys in arrays)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo json_encode(array(0, "\0ab"=>1, "\0null-prefixed value"));
diff --git a/ext/json/tests/bug41067.phpt b/ext/json/tests/bug41067.phpt
index b20e6e1b53a41..e315d18a73eb5 100644
--- a/ext/json/tests/bug41067.phpt
+++ b/ext/json/tests/bug41067.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41067 (json_encode() problem with UTF-16 input)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $single_barline = "\360\235\204\200";
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index f3af6b92cec54..4e4932d5371c3 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -2,7 +2,7 @@
 Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip'); 
+if (!extension_loaded('json')) die('skip json extension not loaded'); 
 if (setlocale(LC_NUMERIC, "de_DE") === false) {
 	die("skip no de_DE locale");
 }
@@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]'));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [0]=>
   float(2,1)
diff --git a/ext/json/tests/bug42090.phpt b/ext/json/tests/bug42090.phpt
index 9e5b3317e5411..ee4c7e56b0799 100644
--- a/ext/json/tests/bug42090.phpt
+++ b/ext/json/tests/bug42090.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42090 (json_decode causes segmentation fault)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(
diff --git a/ext/json/tests/bug42785.phpt b/ext/json/tests/bug42785.phpt
index fd5cdca0690e4..993fc37495333 100644
--- a/ext/json/tests/bug42785.phpt
+++ b/ext/json/tests/bug42785.phpt
@@ -4,7 +4,7 @@ Bug #42785 (Incorrect formatting of double values with non-english locales)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8859-1")) {
 	die("skip locale needed for this test is not supported on this platform");
 }
diff --git a/ext/json/tests/bug43941.phpt b/ext/json/tests/bug43941.phpt
index 97ca58e07d9d4..f885e96a9d6f0 100644
--- a/ext/json/tests/bug43941.phpt
+++ b/ext/json/tests/bug43941.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43941 (json_encode() invalid UTF-8)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug45791.phpt b/ext/json/tests/bug45791.phpt
index 7d3706825dec3..625bfdac4a1ba 100644
--- a/ext/json/tests/bug45791.phpt
+++ b/ext/json/tests/bug45791.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45791 (json_decode() does not handle number 0e0)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug46215.phpt b/ext/json/tests/bug46215.phpt
index be3a80f8600bd..55de10a70132b 100644
--- a/ext/json/tests/bug46215.phpt
+++ b/ext/json/tests/bug46215.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46215 (json_encode mutates its parameter and has some class-specific state)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt
index 85c4858af541e..03068321108ba 100644
--- a/ext/json/tests/bug47644.phpt
+++ b/ext/json/tests/bug47644.phpt
@@ -2,7 +2,7 @@
 Bug #47644 (valid large integers are truncated)
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/json/tests/bug50224.phpt b/ext/json/tests/bug50224.phpt
index 95a6648c90766..412000c4938da 100644
--- a/ext/json/tests/bug50224.phpt
+++ b/ext/json/tests/bug50224.phpt
@@ -3,7 +3,7 @@ bug #50224 (json_encode() does not always encode a float as a float)
 --INI--
 serialize_precision=-1
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "* Testing JSON output\n\n";
diff --git a/ext/json/tests/bug53946.phpt b/ext/json/tests/bug53946.phpt
index b8d3fcc3e426f..f8a61864ec554 100644
--- a/ext/json/tests/bug53946.phpt
+++ b/ext/json/tests/bug53946.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #53946 (json_encode() with JSON_UNESCAPED_UNICODE)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(json_encode("latin 1234 -/    russian мама мыла раму  specialchars \x02   \x08 \n   U+1D11E >𝄞<"));
diff --git a/ext/json/tests/bug54058.phpt b/ext/json/tests/bug54058.phpt
index ccb6389110a36..4eff16c169d5d 100644
--- a/ext/json/tests/bug54058.phpt
+++ b/ext/json/tests/bug54058.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54058 (json_last_error() invalid UTF-8 produces wrong error)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug54484.phpt b/ext/json/tests/bug54484.phpt
index f70b96ee13554..3d1920a899fed 100644
--- a/ext/json/tests/bug54484.phpt
+++ b/ext/json/tests/bug54484.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54484 (Empty string in json_decode doesn't reset json_last_error)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 json_decode('{"test":"test"}');
diff --git a/ext/json/tests/bug55543.phpt b/ext/json/tests/bug55543.phpt
index 8657fe77678b2..520cdb64227a4 100644
--- a/ext/json/tests/bug55543.phpt
+++ b/ext/json/tests/bug55543.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #55543 (json_encode() with JSON_NUMERIC_CHECK & numeric string properties)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $a = new stdClass;
diff --git a/ext/json/tests/bug61537.phpt b/ext/json/tests/bug61537.phpt
index 03a61d8645d4a..44db7777a9b67 100644
--- a/ext/json/tests/bug61537.phpt
+++ b/ext/json/tests/bug61537.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61537 (json_encode() incorrectly truncates/discards information)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $invalid_utf8 = "\x9f";
diff --git a/ext/json/tests/bug61978.phpt b/ext/json/tests/bug61978.phpt
index 68df624de1f66..f46f80d5ecbf5 100644
--- a/ext/json/tests/bug61978.phpt
+++ b/ext/json/tests/bug61978.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug62010.phpt b/ext/json/tests/bug62010.phpt
index 6b5c72589b61a..eeef0b24ad042 100644
--- a/ext/json/tests/bug62010.phpt
+++ b/ext/json/tests/bug62010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62010 (json_decode produces invalid byte-sequences)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug62369.phpt b/ext/json/tests/bug62369.phpt
index 6d9f58b967088..10e579c405497 100644
--- a/ext/json/tests/bug62369.phpt
+++ b/ext/json/tests/bug62369.phpt
@@ -1,7 +1,7 @@
 --TEST--
 FR #62369 (Segfault on json_encode(deeply_nested_array)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug63737.phpt b/ext/json/tests/bug63737.phpt
index 35361d850adc3..135e0e6f7f14f 100644
--- a/ext/json/tests/bug63737.phpt
+++ b/ext/json/tests/bug63737.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #63737 (json_decode does not properly decode with options parameter)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug64695.phpt b/ext/json/tests/bug64695.phpt
index 899259f4b4831..fe01b687443b0 100644
--- a/ext/json/tests/bug64695.phpt
+++ b/ext/json/tests/bug64695.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #64695 JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 $t = array('test' => '123343e871700');
diff --git a/ext/json/tests/bug64874_part1.phpt b/ext/json/tests/bug64874_part1.phpt
index 9e0cb7e1cf4f9..3b9cb7fa0f726 100644
--- a/ext/json/tests/bug64874_part1.phpt
+++ b/ext/json/tests/bug64874_part1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug64874_part2.phpt b/ext/json/tests/bug64874_part2.phpt
index db784bd8e0ba1..f0059eae7714b 100644
--- a/ext/json/tests/bug64874_part2.phpt
+++ b/ext/json/tests/bug64874_part2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Case-sensitivity part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 function decode($json) {
diff --git a/ext/json/tests/bug66021.phpt b/ext/json/tests/bug66021.phpt
index 504d17fc78e66..424a5f09dc526 100644
--- a/ext/json/tests/bug66021.phpt
+++ b/ext/json/tests/bug66021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66021 (Blank line inside empty array/object when JSON_PRETTY_PRINT is set)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug66025.phpt b/ext/json/tests/bug66025.phpt
index 9322d39b66c66..1a378ea2c25ce 100644
--- a/ext/json/tests/bug66025.phpt
+++ b/ext/json/tests/bug66025.phpt
@@ -2,7 +2,7 @@
 Bug #66025 (Indent wrong when json_encode() called from jsonSerialize function)
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug68546.phpt b/ext/json/tests/bug68546.phpt
index 4994ecf4b0d64..76541f84f3b36 100644
--- a/ext/json/tests/bug68546.phpt
+++ b/ext/json/tests/bug68546.phpt
@@ -3,7 +3,7 @@ Bug #68546 (json_decode() Fatal error: Cannot access property started with '\0')
 --SKIPIF--
 <?php
 
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug68567.phpt b/ext/json/tests/bug68567.phpt
index 064efa76ae5ac..e56f77600f9ec 100644
--- a/ext/json/tests/bug68567.phpt
+++ b/ext/json/tests/bug68567.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68567 JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68817.phpt b/ext/json/tests/bug68817.phpt
index 99fc5f79548cd..9007573dfb672 100644
--- a/ext/json/tests/bug68817.phpt
+++ b/ext/json/tests/bug68817.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68817 (Null pointer deference)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug68938.phpt b/ext/json/tests/bug68938.phpt
index f6291ffe62109..693d9ff223445 100644
--- a/ext/json/tests/bug68938.phpt
+++ b/ext/json/tests/bug68938.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68938 (json_decode() decodes empty string without indicating error)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 json_decode("");
diff --git a/ext/json/tests/bug68992.phpt b/ext/json/tests/bug68992.phpt
index 06448bbb38330..eff14026f97c9 100644
--- a/ext/json/tests/bug68992.phpt
+++ b/ext/json/tests/bug68992.phpt
@@ -2,7 +2,7 @@
 Bug #68992 (json_encode stacks exceptions thrown by JsonSerializable classes)
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug69187.phpt b/ext/json/tests/bug69187.phpt
index d39dbe522de7e..aaf8b50b9f6cf 100644
--- a/ext/json/tests/bug69187.phpt
+++ b/ext/json/tests/bug69187.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69187 json_last_error return BC in PHP7
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(json_decode(NULL)); 
diff --git a/ext/json/tests/bug71835.phpt b/ext/json/tests/bug71835.phpt
index dbe313b70cb43..ad33ea0ebc42a 100644
--- a/ext/json/tests/bug71835.phpt
+++ b/ext/json/tests/bug71835.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 class SomeClass implements JsonSerializable {
diff --git a/ext/json/tests/bug72069.phpt b/ext/json/tests/bug72069.phpt
index 0ff8c98621fc6..157f61f27dfab 100644
--- a/ext/json/tests/bug72069.phpt
+++ b/ext/json/tests/bug72069.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72069 (Behavior \JsonSerializable different from json_encode)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug72787.phpt b/ext/json/tests/bug72787.phpt
index c9820faa9fa2b..ce34fc90ac506 100644
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72787 (json_decode reads out of bounds)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug73113.phpt b/ext/json/tests/bug73113.phpt
index d45e51f683677..f304458f773a9 100644
--- a/ext/json/tests/bug73113.phpt
+++ b/ext/json/tests/bug73113.phpt
@@ -2,7 +2,7 @@
 Bug #73113 (Segfault with throwing JsonSerializable)
 Also test that the custom exception is not wrapped by ext/json
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/bug73254.phpt b/ext/json/tests/bug73254.phpt
index b043330cb74f3..e2480ca3021f5 100644
--- a/ext/json/tests/bug73254.phpt
+++ b/ext/json/tests/bug73254.phpt
@@ -2,7 +2,7 @@
 Bug #73254 (Incorrect indentation generated by json_encode() with JSON_PRETTY_PRINT)
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index ea203746a6daf..6e9f09a4dcb06 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -2,7 +2,7 @@
 JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
 --SKIPIF--
 <?php
-  if (!extension_loaded('json')) die('skip');
+  if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/inf_nan_error.phpt b/ext/json/tests/inf_nan_error.phpt
index bb60a104adcf7..934496d10de32 100644
--- a/ext/json/tests/inf_nan_error.phpt
+++ b/ext/json/tests/inf_nan_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 An error is thrown when INF or NaN are encoded
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt
index 0bc939c25733b..4ccf53a48fbf1 100644
--- a/ext/json/tests/json_decode_basic.phpt
+++ b/ext/json/tests/json_decode_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test json_decode() function : basic functionality
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** Testing json_decode() : basic functionality ***\n";
diff --git a/ext/json/tests/json_decode_error.phpt b/ext/json/tests/json_decode_error.phpt
index 9906a2b0d4d90..adff12db1f7df 100644
--- a/ext/json/tests/json_decode_error.phpt
+++ b/ext/json/tests/json_decode_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test json_decode() function : error conditions
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** Testing json_decode() : error conditions ***\n";
diff --git a/ext/json/tests/json_decode_invalid_utf8.phpt b/ext/json/tests/json_decode_invalid_utf8.phpt
index d92f785424b6d..e106c030ec396 100644
--- a/ext/json/tests/json_decode_invalid_utf8.phpt
+++ b/ext/json/tests/json_decode_invalid_utf8.phpt
@@ -2,7 +2,7 @@
 json_decode() invalid UTF8
 --SKIPIF--
 <?php
-if (!extension_loaded("json")) print "skip";
+if(!extension_loaded("json")) die("skip json extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 265d67299cff6..ad7bc1a4666b2 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test json_encode() function : basic functionality
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** Testing json_encode() : basic functionality ***\n";
diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt
index 7330a56a2a11e..8db34a49c6f73 100644
--- a/ext/json/tests/json_encode_basic_utf8.phpt
+++ b/ext/json/tests/json_encode_basic_utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test json_encode() function : basic functionality with UTF8 string input
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** Testing json_encode() : basic functionality with UTF-8 input***\n";
diff --git a/ext/json/tests/json_encode_error.phpt b/ext/json/tests/json_encode_error.phpt
index defc7b474ca52..60c41d41db307 100644
--- a/ext/json/tests/json_encode_error.phpt
+++ b/ext/json/tests/json_encode_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test json_encode() function : error conditions
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 echo "*** Testing json_encode() : error conditions ***\n";
diff --git a/ext/json/tests/json_encode_invalid_utf8.phpt b/ext/json/tests/json_encode_invalid_utf8.phpt
index d7ec58a973f34..7c04f9b3b749c 100644
--- a/ext/json/tests/json_encode_invalid_utf8.phpt
+++ b/ext/json/tests/json_encode_invalid_utf8.phpt
@@ -2,7 +2,7 @@
 json_encode() invalid UTF8
 --SKIPIF--
 <?php
-if (!extension_loaded("json")) print "skip";
+if(!extension_loaded("json")) die("skip json extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/json_encode_numeric.phpt b/ext/json/tests/json_encode_numeric.phpt
index 9202cd00ed19a..6bc8b5885bd54 100644
--- a/ext/json/tests/json_encode_numeric.phpt
+++ b/ext/json/tests/json_encode_numeric.phpt
@@ -3,7 +3,7 @@ Test json_encode() function with numeric flag
 --INI--
 serialize_precision=-1
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(
diff --git a/ext/json/tests/json_encode_pretty_print.phpt b/ext/json/tests/json_encode_pretty_print.phpt
index 43b93aafe6b18..f0ffaae365149 100644
--- a/ext/json/tests/json_encode_pretty_print.phpt
+++ b/ext/json/tests/json_encode_pretty_print.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() with JSON_PRETTY_PRINT
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 function encode_decode($json) {
diff --git a/ext/json/tests/json_encode_u2028_u2029.phpt b/ext/json/tests/json_encode_u2028_u2029.phpt
index 4b87e9b307c92..8b88d618bbb81 100644
--- a/ext/json/tests/json_encode_u2028_u2029.phpt
+++ b/ext/json/tests/json_encode_u2028_u2029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_encode() tests for U+2028, U+2029
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(json_encode(array("a\xC3\xA1b")));
diff --git a/ext/json/tests/json_encode_unescaped_slashes.phpt b/ext/json/tests/json_encode_unescaped_slashes.phpt
index 72ebae927adfc..9908e5a125110 100644
--- a/ext/json/tests/json_encode_unescaped_slashes.phpt
+++ b/ext/json/tests/json_encode_unescaped_slashes.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_decode() tests
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(json_encode('a/b'));
diff --git a/ext/json/tests/json_last_error_error.phpt b/ext/json/tests/json_last_error_error.phpt
index 9b520ed9a7e75..8e03effa6d0e4 100644
--- a/ext/json/tests/json_last_error_error.phpt
+++ b/ext/json/tests/json_last_error_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_last_error() failures
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/json_last_error_msg_error.phpt b/ext/json/tests/json_last_error_msg_error.phpt
index 1a5f9d1bda83e..e28855accaf21 100644
--- a/ext/json/tests/json_last_error_msg_error.phpt
+++ b/ext/json/tests/json_last_error_msg_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 json_last_error_msg() failures
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt
index aced88fee2482..4d5101625ca19 100644
--- a/ext/json/tests/pass001.1.phpt
+++ b/ext/json/tests/pass001.1.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
diff --git a/ext/json/tests/pass001.1_64bit.phpt b/ext/json/tests/pass001.1_64bit.phpt
index c71adc20a1f95..9da9a14f8efed 100644
--- a/ext/json/tests/pass001.1_64bit.phpt
+++ b/ext/json/tests/pass001.1_64bit.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt
index 170437f3075da..d73be86939ee7 100644
--- a/ext/json/tests/pass001.phpt
+++ b/ext/json/tests/pass001.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
 serialize_precision=-1
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip');
+if (!extension_loaded('json')) die('skip json extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt
index aa61cf5396354..e1214e2d155ee 100644
--- a/ext/json/tests/pass002.phpt
+++ b/ext/json/tests/pass002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
     
diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt
index bdfbaf298c37f..825787ce7dbc7 100644
--- a/ext/json/tests/pass003.phpt
+++ b/ext/json/tests/pass003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
     
diff --git a/ext/json/tests/serialize.phpt b/ext/json/tests/serialize.phpt
index 159c9f214f2ea..5f7fa29a4ffb8 100644
--- a/ext/json/tests/serialize.phpt
+++ b/ext/json/tests/serialize.phpt
@@ -3,7 +3,7 @@ json_encode() Serialization tests
 --INI--
 serialize_precision=-1
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/json/tests/unsupported_type_error.phpt b/ext/json/tests/unsupported_type_error.phpt
index dd5a7963aa1bc..39e2946049d1b 100644
--- a/ext/json/tests/unsupported_type_error.phpt
+++ b/ext/json/tests/unsupported_type_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 An error is thrown when an unsupported type is encoded
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/libxml/tests/004.phpt b/ext/libxml/tests/004.phpt
index 9d5121089d048..61c98526b53a8 100644
--- a/ext/libxml/tests/004.phpt
+++ b/ext/libxml/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_streams_context()
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/libxml/tests/bug42112.phpt b/ext/libxml/tests/bug42112.phpt
index b5a3f40b3e813..003095779c6ad 100644
--- a/ext/libxml/tests/bug42112.phpt
+++ b/ext/libxml/tests/bug42112.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42112 (deleting a node produces memory corruption)
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --FILE--
 <?php
 $xml = <<<EOXML
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
index 938229ff86933..b1089186898fe 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() basic test
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --FILE--
 <?php
 $xml = <<<XML
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
index 7f1adde613ecf..b5bb3a6c2a0d0 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() error: bad arguments
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --FILE--
 <?php
 $xml = <<<XML
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
index 958192704348e..5a7ffef7d2a16 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() variation: resolve externals and entities
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
index b6251bea6d079..8207bcb37c938 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 libxml_set_external_entity_loader() variation: restore original handler; returning NULL
 --SKIPIF--
-<?php if (!extension_loaded('dom')) die('skip'); ?>
+<?php if (!extension_loaded('dom')) die('skip dom extension not loaded'); ?>
 --CLEAN--
 <?php
 @unlink(__DIR__ . "/foobar.dtd");
diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt
index b2dd0481860b6..fa2f5ddba8994 100644
--- a/ext/mbstring/tests/bug43840.phpt
+++ b/ext/mbstring/tests/bug43840.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : mb_strpos bounds check is byte count rather than a character count
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt
index c4be058ffa763..b7ac45d826af7 100644
--- a/ext/mbstring/tests/bug43841.phpt
+++ b/ext/mbstring/tests/bug43841.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : mb_strrpos offset is byte count for negative values
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt
index b2fd867da93ca..81450aaff42cb 100644
--- a/ext/mbstring/tests/bug43994.phpt
+++ b/ext/mbstring/tests/bug43994.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : mb_ereg 'successfully' matching incorrectly
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug43998.phpt b/ext/mbstring/tests/bug43998.phpt
index da5e599da0037..f205d481aafd5 100644
--- a/ext/mbstring/tests/bug43998.phpt
+++ b/ext/mbstring/tests/bug43998.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : Two error messages returned for incorrect encoding for mb_strto[upper|lower]
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug45239.phpt b/ext/mbstring/tests/bug45239.phpt
index 8d8ef4831ea8d..4272e8ee5ae76 100644
--- a/ext/mbstring/tests/bug45239.phpt
+++ b/ext/mbstring/tests/bug45239.phpt
@@ -6,7 +6,7 @@ mbstring.http_input=UTF-8
 mbstring.internal_encoding=UTF-8
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/bug63447_001.phpt b/ext/mbstring/tests/bug63447_001.phpt
index 51302994dbd1f..b47c8d101c24e 100644
--- a/ext/mbstring/tests/bug63447_001.phpt
+++ b/ext/mbstring/tests/bug63447_001.phpt
@@ -2,7 +2,7 @@
 Bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 ?>
 --INI--
 max_input_nesting_level=10
diff --git a/ext/mbstring/tests/bug63447_002.phpt b/ext/mbstring/tests/bug63447_002.phpt
index e51089b794248..8277c5c2b3d07 100644
--- a/ext/mbstring/tests/bug63447_002.phpt
+++ b/ext/mbstring/tests/bug63447_002.phpt
@@ -2,7 +2,7 @@
 Bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 ?>
 --INI--
 max_input_nesting_level=10
diff --git a/ext/mbstring/tests/bug63447_003.phpt b/ext/mbstring/tests/bug63447_003.phpt
index a4a7e14851ff1..e93158e4734d8 100644
--- a/ext/mbstring/tests/bug63447_003.phpt
+++ b/ext/mbstring/tests/bug63447_003.phpt
@@ -2,7 +2,7 @@
 Bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 ?>
 --INI--
 max_input_nesting_level=5
diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt
index b41c717873ca6..789629e06ee6d 100644
--- a/ext/mbstring/tests/mb_convert_encoding_array.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt
@@ -2,7 +2,7 @@
 Test mb_convert_encoding() function : array functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_convert_encoding_array2.phpt b/ext/mbstring/tests/mb_convert_encoding_array2.phpt
index 29991f2165f8a..04062e65cafcc 100644
--- a/ext/mbstring/tests/mb_convert_encoding_array2.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_array2.phpt
@@ -2,7 +2,7 @@
 Test mb_convert_encoding() function : Circular references
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
index 19626795eb938..5b4dc72d4d85d 100644
--- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_convert_encoding() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
index c8d211438065e..d87bc0b0a004e 100644
--- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_convert_encoding() function : usage variations - pass different data types as $to_encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
index 5374c31c158d3..27d3f52c14359 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_decode_mimeheader() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
index c40cdbd643ad3..efab9311d396d 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
@@ -2,7 +2,7 @@
 Test mb_decode_mimeheader() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
index e07ccad998dcd..aa634ebf86ea1 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
@@ -4,7 +4,7 @@ Test mb_decode_mimeheader() function : usage variation
 D. Kesley
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
index 7527c9aa5a1db..5362ab5a85e0c 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_decode_mimeheader() function : variation 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
index 968e76eaf633b..d805a1da7387e 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_decode_mimeheader() function : variation 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
index 4aa1323adb0c6..d71265efbe85e 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
index 3e05b77611008..3075c4b8011c2 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
index f43717327c48d..1ebb9c44fd94f 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
index 11fe23f531dfa..d712182958efd 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : basic functionality, indent
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
index 7b5bd30661b59..4ff31e8180a3e 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different data types to $str arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
index e765e9438891e..79f86069513ff 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different data types to $charset arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
index c2976f5d00851..d13a2678c59fb 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different data types to $transfer_encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
index fe050840ef2d7..5d29e0225e2b6 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different data types to $linefeed arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
index 66014fa8a59bb..ed6ffc9555b30 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different data types to $indent arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
index de2a84817237f..b4fe14c4db29b 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
@@ -2,7 +2,7 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different strings to $linefeed arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg-compat-01.phpt b/ext/mbstring/tests/mb_ereg-compat-01.phpt
index 09376780ed030..f1614d4a90317 100644
--- a/ext/mbstring/tests/mb_ereg-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-01.phpt
@@ -2,7 +2,7 @@
 mb_ereg() compat test 1
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg-compat-02.phpt b/ext/mbstring/tests/mb_ereg-compat-02.phpt
index 2f40422543804..00b057e6fc5b0 100644
--- a/ext/mbstring/tests/mb_ereg-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg-compat-02.phpt
@@ -2,7 +2,7 @@
 mb_ereg() compat test 2
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt
index ff64666f08371..02e8d82d579b4 100644
--- a/ext/mbstring/tests/mb_ereg_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt
index 21216257cd725..459494d969584 100644
--- a/ext/mbstring/tests/mb_ereg_error.phpt
+++ b/ext/mbstring/tests/mb_ereg_error.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : error conditions - pass incorrect number of arguments
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt
index f730a637d3293..a156d4bb4ffc5 100644
--- a/ext/mbstring/tests/mb_ereg_match_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_match() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt
index aab95fe6cd3a9..6fa5bb0557cca 100644
--- a/ext/mbstring/tests/mb_ereg_match_error1.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_match() function : error conditions - pass function incorrect number of arguments
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
index ad2c6c1c560bf..9ef26eb143a76 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 1
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip'); 
+extension_loaded('mbstring') or die('skip mbstring extension not loaded'); 
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
index b5ea12196dc39..7cb4499d85995 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 2
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
index c02a346c5e019..aaa20e8bb1961 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 3
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
index 94ff320707979..54502442ce42b 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 4
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
index f5dae3da14881..e8f1d900ba75f 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 5
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
index 8c84dc1e3c033..41741bb8555f7 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 6
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
index e390655ef4a67..65d41039cffff 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 7
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
index 5ccc9fd1c020f..b2a67a08ab121 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 8
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
index bef8be1f4d915..5d6e0f0e8dd05 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 9
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
index ac80a4e052c81..f832c7442260b 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 10
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
index 7ae3edf62fce6..e26acdcd71990 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 11
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
index 53bc51e6768a9..993f8a027e816 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 12
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
index 2975ab75ba1ab..486f9c881100d 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 13
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
index 746dd4e1a4753..b035058876fce 100644
--- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_replace() function : basic 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt
index 4e8a3388dd0e5..7c53563bc0820 100644
--- a/ext/mbstring/tests/mb_ereg_replace_error.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_replace() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
index cbf3dd98cd691..9467cc4e28f3c 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
@@ -4,7 +4,7 @@ Test mb_ereg_replace() function : usage variations  - <type here specifics of th
 error_reporting=E_ALL & ~E_NOTICE
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
index 37a89fcba7064..b355432676005 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_replace() function : usage variations
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
index 09da6cd3ee151..3ad561608b0ab 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_replace() function : usage variations
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?> 
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
index 05b4f60da345d..e7b7e09cc2f59 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg_replace() function : usage variations  
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?> 
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt
index 7172dd2a750a5..d764370aba8b4 100644
--- a/ext/mbstring/tests/mb_ereg_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - pass different data types to $pattern argument
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt
index 291c1c1ec4554..6a84b2e695add 100644
--- a/ext/mbstring/tests/mb_ereg_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - pass different data types to $string arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt
index a71f2395da162..e90192a231b20 100644
--- a/ext/mbstring/tests/mb_ereg_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - pass different character classes to see they match correctly
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt
index 80c879e38ca3b..264796b4a6341 100644
--- a/ext/mbstring/tests/mb_ereg_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - pass different character classes as pattern for multibyte string
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation5.phpt b/ext/mbstring/tests/mb_ereg_variation5.phpt
index 0a7eb53d77b81..abe3a53b8420e 100644
--- a/ext/mbstring/tests/mb_ereg_variation5.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - Test anchors in regex
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt
index 0de5064fedfcd..68503a6fab4c2 100644
--- a/ext/mbstring/tests/mb_ereg_variation6.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation6.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - match special characters
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt
index 41c427162e509..0d2f290e0bb0d 100644
--- a/ext/mbstring/tests/mb_ereg_variation7.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation7.phpt
@@ -2,7 +2,7 @@
 Test mb_ereg() function : usage variations - different regex features in $pattern
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_get_info.phpt b/ext/mbstring/tests/mb_get_info.phpt
index 5b9c0c0aef185..7808f098dae56 100644
--- a/ext/mbstring/tests/mb_get_info.phpt
+++ b/ext/mbstring/tests/mb_get_info.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test mb_get_info() function
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip'); ?>
+<?php extension_loaded('mbstring') or die('skip mbstring extension not loaded'); ?>
 --INI--
 mbstring.encoding_translation=1
 mbstring.language=Korean
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
index a289dcf8de104..6035b8101a501 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_internal_encoding() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
index 4f9a6a6026a4c..f83165b3e1830 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
@@ -7,7 +7,7 @@ output_encoding="ISO-8859-1"
 internal_encoding="ISO-8859-1"
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt
index ce824e6a2fd57..ef14560adb46e 100644
--- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_internal_encoding() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?> 
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
index d0a1653ebecac..7ce2fce2c9269 100644
--- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_internal_encoding() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
index 241e1a69294a8..52a4f73ea29e0 100644
--- a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
@@ -2,7 +2,7 @@
 Test INI mbstring.internal_encoding basic - encoding when valid specified
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
index 581df06414843..2c9fbcfe0a1ef 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_internal_encoding() function : usage variations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
index 914041c914997..9653fd2d7f843 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_internal_encoding() function : usage variations - Test different encodings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_language.phpt b/ext/mbstring/tests/mb_language.phpt
index 0b8bcff28c6d2..737dd1b263b35 100644
--- a/ext/mbstring/tests/mb_language.phpt
+++ b/ext/mbstring/tests/mb_language.phpt
@@ -1,7 +1,7 @@
 --TEST--
 mb_language()
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip');
+<?php extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 --INI--
 mbstring.language=
 --FILE--
diff --git a/ext/mbstring/tests/mb_regex_encoding_basic.phpt b/ext/mbstring/tests/mb_regex_encoding_basic.phpt
index a0a41e96773de..d0e2686c13ce2 100644
--- a/ext/mbstring/tests/mb_regex_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_regex_encoding() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
index 4c5456d36c988..fc362501c8e84 100644
--- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_regex_encoding() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_regex_encoding_error2.phpt b/ext/mbstring/tests/mb_regex_encoding_error2.phpt
index c752609daf376..ef0fcef266900 100644
--- a/ext/mbstring/tests/mb_regex_encoding_error2.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_regex_encoding() function : error conditions - Pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
index 09b263d7519cf..f6b829337b10b 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_regex_encoding() function : usage variations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
index fc9c6003715f3..5ddecda1677ae 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_regex_encoding() function : usage variations - test different encodings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split-compat-01.phpt b/ext/mbstring/tests/mb_split-compat-01.phpt
index 8dbc82c130d52..8da94629efc97 100644
--- a/ext/mbstring/tests/mb_split-compat-01.phpt
+++ b/ext/mbstring/tests/mb_split-compat-01.phpt
@@ -2,7 +2,7 @@
 mb_split() compat test 1
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split_empty_match.phpt b/ext/mbstring/tests/mb_split_empty_match.phpt
index df3a22ce56915..6cd596a91f92e 100644
--- a/ext/mbstring/tests/mb_split_empty_match.phpt
+++ b/ext/mbstring/tests/mb_split_empty_match.phpt
@@ -3,7 +3,7 @@ mb_split() empty match
 --
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split_error.phpt b/ext/mbstring/tests/mb_split_error.phpt
index b48e21520b9d9..e1496fa1a7027 100644
--- a/ext/mbstring/tests/mb_split_error.phpt
+++ b/ext/mbstring/tests/mb_split_error.phpt
@@ -2,7 +2,7 @@
 Test mb_split() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split_variation1.phpt b/ext/mbstring/tests/mb_split_variation1.phpt
index b508049969d8b..d54611d74ac43 100644
--- a/ext/mbstring/tests/mb_split_variation1.phpt
+++ b/ext/mbstring/tests/mb_split_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_split() function : usage variations  - different parameter types for pattern
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split_variation2.phpt b/ext/mbstring/tests/mb_split_variation2.phpt
index a6db2cc04f133..7cb90cb3ce57c 100644
--- a/ext/mbstring/tests/mb_split_variation2.phpt
+++ b/ext/mbstring/tests/mb_split_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_split() function : usage variations  - different parameter types for string
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt
index ccf614b8bfa42..190d7bd7be70a 100644
--- a/ext/mbstring/tests/mb_split_variation3.phpt
+++ b/ext/mbstring/tests/mb_split_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_split() function : usage variations  - different parameter types for limit
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_split') or die("skip mb_split() is not available in this build");
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
diff --git a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
index a67b99e7daa26..b4011f64b355a 100644
--- a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
+++ b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
@@ -2,7 +2,7 @@
 mb_strcut() missing boundary check.
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strcut_negative_length.phpt b/ext/mbstring/tests/mb_strcut_negative_length.phpt
index 3bdc7d90ce930..0dde2d0fda3d1 100644
--- a/ext/mbstring/tests/mb_strcut_negative_length.phpt
+++ b/ext/mbstring/tests/mb_strcut_negative_length.phpt
@@ -1,7 +1,7 @@
 --TEST--
 mb_strcut() negative length test
 --SKIPIF--
-<?php extension_loaded('mbstring') or die('skip');
+<?php extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 --FILE--
 <?php
 var_dump(mb_strcut('Déjà vu', 1, -3));
diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt
index 5a2fb6cb378a3..8b6156702564f 100644
--- a/ext/mbstring/tests/mb_stripos_basic.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt
index a9399da39172b..610f9545b9ab0 100644
--- a/ext/mbstring/tests/mb_stripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic2.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt
index 4187898f010c8..0492a6a0201f7 100644
--- a/ext/mbstring/tests/mb_stripos_error1.phpt
+++ b/ext/mbstring/tests/mb_stripos_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt
index 82b01b92f38ed..cc16894cfa648 100644
--- a/ext/mbstring/tests/mb_stripos_error2.phpt
+++ b/ext/mbstring/tests/mb_stripos_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : error conditions - Pass unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt
index 39837aa0802c6..564d33fac9d05 100644
--- a/ext/mbstring/tests/mb_stripos_variation1.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt
index 32b75467f782f..ca48314cbb19b 100644
--- a/ext/mbstring/tests/mb_stripos_variation2.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : usage variations - pass different data types as $needle arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt
index 025105ae73558..96acf5cfa0628 100644
--- a/ext/mbstring/tests/mb_stripos_variation3.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : usage variations - pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt
index dc11b48d382b4..1c755920cf469 100644
--- a/ext/mbstring/tests/mb_stripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
index f2f9555a2b3b2..149aab19664e5 100644
--- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
@@ -2,7 +2,7 @@
 Test mb_stripos() function : usage variations - Pass different integers as $offset argument
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt
index 58a03dcb2c1d3..d7485fef70e87 100644
--- a/ext/mbstring/tests/mb_stristr_basic.phpt
+++ b/ext/mbstring/tests/mb_stristr_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt
index c20f13470d1d9..3914b8e88ba4c 100644
--- a/ext/mbstring/tests/mb_stristr_error1.phpt
+++ b/ext/mbstring/tests/mb_stristr_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt
index 74f8bfb4ebe79..edad012d802a7 100644
--- a/ext/mbstring/tests/mb_stristr_error2.phpt
+++ b/ext/mbstring/tests/mb_stristr_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt
index c8c2ae1f68ffc..1aa9effb594eb 100644
--- a/ext/mbstring/tests/mb_stristr_variation1.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : usage variation - various haystacks, needle won't be found
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 498bb3b8683d9..91ef040568cae 100644
--- a/ext/mbstring/tests/mb_stristr_variation2.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : usage variation - different types of needle.
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt
index 5447ab07179c1..9eb4737868c35 100644
--- a/ext/mbstring/tests/mb_stristr_variation3.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : usage variation - different values for part
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt
index 7da3eeced0274..6b8aebc3c00aa 100644
--- a/ext/mbstring/tests/mb_stristr_variation4.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : usage variation - different encoding types
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt
index 54d527ecf5134..c07916446d484 100644
--- a/ext/mbstring/tests/mb_stristr_variation5.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_stristr() function : usage variation - multiple needles
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt
index 0e62b881b4b78..61f8b959f5fc0 100644
--- a/ext/mbstring/tests/mb_strlen_basic.phpt
+++ b/ext/mbstring/tests/mb_strlen_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_error1.phpt b/ext/mbstring/tests/mb_strlen_error1.phpt
index aff78d60f3e58..4e9c4fc8b7a0f 100644
--- a/ext/mbstring/tests/mb_strlen_error1.phpt
+++ b/ext/mbstring/tests/mb_strlen_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt
index a530a844173bc..e9c5ff8b21ebc 100644
--- a/ext/mbstring/tests/mb_strlen_error2.phpt
+++ b/ext/mbstring/tests/mb_strlen_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt
index 4af8dc61aaa19..6c12fe64e1d8b 100644
--- a/ext/mbstring/tests/mb_strlen_variation1.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : usage variations - Pass different data types as $str arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt
index 276731ce9294e..79f117fa532b1 100644
--- a/ext/mbstring/tests/mb_strlen_variation2.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : usage variations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt
index b254cbc712e33..351adc4c7c62f 100644
--- a/ext/mbstring/tests/mb_strlen_variation3.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strlen() function : usage variations - Pass list of encodings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt
index 1197fbadd7b46..d8b64ad043999 100644
--- a/ext/mbstring/tests/mb_strpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strpos_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_error1.phpt b/ext/mbstring/tests/mb_strpos_error1.phpt
index ef0cbafeff6ac..6e6262bef2e78 100644
--- a/ext/mbstring/tests/mb_strpos_error1.phpt
+++ b/ext/mbstring/tests/mb_strpos_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt
index f75390f2c5201..cc4891ea924f3 100644
--- a/ext/mbstring/tests/mb_strpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strpos_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : error conditions - Pass unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt
index 0684724b5cc16..84a1582a8cfa6 100644
--- a/ext/mbstring/tests/mb_strpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt
index fb2d7227b90b5..43293586a9d98 100644
--- a/ext/mbstring/tests/mb_strpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : usage variations - pass different data types as $needle arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt
index cbdeda2b385cf..e96a533cc5b6e 100644
--- a/ext/mbstring/tests/mb_strpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : usage variations - pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt
index 31b43bacb7dee..209bad5d11819 100644
--- a/ext/mbstring/tests/mb_strpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt
index 1dccce638522b..3063c91a5da8a 100644
--- a/ext/mbstring/tests/mb_strpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_strpos() function : usage variations - Pass different integers as $offset argument
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt
index 8c227487f0bcc..fc3d0474d999d 100644
--- a/ext/mbstring/tests/mb_strrchr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrchr_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt
index 42346afbf0b34..75ea4564c730a 100644
--- a/ext/mbstring/tests/mb_strrchr_error1.phpt
+++ b/ext/mbstring/tests/mb_strrchr_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : error conditions
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?> 
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt
index 11abee609b182..d7aa8fef5b185 100644
--- a/ext/mbstring/tests/mb_strrchr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrchr_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt
index 7284939a5715d..d5a3a5b780d5c 100644
--- a/ext/mbstring/tests/mb_strrchr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : usage variation - various haystacks, needle won't be found
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt
index 074cdda108612..8b7c25ad20366 100644
--- a/ext/mbstring/tests/mb_strrchr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : usage variation - different types of needle.
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt
index 72b9c66cbe28e..39d85b0e1d2f0 100644
--- a/ext/mbstring/tests/mb_strrchr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : usage variation - different values for part
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt
index a85979c9884be..40941c16f8d6b 100644
--- a/ext/mbstring/tests/mb_strrchr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : usage variation - different encoding types
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt
index fa37db646c6d2..33cdecd2ad3a6 100644
--- a/ext/mbstring/tests/mb_strrchr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : variation - multiple needles
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt
index 2c941c511406b..6984af3611355 100644
--- a/ext/mbstring/tests/mb_strrchr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt
@@ -2,7 +2,7 @@
 Test mb_strrchr() function : variation - case sensitivity
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt
index 2670de774c8bf..790025a6d20f2 100644
--- a/ext/mbstring/tests/mb_strrichr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrichr_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt
index 7280c530853e0..b0cac8f325b66 100644
--- a/ext/mbstring/tests/mb_strrichr_error1.phpt
+++ b/ext/mbstring/tests/mb_strrichr_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt
index b1877db9c100e..16b6194e74565 100644
--- a/ext/mbstring/tests/mb_strrichr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrichr_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt
index 06ca5e31c9645..655209e3908c7 100644
--- a/ext/mbstring/tests/mb_strrichr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : usage variation - various haystacks, needle won't be found
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt
index e2c979b428c4a..4582f20be9ecf 100644
--- a/ext/mbstring/tests/mb_strrichr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : usage variation - different types of needle.
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt
index 5f73dc4da74f3..c99575aca8947 100644
--- a/ext/mbstring/tests/mb_strrichr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : usage variation - different values for part
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt
index f9d9f680372aa..992a9e9896ccf 100644
--- a/ext/mbstring/tests/mb_strrichr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : usage variation - different encoding types
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt
index 0e5d472fd85ef..e4e8bfe0a5a46 100644
--- a/ext/mbstring/tests/mb_strrichr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_strrichr() function : usage variation - multiple needles
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt
index d63a2eaf6cc46..478afb36d5c9d 100644
--- a/ext/mbstring/tests/mb_strripos_basic.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt
index 09fc7e352bcc2..2359f65023c1a 100644
--- a/ext/mbstring/tests/mb_strripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic2.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt
index 3e2f6d928d0a7..ddfe11d23af25 100644
--- a/ext/mbstring/tests/mb_strripos_error1.phpt
+++ b/ext/mbstring/tests/mb_strripos_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt
index d01a774107f81..c958c768919bc 100644
--- a/ext/mbstring/tests/mb_strripos_error2.phpt
+++ b/ext/mbstring/tests/mb_strripos_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : error conditions - Pass unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt
index 0a3be0a7da6eb..aa5f1214f905f 100644
--- a/ext/mbstring/tests/mb_strripos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt
index eafe7f79e9741..3429abcee2476 100644
--- a/ext/mbstring/tests/mb_strripos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : usage variations - pass different data types as $needle arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
index 16f92bfdfacd9..f9ec6388b4cd1 100644
--- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
@@ -2,16 +2,16 @@
 Test mb_strripos() function : usage variations - pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
@@ -204,4 +204,3 @@ int(8)
 Warning: mb_strripos() expects parameter 3 to be int, resource given in %s on line %d
 NULL
 Done
-
diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt
index 27973e51ead80..932137cf62b31 100644
--- a/ext/mbstring/tests/mb_strripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
index ce3074abf020b..f55826f224767 100644
--- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
@@ -2,7 +2,7 @@
 Test mb_strripos() function : usage variations - Pass different integers as $offset argument
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt
index aac9fc020f952..5b4cb8e4f3838 100644
--- a/ext/mbstring/tests/mb_strrpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strrpos_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt
index 892599acc2f08..4e57b42ee65fc 100644
--- a/ext/mbstring/tests/mb_strrpos_error1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt
index fa3719509c0d7..cc709f76600b3 100644
--- a/ext/mbstring/tests/mb_strrpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt
index f0e6e479877e9..bba7c290987f6 100644
--- a/ext/mbstring/tests/mb_strrpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : usage variations - pass different data types to $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt
index c2855e0f81289..91add24060162 100644
--- a/ext/mbstring/tests/mb_strrpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : usage variations - Pass different data types to $needle arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt
index da28d6ed7c99f..5db4fb809681d 100644
--- a/ext/mbstring/tests/mb_strrpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : usage variations - Pass different data types as $offset arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt
index 287142793b655..e4d49bd87cb73 100644
--- a/ext/mbstring/tests/mb_strrpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt
index 6205ecac487f0..0361486abdc4d 100644
--- a/ext/mbstring/tests/mb_strrpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_strrpos() function : usage variations - pass encoding as third argument (deprecated behaviour)
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt
index 2b41707a6a6fa..c945dfa4bf9c7 100644
--- a/ext/mbstring/tests/mb_strstr_basic.phpt
+++ b/ext/mbstring/tests/mb_strstr_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt
index cf7c0b1f17d68..e238033c5c2f6 100644
--- a/ext/mbstring/tests/mb_strstr_error1.phpt
+++ b/ext/mbstring/tests/mb_strstr_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt
index 8df700080ea1f..244888f4e125e 100644
--- a/ext/mbstring/tests/mb_strstr_error2.phpt
+++ b/ext/mbstring/tests/mb_strstr_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt
index a9406f1cadc48..0fab42ee4ae7b 100644
--- a/ext/mbstring/tests/mb_strstr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : usage variation - various haystacks, needle won't be found
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt
index 8c059cb6b2a54..99fa18db41d52 100644
--- a/ext/mbstring/tests/mb_strstr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : usage variation - different types of needle.
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt
index 28dc17ac53fd1..838fdd6b32be7 100644
--- a/ext/mbstring/tests/mb_strstr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : usage variation - different values for part
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt
index 8a0efcba8e7b4..8f8f839882a70 100644
--- a/ext/mbstring/tests/mb_strstr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : usage variation - different encoding types
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt
index ab6315be441ac..9b3cbc0316936 100644
--- a/ext/mbstring/tests/mb_strstr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : variation - multiple needles
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt
index d00f15cfa3b20..e530278be9735 100644
--- a/ext/mbstring/tests/mb_strstr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation6.phpt
@@ -2,7 +2,7 @@
 Test mb_strstr() function : variation - case sensitivity
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt
index 4f727094b15ed..6df1198e03d1b 100644
--- a/ext/mbstring/tests/mb_strtolower_basic.phpt
+++ b/ext/mbstring/tests/mb_strtolower_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_error1.phpt b/ext/mbstring/tests/mb_strtolower_error1.phpt
index 20200aae8ef68..91b1a309599fe 100644
--- a/ext/mbstring/tests/mb_strtolower_error1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : error conditions - pass incorrect number of arguments
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt
index 9a0aed0f01fa4..b9877d858d425 100644
--- a/ext/mbstring/tests/mb_strtolower_error2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt
index 3b151b96c72bd..91316d04d18f3 100644
--- a/ext/mbstring/tests/mb_strtolower_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : usage variations - pass different data types as $sourcestring arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt
index ef69eb00af783..ede49fead30b0 100644
--- a/ext/mbstring/tests/mb_strtolower_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt
index bf918df1825ee..36becd90a130a 100644
--- a/ext/mbstring/tests/mb_strtolower_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : usage variations - pass mixed ASCII and non-ASCII strings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt
index 007430b262936..f7cfd6a6cf420 100644
--- a/ext/mbstring/tests/mb_strtolower_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strtolower() function : usage variations - pass different characters to check conversion is correct
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt
index e8f48345fee80..cd93016b2dc61 100644
--- a/ext/mbstring/tests/mb_strtoupper_basic.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_error1.phpt b/ext/mbstring/tests/mb_strtoupper_error1.phpt
index c14d2f1b5c23e..dd1d276cf144d 100644
--- a/ext/mbstring/tests/mb_strtoupper_error1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : error conditions - pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index cf42926577622..71061eae6aa60 100644
--- a/ext/mbstring/tests/mb_strtoupper_error2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : error conditions - pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
index efe8845638298..a9f8e704e343b 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : usage varitations - pass different data types as $sourcestring arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
index 25b9a53e917da..8e9b381b18b4d 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : usage varitations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
index de77f392250f9..3be2302f87342 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : usage varitations - pass mixed ASCII and non-ASCII strings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
index 739671b6c4cd7..09feb460536b2 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_strtoupper() function : usage varitations - Pass different character types to check conversion is correct
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt
index 036203f416af1..b9f9373c2f7fb 100644
--- a/ext/mbstring/tests/mb_substitute_character_basic.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_substitute_character() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substitute_character') or die("skip mb_substitute_character() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt
index 2a816b8b2ff3f..6c884b7bc2b83 100644
--- a/ext/mbstring/tests/mb_substitute_character_error.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_error.phpt
@@ -2,7 +2,7 @@
 Test mb_substitute_character() function : error conditions 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substitute_character') or die("skip mb_substitute_character() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
index fa786a1e5c730..514254688a30d 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_substitute_character() function : usage variation 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substitute_character') or die("skip mb_substitute_character() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt
index 6248174aa613d..c681d5e7d92e9 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_substitute_character() function : variation unmappable out char for convert encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substitute_character') or die("skip mb_substitute_character() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt
index 8842e7a3d18c0..15d3b906d2ba1 100644
--- a/ext/mbstring/tests/mb_substr_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : basic functionality 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt
index 13cd4a7f25c3c..c81c49137d1bf 100644
--- a/ext/mbstring/tests/mb_substr_count_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_count_basic.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : basic functionality
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt
index 881ca0c22ee07..74e0ef602e0ad 100644
--- a/ext/mbstring/tests/mb_substr_count_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : error conditions - pass incorrect number of arguments
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt
index aefb2c05c8d3d..9579e0666b6fc 100644
--- a/ext/mbstring/tests/mb_substr_count_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : error conditions - pass unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt
index cc55135ab24ef..7e5b20cbbc9d5 100644
--- a/ext/mbstring/tests/mb_substr_count_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : usage variations - Pass different data types as $haystack arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt
index 87b5eed189814..a47d33468fb85 100644
--- a/ext/mbstring/tests/mb_substr_count_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : usage variations - pass different data types as $needle arg 
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt
index d2e7a60566961..ac6d66e3bcd57 100644
--- a/ext/mbstring/tests/mb_substr_count_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function :usage variations - pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt
index 0a98d2051b149..9e2902e202329 100644
--- a/ext/mbstring/tests/mb_substr_count_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_substr_count() function : variation - pass a $needle that overlaps in $haystack
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt
index e48b3193b3cad..75d66c358e1fb 100644
--- a/ext/mbstring/tests/mb_substr_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_error1.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : error conditions - Pass incorrect number of args
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt
index 72be974ed076d..96417550608d2 100644
--- a/ext/mbstring/tests/mb_substr_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_error2.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : error conditions - Pass an unknown encoding
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt
index b02daa3450dda..348a623d805c4 100644
--- a/ext/mbstring/tests/mb_substr_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_variation1.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - pass unexpected arguments (including strings) in place of $str
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt
index 7c763f36168dd..60298d43057a4 100644
--- a/ext/mbstring/tests/mb_substr_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_variation2.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - Pass different data types as $encoding arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation3.phpt b/ext/mbstring/tests/mb_substr_variation3.phpt
index 702bdda147087..c8ab6697a87ab 100644
--- a/ext/mbstring/tests/mb_substr_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_variation3.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - test different encodings
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt
index ce4df5300586a..f547beb7b3bca 100644
--- a/ext/mbstring/tests/mb_substr_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_variation4.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - pass different integers to $start arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt
index 1ec92be993458..88cbd996a3304 100644
--- a/ext/mbstring/tests/mb_substr_variation5.phpt
+++ b/ext/mbstring/tests/mb_substr_variation5.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - pass different integers to $length arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt
index aa75c70c00bec..341cedb5431c4 100644
--- a/ext/mbstring/tests/mb_substr_variation6.phpt
+++ b/ext/mbstring/tests/mb_substr_variation6.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - pass different integers to $start arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt
index 22b5fa2fe32a6..1c3de1119a315 100644
--- a/ext/mbstring/tests/mb_substr_variation7.phpt
+++ b/ext/mbstring/tests/mb_substr_variation7.phpt
@@ -2,7 +2,7 @@
 Test mb_substr() function : usage variations - pass different integers to $length arg
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip');
+extension_loaded('mbstring') or die('skip mbstring extension not loaded');
 function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/oci8/tests/bug38161.phpt b/ext/oci8/tests/bug38161.phpt
index 0664510146e00..f67c2926af08c 100644
--- a/ext/oci8/tests/bug38161.phpt
+++ b/ext/oci8/tests/bug38161.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38161 (oci_bind_by_name() returns garbage when Oracle didn't set the variable)
 --SKIPIF--
-<?php if (!extension_loaded("oci8")) print "skip"; ?>
+<?php if(!extension_loaded("oci8")) die("skip oci8 extension not loaded"); ?>
 --FILE--
 <?php
 
@@ -24,7 +24,7 @@ var_dump($bv);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 NULL
 int(0)
 Done
diff --git a/ext/oci8/tests/connect_with_charset_001.phpt b/ext/oci8/tests/connect_with_charset_001.phpt
index 9149747cdbb5b..9b21485c8c3cc 100644
--- a/ext/oci8/tests/connect_with_charset_001.phpt
+++ b/ext/oci8/tests/connect_with_charset_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 oci_connect() with invalid character set
 --SKIPIF--
-<?php if (!extension_loaded("oci8")) print "skip"; ?>
+<?php if(!extension_loaded("oci8")) die("skip oci8 extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/odbc/tests/skipif.inc b/ext/odbc/tests/skipif.inc
index 179a5b180e106..4cd13d0be6510 100644
--- a/ext/odbc/tests/skipif.inc
+++ b/ext/odbc/tests/skipif.inc
@@ -1,6 +1,6 @@
 <?php
 
-if (!extension_loaded('odbc')) die('skip');
+if (!extension_loaded('odbc')) die('skip odbc extension not loaded');
 
 include 'config.inc';
 
diff --git a/ext/opcache/tests/issue0115.phpt b/ext/opcache/tests/issue0115.phpt
index 26d99080ebe99..43d1e96d6acd3 100644
--- a/ext/opcache/tests/issue0115.phpt
+++ b/ext/opcache/tests/issue0115.phpt
@@ -6,7 +6,7 @@ opcache.enable_cli=1
 phar.readonly=0
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/issue0149.phpt b/ext/opcache/tests/issue0149.phpt
index ba57623fceefd..fc0c946575dca 100644
--- a/ext/opcache/tests/issue0149.phpt
+++ b/ext/opcache/tests/issue0149.phpt
@@ -6,7 +6,7 @@ opcache.enable_cli=1
 phar.readonly=0
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/jmp_elim_001.phpt b/ext/opcache/tests/jmp_elim_001.phpt
index 64a9af266fb5e..232cd377aabe8 100644
--- a/ext/opcache/tests/jmp_elim_001.phpt
+++ b/ext/opcache/tests/jmp_elim_001.phpt
@@ -2,7 +2,7 @@
 Edge-cases in constant conditional jump elimination
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip for machines with 64-bit longs"); ?>
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 9bcb3d890ed93..97092f61cb340 100644
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -2,7 +2,7 @@
 OpenSSL private key functions
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 if (!@openssl_pkey_new()) die("skip cannot create private key"); 
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug25614.phpt b/ext/openssl/tests/bug25614.phpt
index a43130708b120..712c6b38ada92 100644
--- a/ext/openssl/tests/bug25614.phpt
+++ b/ext/openssl/tests/bug25614.phpt
@@ -2,7 +2,7 @@
 openssl: get public key from generated private key
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 if (!@openssl_pkey_new()) die("skip cannot create private key"); 
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
index 2bedeb2d67156..dfc78e2093c2f 100644
--- a/ext/openssl/tests/bug28382.phpt
+++ b/ext/openssl/tests/bug28382.phpt
@@ -2,7 +2,7 @@
 Bug #28382 (openssl_x509_parse extensions support)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 if (OPENSSL_VERSION_NUMBER<0x009070af) die("skip");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt
index 83aa302100a75..ad3d16a3cc2b3 100644
--- a/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@ -2,7 +2,7 @@
 Bug #36732 (add support for req_extensions in openss_csr_new and sign)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt
index b7df0dcd8f213..6ca88466ff1c6 100644
--- a/ext/openssl/tests/bug37820.phpt
+++ b/ext/openssl/tests/bug37820.phpt
@@ -2,7 +2,7 @@
 openssl_sign/verify: accept different algos 
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (OPENSSL_VERSION_NUMBER < 0x009070af) die("skip");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt
index 487260553933d..8305f055fc31b 100644
--- a/ext/openssl/tests/bug38255.phpt
+++ b/ext/openssl/tests/bug38255.phpt
@@ -1,12 +1,12 @@
 --TEST--
-openssl key from zval leaks 
+openssl key from zval leaks
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
+<?php
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
-$pub_key_id = false; 
+$pub_key_id = false;
 $signature = '';
 $ok = openssl_verify("foo", $signature, $pub_key_id, OPENSSL_ALGO_MD5);
 
diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt
index 66de8b876ca8d..694e023f807c7 100644
--- a/ext/openssl/tests/bug38261.phpt
+++ b/ext/openssl/tests/bug38261.phpt
@@ -2,7 +2,7 @@
 openssl key from zval leaks 
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug39217.phpt b/ext/openssl/tests/bug39217.phpt
index 8bafedbab41cf..bb276dda9a270 100644
--- a/ext/openssl/tests/bug39217.phpt
+++ b/ext/openssl/tests/bug39217.phpt
@@ -2,7 +2,7 @@
 Bug #39217 (Large serial number return -1)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php 
diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt
index 2f5ca2007ec4e..24bb037ad98e9 100644
--- a/ext/openssl/tests/bug41353.phpt
+++ b/ext/openssl/tests/bug41353.phpt
@@ -2,7 +2,7 @@
 Bug #41353 (openssl_pkcs12_read() does not verify the type of the first arg)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug47828.phpt b/ext/openssl/tests/bug47828.phpt
index 6f7ee395f4e30..95ffc4b254331 100644
--- a/ext/openssl/tests/bug47828.phpt
+++ b/ext/openssl/tests/bug47828.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47828 (segfaults when a UTF-8 conversion fails openssl_x509_parse())
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) die("skip"); ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $csr = "-----BEGIN CERTIFICATE-----
diff --git a/ext/openssl/tests/bug54060.phpt b/ext/openssl/tests/bug54060.phpt
index 88f1f944df9cc..82f0a153049c4 100644
--- a/ext/openssl/tests/bug54060.phpt
+++ b/ext/openssl/tests/bug54060.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54060 (Memory leak in openssl_encrypt)
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) die("skip"); ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/bug54061.phpt b/ext/openssl/tests/bug54061.phpt
index f1d2e24a28975..d401ee396b3f0 100644
--- a/ext/openssl/tests/bug54061.phpt
+++ b/ext/openssl/tests/bug54061.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54061 (Memory leak in openssl_decrypt)
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) die("skip"); ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "jfdslkjvflsdkjvlkfjvlkjfvlkdm,4w 043920r 9234r 32904r 09243
diff --git a/ext/openssl/tests/bug55259.phpt b/ext/openssl/tests/bug55259.phpt
index b58d28ad73eaf..c23122c0bbb5a 100644
--- a/ext/openssl/tests/bug55259.phpt
+++ b/ext/openssl/tests/bug55259.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #55259 (openssl extension does not get the DH parameters from DH key resource)
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) die("skip"); ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt
index 4b6194bdb4dbd..212dc0697dff1 100644
--- a/ext/openssl/tests/bug61124.phpt
+++ b/ext/openssl/tests/bug61124.phpt
@@ -2,7 +2,7 @@
 Bug #61124: Segmentation fault with openssl_decrypt
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 --FILE--
 <?php
 var_dump(openssl_decrypt('kzo w2RMExUTYQXW2Xzxmg==', 'aes-128-cbc', 'pass', false, 'pass'));
diff --git a/ext/openssl/tests/bug61930.phpt b/ext/openssl/tests/bug61930.phpt
index 55dc42fded051..f38ae4269694a 100644
--- a/ext/openssl/tests/bug61930.phpt
+++ b/ext/openssl/tests/bug61930.phpt
@@ -2,7 +2,7 @@
 Bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug64802.phpt b/ext/openssl/tests/bug64802.phpt
index d1065f66a7ecd..7090da1af8d08 100644
--- a/ext/openssl/tests/bug64802.phpt
+++ b/ext/openssl/tests/bug64802.phpt
@@ -2,7 +2,7 @@
 Bug #64802: openssl_x509_parse fails to parse subject properly in some cases
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug65698.phpt b/ext/openssl/tests/bug65698.phpt
index 5b693421fe55e..d801a11143977 100644
--- a/ext/openssl/tests/bug65698.phpt
+++ b/ext/openssl/tests/bug65698.phpt
@@ -2,7 +2,7 @@
 Bug #65689 (GeneralizedTime format parsing)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt
index daf7cb6aa0f1a..fe17479ee1030 100644
--- a/ext/openssl/tests/bug66501.phpt
+++ b/ext/openssl/tests/bug66501.phpt
@@ -2,7 +2,7 @@
 Bug #66501: EC private key support in openssl_sign
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available");
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug67403.phpt b/ext/openssl/tests/bug67403.phpt
index 19701af381153..572e6a482f62f 100644
--- a/ext/openssl/tests/bug67403.phpt
+++ b/ext/openssl/tests/bug67403.phpt
@@ -2,7 +2,7 @@
 Bug #67403: Add signatureType to openssl_x509_parse
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 --FILE--
 <?php
 $r = openssl_x509_parse(file_get_contents(__DIR__.'/bug64802.pem'));
diff --git a/ext/openssl/tests/bug68912.phpt b/ext/openssl/tests/bug68912.phpt
index c18291a6ec6fd..b05b930b9e8b7 100644
--- a/ext/openssl/tests/bug68912.phpt
+++ b/ext/openssl/tests/bug68912.phpt
@@ -2,7 +2,7 @@
 Bug #68912 (Segmentation fault at openssl_spki_new)
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!extension_loaded("xml")) die("skip xml extension not loaded");
 if (!@openssl_pkey_new()) die("skip cannot create private key");
 ?>
diff --git a/ext/openssl/tests/bug72165.phpt b/ext/openssl/tests/bug72165.phpt
index 93b3c3d4a8841..660c763040dc5 100644
--- a/ext/openssl/tests/bug72165.phpt
+++ b/ext/openssl/tests/bug72165.phpt
@@ -2,7 +2,7 @@
 Bug #72165 Null pointer dereference - openssl_csr_new
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug72336.phpt b/ext/openssl/tests/bug72336.phpt
index 893b51838dc38..95cbd37e10d6d 100644
--- a/ext/openssl/tests/bug72336.phpt
+++ b/ext/openssl/tests/bug72336.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72336 (openssl_pkey_new does not fail for invalid DSA params)
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $p = '00f8000ae45b2dacb47dd977d58b719d097bdf07cb2c17660ad898518c08' .
diff --git a/ext/openssl/tests/bug74022.phpt b/ext/openssl/tests/bug74022.phpt
index e3ec128fdfdf3..f13938cad79f7 100644
--- a/ext/openssl/tests/bug74022.phpt
+++ b/ext/openssl/tests/bug74022.phpt
@@ -2,7 +2,7 @@
 Bug #74022 PHP Fast CGI crashes when reading from a pfx file with valid password
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74022_2.phpt b/ext/openssl/tests/bug74022_2.phpt
index 356e22549f293..d7798bbe226ae 100644
--- a/ext/openssl/tests/bug74022_2.phpt
+++ b/ext/openssl/tests/bug74022_2.phpt
@@ -2,7 +2,7 @@
 Bug #74022 PHP Fast CGI crashes when reading from a pfx file with valid password, multiple extra certs
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74099.phpt b/ext/openssl/tests/bug74099.phpt
index 6d111052ce951..32f1ab0116a78 100644
--- a/ext/openssl/tests/bug74099.phpt
+++ b/ext/openssl/tests/bug74099.phpt
@@ -2,7 +2,7 @@
 Bug #74099 Memory leak with openssl_encrypt()
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74341.phpt b/ext/openssl/tests/bug74341.phpt
index 6682b72bd1a76..75dd00d99ce4c 100644
--- a/ext/openssl/tests/bug74341.phpt
+++ b/ext/openssl/tests/bug74341.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without seconds)
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/bug74720_0.phpt b/ext/openssl/tests/bug74720_0.phpt
index b6b4b35d62a45..43bb178b21234 100644
--- a/ext/openssl/tests/bug74720_0.phpt
+++ b/ext/openssl/tests/bug74720_0.phpt
@@ -2,7 +2,7 @@
 Bug #74720 pkcs7_en/decrypt does not work if \x1a is used in content, variant 0
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74720_1.phpt b/ext/openssl/tests/bug74720_1.phpt
index d85f9ba83a1b7..12960c4cb1500 100644
--- a/ext/openssl/tests/bug74720_1.phpt
+++ b/ext/openssl/tests/bug74720_1.phpt
@@ -2,7 +2,7 @@
 Bug #74720 pkcs7_en/decrypt does not work if \x1a is used in content, variant 1
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74798.phpt b/ext/openssl/tests/bug74798.phpt
index ad74b51fb4dd0..77d801f8973e5 100644
--- a/ext/openssl/tests/bug74798.phpt
+++ b/ext/openssl/tests/bug74798.phpt
@@ -2,7 +2,7 @@
 Bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt
index 2dc06cc0d65b9..e14d26df7e5a0 100644
--- a/ext/openssl/tests/bug74903.phpt
+++ b/ext/openssl/tests/bug74903.phpt
@@ -2,7 +2,7 @@
 Bug #74903 openssl_pkcs7_encrypt() uses different EOL than before
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/cve-2013-6420.phpt b/ext/openssl/tests/cve-2013-6420.phpt
index ccead0aab6745..8faa023bff985 100644
--- a/ext/openssl/tests/cve-2013-6420.phpt
+++ b/ext/openssl/tests/cve-2013-6420.phpt
@@ -2,7 +2,7 @@
 CVE-2013-6420
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip"); 
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/cve2013_4073.phpt b/ext/openssl/tests/cve2013_4073.phpt
index a626e21f9571c..effb86dd4bb69 100644
--- a/ext/openssl/tests/cve2013_4073.phpt
+++ b/ext/openssl/tests/cve2013_4073.phpt
@@ -2,7 +2,7 @@
 CVE 2013-4073: Null-byte certificate handling
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 --FILE--
 <?php
 $cert = file_get_contents(__DIR__ . '/cve2013_4073.pem');
diff --git a/ext/openssl/tests/openssl_csr_export_bacis.phpt b/ext/openssl/tests/openssl_csr_export_bacis.phpt
index d3f8842e7170c..ab47a955d3bb2 100644
--- a/ext/openssl/tests/openssl_csr_export_bacis.phpt
+++ b/ext/openssl/tests/openssl_csr_export_bacis.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_csr_export() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $wrong = "wrong";
diff --git a/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt b/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt
index 1576302ae3f91..5a5adcab4f68b 100644
--- a/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_csr_export_to_file() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $csrfile = dirname(__FILE__) . "/openssl_csr_export_to_file_csr.tmp";
diff --git a/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt b/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt
index e8a9b7a0ce2cb..ee0d0bfd11583 100644
--- a/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt
@@ -2,7 +2,7 @@
 openssl_csr_get_public_key() tests
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
index bfc2d3ce8d0ab..a57e8c6ecbe7e 100644
--- a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
@@ -2,7 +2,7 @@
 openssl_csr_get_subject() tests
 --SKIPIF--
 <?php 
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt
index 24db4a4afc7d0..c5d537bdc68cd 100644
--- a/ext/openssl/tests/openssl_csr_new_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_new_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_csr_new() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt
index a9961c2357c69..ddc8a95bca49c 100644
--- a/ext/openssl/tests/openssl_csr_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_csr_sign() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $cert = "file://" . dirname(__FILE__) . "/cert.crt";
diff --git a/ext/openssl/tests/openssl_decrypt_basic.phpt b/ext/openssl/tests/openssl_decrypt_basic.phpt
index 37d17150fb25e..8f5508c986e8a 100644
--- a/ext/openssl/tests/openssl_decrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_decrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_decrypt() tests dependent on openssl_encrypt
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "openssl_encrypt() and openssl_decrypt() tests";
diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt
index b34397a65128c..a152f8f60f114 100644
--- a/ext/openssl/tests/openssl_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_decrypt_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_decrypt() error tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "openssl_decrypt() tests";
diff --git a/ext/openssl/tests/openssl_digest_basic.phpt b/ext/openssl/tests/openssl_digest_basic.phpt
index a924c06877d7e..cbe071962d6d1 100644
--- a/ext/openssl/tests/openssl_digest_basic.phpt
+++ b/ext/openssl/tests/openssl_digest_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_digest() basic test
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "openssl_digest() basic test";
diff --git a/ext/openssl/tests/openssl_encrypt_crash.phpt b/ext/openssl/tests/openssl_encrypt_crash.phpt
index b88782b0b2d1f..4151c23598d31 100644
--- a/ext/openssl/tests/openssl_encrypt_crash.phpt
+++ b/ext/openssl/tests/openssl_encrypt_crash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_encrypt() crash with old OpenSSL
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 openssl_encrypt('', 'AES-128-CBC', 'foo');
diff --git a/ext/openssl/tests/openssl_encrypt_error.phpt b/ext/openssl/tests/openssl_encrypt_error.phpt
index ea39bff604cf2..8b5975eaeec6d 100644
--- a/ext/openssl/tests/openssl_encrypt_error.phpt
+++ b/ext/openssl/tests/openssl_encrypt_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_encrypt() error tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "openssl_encrypt() tests";
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt
index 9293a704d207e..e4c46abfbed81 100644
--- a/ext/openssl/tests/openssl_error_string_basic.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_error_string() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 // helper function to check openssl errors
diff --git a/ext/openssl/tests/openssl_get_cert_locations_basic.phpt b/ext/openssl/tests/openssl_get_cert_locations_basic.phpt
index b3992d0a69620..b02c11440d819 100644
--- a/ext/openssl/tests/openssl_get_cert_locations_basic.phpt
+++ b/ext/openssl/tests/openssl_get_cert_locations_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_get_cert_locations() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 // openssl locations differ per distro.
diff --git a/ext/openssl/tests/openssl_get_cipher_methods.phpt b/ext/openssl/tests/openssl_get_cipher_methods.phpt
index cae223f4c47f6..9586264c95d6a 100644
--- a/ext/openssl/tests/openssl_get_cipher_methods.phpt
+++ b/ext/openssl/tests/openssl_get_cipher_methods.phpt
@@ -4,7 +4,7 @@ openssl_get_cipher_methods basic test
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) print "skip";
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_get_md_methods.phpt b/ext/openssl/tests/openssl_get_md_methods.phpt
index b35e55d69f52e..7837af02d6f80 100644
--- a/ext/openssl/tests/openssl_get_md_methods.phpt
+++ b/ext/openssl/tests/openssl_get_md_methods.phpt
@@ -4,7 +4,7 @@ openssl_get_md_methods basic test
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) print "skip";
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_open_basic.phpt b/ext/openssl/tests/openssl_open_basic.phpt
index 55bb9eb0e35c9..10461778cb94e 100644
--- a/ext/openssl/tests/openssl_open_basic.phpt
+++ b/ext/openssl/tests/openssl_open_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_open() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "openssl_open() test";
diff --git a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt
index 65692cfe92a70..9f7b22db27668 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs12_export() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $cert_file = dirname(__FILE__) . "/public.crt";
diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
index a360591b12b8a..c588c772136c5 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs12_export_to_file() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $pkcsfile = dirname(__FILE__) . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
diff --git a/ext/openssl/tests/openssl_pkcs12_read_basic.phpt b/ext/openssl/tests/openssl_pkcs12_read_basic.phpt
index 24d038970dd6b..df414c1fa9907 100644
--- a/ext/openssl/tests/openssl_pkcs12_read_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_read_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs12_read() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $p12_file = dirname(__FILE__) . "/p12_with_extra_certs.p12";
diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt
index cf6c0df8ac4f2..6b0b812e5a5f9 100644
--- a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_decrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $infile = dirname(__FILE__) . "/cert.crt";
diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
index b51205bb539c6..b88195a3758a4 100644
--- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_decrypt() and invalid parameters
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt b/ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt
index 210e5de934c7e..5843b28a08c7a 100644
--- a/ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_encrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_encrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $infile = dirname(__FILE__) . "/cert.crt";
diff --git a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
index 052779dc0a7e5..df90a34e5cd55 100644
--- a/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_read_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_read() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $infile = file_get_contents(dirname(__FILE__) . "/cert.p7b");
diff --git a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt
index d6ce799848d25..ff2d609ad03f5 100644
--- a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_sign() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $infile = dirname(__FILE__) . "/cert.crt";
diff --git a/ext/openssl/tests/openssl_pkcs7_verify_basic.phpt b/ext/openssl/tests/openssl_pkcs7_verify_basic.phpt
index bd3169ac130b4..80fdf8e51b5b7 100644
--- a/ext/openssl/tests/openssl_pkcs7_verify_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_verify_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkcs7_verify() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $outfile = tempnam(sys_get_temp_dir(), "ssl");
diff --git a/ext/openssl/tests/openssl_pkey_get_details_basic.phpt b/ext/openssl/tests/openssl_pkey_get_details_basic.phpt
index 3c239af2a2b5b..9d1efdba4ff29 100644
--- a/ext/openssl/tests/openssl_pkey_get_details_basic.phpt
+++ b/ext/openssl/tests/openssl_pkey_get_details_basic.phpt
@@ -2,7 +2,7 @@
 openssl_pkey_get_details() with EC key
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!defined("OPENSSL_KEYTYPE_EC")) die("skip no EC available");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_pkey_new_basic.phpt b/ext/openssl/tests/openssl_pkey_new_basic.phpt
index b73b1f580cfb2..3e2351bba2a0a 100644
--- a/ext/openssl/tests/openssl_pkey_new_basic.phpt
+++ b/ext/openssl/tests/openssl_pkey_new_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkey_new() basic usage tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 function openssl_pkey_test_cmp($expected, $bin_key) {
diff --git a/ext/openssl/tests/openssl_pkey_new_error.phpt b/ext/openssl/tests/openssl_pkey_new_error.phpt
index 0316c5d7a1a75..1354754709ca0 100644
--- a/ext/openssl/tests/openssl_pkey_new_error.phpt
+++ b/ext/openssl/tests/openssl_pkey_new_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_pkey_new() error tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 /* openssl_pkey_get_details() segfaults when getting the information
diff --git a/ext/openssl/tests/openssl_private_decrypt_basic.phpt b/ext/openssl/tests/openssl_private_decrypt_basic.phpt
index 76a08b8d553a0..f7b32f70cde70 100644
--- a/ext/openssl/tests/openssl_private_decrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_private_decrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_private_decrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_public_decrypt()";
diff --git a/ext/openssl/tests/openssl_private_encrypt_basic.phpt b/ext/openssl/tests/openssl_private_encrypt_basic.phpt
index a2a51521587df..e720e003a6164 100644
--- a/ext/openssl/tests/openssl_private_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_private_encrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_private_encrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_private_encrypt()";
diff --git a/ext/openssl/tests/openssl_public_decrypt_basic.phpt b/ext/openssl/tests/openssl_public_decrypt_basic.phpt
index 42d72b9cd4232..55b894361b5a4 100644
--- a/ext/openssl/tests/openssl_public_decrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_public_decrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_public_decrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_public_decrypt()";
diff --git a/ext/openssl/tests/openssl_public_encrypt_basic.phpt b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
index a3c4c57539683..9fc44ccd2aa95 100644
--- a/ext/openssl/tests/openssl_public_encrypt_basic.phpt
+++ b/ext/openssl/tests/openssl_public_encrypt_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_public_encrypt() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_public_encrypt()";
diff --git a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
index ac5a3079a10d6..22c2158b76dc4 100644
--- a/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
+++ b/ext/openssl/tests/openssl_random_pseudo_bytes_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_random_pseudo_bytes() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 for ($i = 0; $i < 10; $i++) {
diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt
index 4f1958a365b07..055e311a3cf4e 100644
--- a/ext/openssl/tests/openssl_seal_basic.phpt
+++ b/ext/openssl/tests/openssl_seal_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_seal() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 // simple tests
diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt
index 3d41ee1d3488e..34e32898a7d58 100644
--- a/ext/openssl/tests/openssl_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_sign_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_sign() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_sign()";
diff --git a/ext/openssl/tests/openssl_spki_export_basic.phpt b/ext/openssl/tests/openssl_spki_export_basic.phpt
index 1e3bd1fd399c7..af3bcd03f1c87 100644
--- a/ext/openssl/tests/openssl_spki_export_basic.phpt
+++ b/ext/openssl/tests/openssl_spki_export_basic.phpt
@@ -2,7 +2,7 @@
 openssl_spki_export() tests for exporting public key
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!@openssl_pkey_new()) die("skip cannot create private key");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt b/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
index 07a69d3b454ee..8bd6eea828021 100644
--- a/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
+++ b/ext/openssl/tests/openssl_spki_export_challenge_basic.phpt
@@ -4,7 +4,7 @@ openssl_spki_export_challenge() tests for exporting challenge
 error_reporting=0
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 if (!@openssl_pkey_new()) die("skip cannot create private key");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_spki_new_basic.phpt b/ext/openssl/tests/openssl_spki_new_basic.phpt
index b31d6f9184754..72e631ec28660 100644
--- a/ext/openssl/tests/openssl_spki_new_basic.phpt
+++ b/ext/openssl/tests/openssl_spki_new_basic.phpt
@@ -2,7 +2,7 @@
 openssl_spki_new() test for creating SPKI string
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_spki_verify_basic.phpt b/ext/openssl/tests/openssl_spki_verify_basic.phpt
index 7b56a37e13f7d..9972665c6bef3 100644
--- a/ext/openssl/tests/openssl_spki_verify_basic.phpt
+++ b/ext/openssl/tests/openssl_spki_verify_basic.phpt
@@ -4,7 +4,7 @@ openssl_spki_verify() tests for valid signature
 error_reporting=0
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_verify_basic.phpt b/ext/openssl/tests/openssl_verify_basic.phpt
index a21dfedb016e2..047956e315eb1 100644
--- a/ext/openssl/tests/openssl_verify_basic.phpt
+++ b/ext/openssl/tests/openssl_verify_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_verify() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $data = "Testing openssl_verify()";
diff --git a/ext/openssl/tests/openssl_x509_check_private_key_basic.phpt b/ext/openssl/tests/openssl_x509_check_private_key_basic.phpt
index ca6eac948d8e4..7180a145af822 100644
--- a/ext/openssl/tests/openssl_x509_check_private_key_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_check_private_key_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_check_private_key() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $fp = fopen(dirname(__FILE__) . "/cert.crt","r");
diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
index 677f4d8905545..e41cb22fc1aba 100644
--- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
@@ -3,7 +3,7 @@ int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose [, array $cainfo
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; 
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_x509_export_basic.phpt b/ext/openssl/tests/openssl_x509_export_basic.phpt
index 4177bd7798fa1..0632dfc89cd90 100644
--- a/ext/openssl/tests/openssl_x509_export_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_export_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_export() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $cert_file = dirname(__FILE__) . "/cert.crt";
diff --git a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt
index 68ba93230d7e1..701c0923ffb60 100644
--- a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_export_to_file() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $outfilename = dirname(__FILE__) . "/openssl_x509_export_to_file__outfilename.tmp";
diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
index add65cb3e302d..4d0c6ead9006d 100644
--- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt
@@ -2,7 +2,7 @@
 openssl_x509_fingerprint() tests
 --SKIPIF--
 <?php
-if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("openssl")) die("skip openssl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_x509_free_basic.phpt b/ext/openssl/tests/openssl_x509_free_basic.phpt
index 663adccc2c39e..171cd41cc4503 100644
--- a/ext/openssl/tests/openssl_x509_free_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_free_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_free() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 var_dump($res = openssl_x509_read("file://" . dirname(__FILE__) . "/cert.crt"));
diff --git a/ext/openssl/tests/openssl_x509_parse_basic.phpt b/ext/openssl/tests/openssl_x509_parse_basic.phpt
index 65cc062e40374..8d027d29af513 100644
--- a/ext/openssl/tests/openssl_x509_parse_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_parse_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_parse() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; 
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); 
 if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt
index 5f530534ffd17..92a0b37ef9809 100644
--- a/ext/openssl/tests/openssl_x509_read_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_read_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_x509_read() tests
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; ?>
+<?php if (!extension_loaded("openssl")) die("skip openssl extension not loaded"); ?>
 --FILE--
 <?php
 $fp = fopen(dirname(__FILE__) . "/cert.crt","r");
diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index fb1006e4bd126..1ee74707134ce 100644
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -2,7 +2,7 @@
 Test pcntl wait functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 ?>
 --FILE--
diff --git a/ext/pcntl/tests/async_signals.phpt b/ext/pcntl/tests/async_signals.phpt
index 86b006295d63b..19c231ef5f16a 100644
--- a/ext/pcntl/tests/async_signals.phpt
+++ b/ext/pcntl/tests/async_signals.phpt
@@ -2,7 +2,7 @@
 Asynchronous signal handling through VM interrupts
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
diff --git a/ext/pcntl/tests/bug47566.phpt b/ext/pcntl/tests/bug47566.phpt
index 6eb3dbc134109..545920a00387f 100644
--- a/ext/pcntl/tests/bug47566.phpt
+++ b/ext/pcntl/tests/bug47566.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47566 (return value of pcntl_wexitstatus())
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 --FILE--
 <?php
 $pid = pcntl_fork();
diff --git a/ext/pcntl/tests/bug72154.phpt b/ext/pcntl/tests/bug72154.phpt
index 6bbbd4c5f0b54..cc47ef2ea8b6a 100644
--- a/ext/pcntl/tests/bug72154.phpt
+++ b/ext/pcntl/tests/bug72154.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite)
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 --FILE--
 <?php
 $b = 666;
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 9a2c96ea38a40..f63ed0023b787 100644
--- a/ext/pcntl/tests/pcntl_exec.phpt
+++ b/ext/pcntl/tests/pcntl_exec.phpt
@@ -2,7 +2,7 @@
 pcntl_exec()
 --SKIPIF--
 <?php 
-if (!extension_loaded("pcntl")) print "skip"; 
+if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
 ?>
 --FILE--
diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt
index 5383593d979bb..c33bfdeb60bf7 100644
--- a/ext/pcntl/tests/pcntl_exec_2.phpt
+++ b/ext/pcntl/tests/pcntl_exec_2.phpt
@@ -3,7 +3,7 @@ pcntl_exec() 2
 --SKIPIF--
 <?php
 
-if (!extension_loaded("pcntl")) print "skip"; 
+if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
 
 ?>
@@ -15,7 +15,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) {
 }
 echo "ok\n";
 pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array(
-	"PCNTL_EXEC_TEST_IS_CHILD" => "1", 
+	"PCNTL_EXEC_TEST_IS_CHILD" => "1",
 	"FOO" => "BAR",
 	1 => "long")
 );
diff --git a/ext/pcntl/tests/pcntl_exec_3.phpt b/ext/pcntl/tests/pcntl_exec_3.phpt
index 5349381d92b89..45d01e342e4a6 100644
--- a/ext/pcntl/tests/pcntl_exec_3.phpt
+++ b/ext/pcntl/tests/pcntl_exec_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_exec() 3
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(pcntl_exec());
diff --git a/ext/pcntl/tests/pcntl_get_last_error.phpt b/ext/pcntl/tests/pcntl_get_last_error.phpt
index 4ed66c9610e38..5ee129ff4086c 100644
--- a/ext/pcntl/tests/pcntl_get_last_error.phpt
+++ b/ext/pcntl/tests/pcntl_get_last_error.phpt
@@ -2,7 +2,7 @@
 Test pcntl_get_last_error()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/pcntl/tests/pcntl_signal.phpt b/ext/pcntl/tests/pcntl_signal.phpt
index a6441935c1101..a22cc6de6e2c2 100644
--- a/ext/pcntl/tests/pcntl_signal.phpt
+++ b/ext/pcntl/tests/pcntl_signal.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_signal()
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_signal_dispatch.phpt b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
index a7a26dbf65b82..4dd3fba89c3b5 100644
--- a/ext/pcntl/tests/pcntl_signal_dispatch.phpt
+++ b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
@@ -2,7 +2,7 @@
 pcnt_signal_dispatch()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("pcntl_signal_dispatch")) print "skip pcntl_signal_dispatch() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
diff --git a/ext/pcntl/tests/pcntl_signal_get_handler.phpt b/ext/pcntl/tests/pcntl_signal_get_handler.phpt
index ee699942a873c..7d3ff13a473ed 100644
--- a/ext/pcntl/tests/pcntl_signal_get_handler.phpt
+++ b/ext/pcntl/tests/pcntl_signal_get_handler.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_signal_get_handler()
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_wait.phpt b/ext/pcntl/tests/pcntl_wait.phpt
index d5ab709b764d1..a33edb5b85ed2 100644
--- a/ext/pcntl/tests/pcntl_wait.phpt
+++ b/ext/pcntl/tests/pcntl_wait.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_wait()
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_wait_rusage1.phpt b/ext/pcntl/tests/pcntl_wait_rusage1.phpt
index 6c9cd395400fa..fded068387ce6 100644
--- a/ext/pcntl/tests/pcntl_wait_rusage1.phpt
+++ b/ext/pcntl/tests/pcntl_wait_rusage1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_wait() and rusage
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
index 4ecc664bac2af..bba5811bc754f 100644
--- a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
+++ b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pcntl_waitpid() and rusage
 --SKIPIF--
-<?php if (!extension_loaded("pcntl")) print "skip"; ?>
+<?php if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); ?>
 <?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt
index 106b9282968cd..9dddfbd7c5d9d 100644
--- a/ext/pcntl/tests/signal_closure_handler.phpt
+++ b/ext/pcntl/tests/signal_closure_handler.phpt
@@ -2,7 +2,7 @@
 Closures as a signal handler
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if if(!extension_loaded("pcntl")) die("skip pcntl extension not loaded"); 
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
diff --git a/ext/pdo/tests/bug_34630.phpt b/ext/pdo/tests/bug_34630.phpt
index 070217bafed1e..763856666a260 100644
--- a/ext/pdo/tests/bug_34630.phpt
+++ b/ext/pdo/tests/bug_34630.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #34630 (inserting streams as LOBs)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_34687.phpt b/ext/pdo/tests/bug_34687.phpt
index dbb1471f09e10..8d5ea46b0b8b4 100644
--- a/ext/pdo/tests/bug_34687.phpt
+++ b/ext/pdo/tests/bug_34687.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #34687 (query doesn't return error information)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_35671.phpt b/ext/pdo/tests/bug_35671.phpt
index 8d1e11419a5d4..facb2b49c2128 100644
--- a/ext/pdo/tests/bug_35671.phpt
+++ b/ext/pdo/tests/bug_35671.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #35671 (binding by name breakage)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt
index 703b9d4de0871..fa10a9d98ca53 100644
--- a/ext/pdo/tests/bug_36428.phpt
+++ b/ext/pdo/tests/bug_36428.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #36428 (Incorrect error message for PDO::fetchAll())
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 if (!extension_loaded('simplexml')) die('skip SimpleXML not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
diff --git a/ext/pdo/tests/bug_38253.phpt b/ext/pdo/tests/bug_38253.phpt
index 78519a0805810..9e70f0bae761a 100644
--- a/ext/pdo/tests/bug_38253.phpt
+++ b/ext/pdo/tests/bug_38253.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #38253 (PDO produces segfault with default fetch mode)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt
index d0dea337d1178..df80404e95e3a 100644
--- a/ext/pdo/tests/bug_38394.phpt
+++ b/ext/pdo/tests/bug_38394.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #38394 (Prepared statement error stops subsequent statements)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite2', strlen('sqlite2'))) die('skip not relevant for pdo_sqlite2 driver');
diff --git a/ext/pdo/tests/bug_39398.phpt b/ext/pdo/tests/bug_39398.phpt
index 633771a951a49..4a9ae3040b15e 100644
--- a/ext/pdo/tests/bug_39398.phpt
+++ b/ext/pdo/tests/bug_39398.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #39398 (Booleans are not automatically translated to integers)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_39656.phpt b/ext/pdo/tests/bug_39656.phpt
index 9ee54916bb236..355175da906e0 100644
--- a/ext/pdo/tests/bug_39656.phpt
+++ b/ext/pdo/tests/bug_39656.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #39656 (Crash when calling fetch() on a PDO statement object after closeCursor())
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_40285.phpt b/ext/pdo/tests/bug_40285.phpt
index c0a5674389397..7d166ea29dcf0 100644
--- a/ext/pdo/tests/bug_40285.phpt
+++ b/ext/pdo/tests/bug_40285.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #40285 (The prepare parser goes into an infinite loop on ': or ":)
 --SKIPIF--
 <?php  
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_42917.phpt b/ext/pdo/tests/bug_42917.phpt
index d4b71f57da3ac..9ccc4c71400f3 100644
--- a/ext/pdo/tests/bug_42917.phpt
+++ b/ext/pdo/tests/bug_42917.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_43130.phpt b/ext/pdo/tests/bug_43130.phpt
index 15c77b41804a1..89cb4dd197cda 100644
--- a/ext/pdo/tests/bug_43130.phpt
+++ b/ext/pdo/tests/bug_43130.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #43130 (Bound parameters cannot have - in their name)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip not relevant for sqlite driver');
diff --git a/ext/pdo/tests/bug_43139.phpt b/ext/pdo/tests/bug_43139.phpt
index 87bfd4e5878ca..e77ba03ad6d6d 100644
--- a/ext/pdo/tests/bug_43139.phpt
+++ b/ext/pdo/tests/bug_43139.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #43139 (PDO ignore ATTR_DEFAULT_FETCH_MODE in some cases with fetchAll())
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_43663.phpt b/ext/pdo/tests/bug_43663.phpt
index f8e968f717203..a1ce50851c3d5 100644
--- a/ext/pdo/tests/bug_43663.phpt
+++ b/ext/pdo/tests/bug_43663.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #43663 (__call on classes derived from PDO)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 if (!extension_loaded('pdo_sqlite')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
diff --git a/ext/pdo/tests/bug_44173.phpt b/ext/pdo/tests/bug_44173.phpt
index f13abaa5d500a..da4df21a8bf32 100644
--- a/ext/pdo/tests/bug_44173.phpt
+++ b/ext/pdo/tests/bug_44173.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #44173 (PDO->query() parameter parsing/checking needs an update)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_44409.phpt b/ext/pdo/tests/bug_44409.phpt
index fe24fdfb862ff..26a011fd7e940 100644
--- a/ext/pdo/tests/bug_44409.phpt
+++ b/ext/pdo/tests/bug_44409.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #44409 (PDO::FETCH_SERIALIZE calls __construct())
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_44861.phpt b/ext/pdo/tests/bug_44861.phpt
index cb8e657e9bdd3..244af2fe20232 100644
--- a/ext/pdo/tests/bug_44861.phpt
+++ b/ext/pdo/tests/bug_44861.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #44861 (scrollable cursor don't work with pgsql)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 $allowed = array('oci', 'pgsql');
diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt
index 431073753fa54..4960cc3efac9c 100644
--- a/ext/pdo/tests/bug_50458.phpt
+++ b/ext/pdo/tests/bug_50458.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #50458 (PDO::FETCH_FUNC fails with Closures)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_52098.phpt b/ext/pdo/tests/bug_52098.phpt
index d30a8e462f75c..af89b16fb4926 100644
--- a/ext/pdo/tests/bug_52098.phpt
+++ b/ext/pdo/tests/bug_52098.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #52098 Own PDOStatement implementation ignore __call()
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_60665.phpt b/ext/pdo/tests/bug_60665.phpt
index bae3d603d7a73..33baea610a802 100644
--- a/ext/pdo/tests/bug_60665.phpt
+++ b/ext/pdo/tests/bug_60665.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #60665 (call to empty() on NULL result using PDO::FETCH_LAZY returns false)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_61292.phpt b/ext/pdo/tests/bug_61292.phpt
index 0a6885cf7c391..12cf6ca0464f9 100644
--- a/ext/pdo/tests/bug_61292.phpt
+++ b/ext/pdo/tests/bug_61292.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #61292 (Segfault while calling a method on an overloaded PDO object)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_64172.phpt b/ext/pdo/tests/bug_64172.phpt
index e8949fe597b6d..2e94ba8a82f37 100644
--- a/ext/pdo/tests/bug_64172.phpt
+++ b/ext/pdo/tests/bug_64172.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #64172 errorInfo is not properly cleaned up
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_65946.phpt b/ext/pdo/tests/bug_65946.phpt
index 447af58517a55..165d303db17eb 100644
--- a/ext/pdo/tests/bug_65946.phpt
+++ b/ext/pdo/tests/bug_65946.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #65946 (pdo_sql_parser.c permanently converts values bound to strings)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_69356.phpt b/ext/pdo/tests/bug_69356.phpt
index 6c9b14c8a467e..7599648cebc63 100644
--- a/ext/pdo/tests/bug_69356.phpt
+++ b/ext/pdo/tests/bug_69356.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #69356 (PDOStatement::debugDumpParams() truncates query)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_71447.phpt b/ext/pdo/tests/bug_71447.phpt
index 8b5c0732f17aa..9598c007f366c 100644
--- a/ext/pdo/tests/bug_71447.phpt
+++ b/ext/pdo/tests/bug_71447.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #71447 (Quotes inside comments not properly handled)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_72788.phpt b/ext/pdo/tests/bug_72788.phpt
index 80609a21ba29d..3087658dee2f5 100644
--- a/ext/pdo/tests/bug_72788.phpt
+++ b/ext/pdo/tests/bug_72788.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #72788 (Invalid memory access when using persistent PDO connection)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/bug_73234.phpt b/ext/pdo/tests/bug_73234.phpt
index 43b484e9b26e0..e76593929d490 100644
--- a/ext/pdo/tests/bug_73234.phpt
+++ b/ext/pdo/tests/bug_73234.phpt
@@ -2,7 +2,7 @@
 PDO Common: Bug #73234 (Emulated statements let value dictate parameter type)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/debug_emulated_prepares.phpt b/ext/pdo/tests/debug_emulated_prepares.phpt
index 13252382fed85..528e7fc0221a9 100644
--- a/ext/pdo/tests/debug_emulated_prepares.phpt
+++ b/ext/pdo/tests/debug_emulated_prepares.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement::debugDumpParams() with emulated prepares
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index 3b79a09a9d7a8..4c914434ec568 100644
--- a/ext/pdo/tests/pdo_001.phpt
+++ b/ext/pdo/tests/pdo_001.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_ASSOC
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
index 047fd59410d77..3742e2152c142 100644
--- a/ext/pdo/tests/pdo_002.phpt
+++ b/ext/pdo/tests/pdo_002.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_NUM
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
index ccd23c8ebe9b9..a47c85a933775 100644
--- a/ext/pdo/tests/pdo_003.phpt
+++ b/ext/pdo/tests/pdo_003.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_BOTH
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
index 933629eea0eac..0dabb28aded25 100644
--- a/ext/pdo/tests/pdo_004.phpt
+++ b/ext/pdo/tests/pdo_004.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_OBJ
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index c7c18a91a554e..96aa7c5a0cdd9 100644
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_CLASS
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
index fc833017250ee..64536bb55583d 100644
--- a/ext/pdo/tests/pdo_006.phpt
+++ b/ext/pdo/tests/pdo_006.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_GROUP
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
index 291e863208396..8b0d9feb757c5 100644
--- a/ext/pdo/tests/pdo_007.phpt
+++ b/ext/pdo/tests/pdo_007.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_UNIQUE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt
index 3e9e12e777f3f..8e4cc330d2720 100644
--- a/ext/pdo/tests/pdo_008.phpt
+++ b/ext/pdo/tests/pdo_008.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_UNIQUE conflict
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index 0e21177477d3e..a14d71cd767cd 100644
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_CLASSTYPE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 812b868eb0100..08e6c35701d7c 100644
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_CLASSTYPE and GROUP/UNIQUE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 4a240426e1876..84d7c513a2c41 100644
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_FUNC and statement overloading
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index 471c397c0aeab..705202889aa54 100644
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement::setFetchMode
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index 009c7e2d65cb5..5f35f3367c351 100644
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement iterator
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 46841512a9a0a..5d7d1fc6c322c 100644
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement SPL iterator
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index aea292b97f1cb..bf9a3cda830e2 100644
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_COLUMN
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index 12c95172338a8..147b8b730bade 100644
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_BOUND
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - cannot reexecute after closing cursors without reparse');
diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 72f4b4224f191..6cbf13bf92146 100644
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_BOUND w/o :
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index 2b8568fb46c54..6b03ee8c314ed 100644
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -2,7 +2,7 @@
 PDO Common: transactions
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index 55ddd82003b8f..000dc6bd9b0b7 100644
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -2,7 +2,7 @@
 PDO Common: serializing
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 if (!interface_exists('Serializable')) die('skip no Serializable interface');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index f6d75bbd1af01..8aa08c45c3db7 100644
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -2,7 +2,7 @@
 PDO Common: fetch() and while()
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index dc7e4d1a79e2b..38410af5d2c12 100644
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement::columnCount
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index fb25fc52bcc70..8e3ad3bde2cc0 100644
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement::execute with parameters
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt
index daec14f9edcff..64cfeb20badab 100644
--- a/ext/pdo/tests/pdo_022.phpt
+++ b/ext/pdo/tests/pdo_022.phpt
@@ -3,7 +3,7 @@ PDO Common: PDOStatement::getColumnMeta
 --SKIPIF--
 <?php # vim:ft=php
 die('skip this feature is not yet finalized, no test makes sense');
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index 564bcf8c516e1..af70f44fdf99f 100644
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -2,7 +2,7 @@
 PDO Common: extending PDO
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_024.phpt b/ext/pdo/tests/pdo_024.phpt
index 5f4baf243dfc5..4a51855ae0b5d 100644
--- a/ext/pdo/tests/pdo_024.phpt
+++ b/ext/pdo/tests/pdo_024.phpt
@@ -2,7 +2,7 @@
 PDO Common: assert that bindParam does not modify parameter
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index de6f0ad841f85..3e98b91c1c8cb 100644
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_INTO
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index d993f32445dad..aa4ff45860a7e 100644
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -2,7 +2,7 @@
 PDO Common: extending PDO (2)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_027.phpt b/ext/pdo/tests/pdo_027.phpt
index 1d9990d3fd0e5..5a44d2cc3ce1c 100644
--- a/ext/pdo/tests/pdo_027.phpt
+++ b/ext/pdo/tests/pdo_027.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_LAZY
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_028.phpt b/ext/pdo/tests/pdo_028.phpt
index 0d1058dc594d2..392cb526713ec 100644
--- a/ext/pdo/tests/pdo_028.phpt
+++ b/ext/pdo/tests/pdo_028.phpt
@@ -2,7 +2,7 @@
 PDO Common: bindValue
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt
index f3dc1f2fa4cc0..c309e0a0e18dd 100644
--- a/ext/pdo/tests/pdo_029.phpt
+++ b/ext/pdo/tests/pdo_029.phpt
@@ -2,7 +2,7 @@
 PDO Common: extending PDO (3)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt
index 243e94a1e7773..8bb6e85f30949 100644
--- a/ext/pdo/tests/pdo_030.phpt
+++ b/ext/pdo/tests/pdo_030.phpt
@@ -2,7 +2,7 @@
 PDO Common: extending PDO (4)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_031.phpt b/ext/pdo/tests/pdo_031.phpt
index 11894e9708048..3d9bcd34abf20 100644
--- a/ext/pdo/tests/pdo_031.phpt
+++ b/ext/pdo/tests/pdo_031.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDOStatement SPL iterator
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_032.phpt b/ext/pdo/tests/pdo_032.phpt
index aed6dd3976874..241a5c7c85ab5 100644
--- a/ext/pdo/tests/pdo_032.phpt
+++ b/ext/pdo/tests/pdo_032.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::ATTR_CASE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_033.phpt b/ext/pdo/tests/pdo_033.phpt
index 983ee0b2127db..d0cffd40406ff 100644
--- a/ext/pdo/tests/pdo_033.phpt
+++ b/ext/pdo/tests/pdo_033.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::quote()
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 if (!strncasecmp(getenv('PDOTEST_DSN'), 'odbc', strlen('odbc'))) die('skip odbc driver doesn\'t have escape API, use prepared statements');
diff --git a/ext/pdo/tests/pdo_034.phpt b/ext/pdo/tests/pdo_034.phpt
index 3803c2f4efa9b..386810304c723 100644
--- a/ext/pdo/tests/pdo_034.phpt
+++ b/ext/pdo/tests/pdo_034.phpt
@@ -2,7 +2,7 @@
 PDO Common: PDO::FETCH_KEY_PAIR fetch mode test
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pdo_036.phpt b/ext/pdo/tests/pdo_036.phpt
index 21c8241c99878..5bce5ce62c189 100644
--- a/ext/pdo/tests/pdo_036.phpt
+++ b/ext/pdo/tests/pdo_036.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing PDORow and PDOStatement instances with Reflection
 --SKIPIF--
-<?php if (!extension_loaded('pdo')) die('skip'); ?>
+<?php if (!extension_loaded('pdo')) die('skip pdo extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt
index fb4c5e1e83ded..7ca55533c912b 100644
--- a/ext/pdo/tests/pdo_037.phpt
+++ b/ext/pdo/tests/pdo_037.phpt
@@ -2,7 +2,7 @@
 Crash when calling a method of a class that inherits PDOStatement
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo/tests/pdo_drivers_basic.phpt b/ext/pdo/tests/pdo_drivers_basic.phpt
index c57c52e31ec22..434f665e79ba2 100644
--- a/ext/pdo/tests/pdo_drivers_basic.phpt
+++ b/ext/pdo/tests/pdo_drivers_basic.phpt
@@ -4,7 +4,7 @@ Test normal operation of PDO::getAvailableDrivers / pdo_drivers
 Amo Chohan <amo.chohan@gmail.com>
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 --FILE--
 <?php
 var_dump(is_array(PDO::getAvailableDrivers()));
diff --git a/ext/pdo/tests/pdo_drivers_error.phpt b/ext/pdo/tests/pdo_drivers_error.phpt
index 5a371f02bc811..a8ef1c49ad67c 100644
--- a/ext/pdo/tests/pdo_drivers_error.phpt
+++ b/ext/pdo/tests/pdo_drivers_error.phpt
@@ -4,7 +4,7 @@ Test that PDO::getAvailableDrivers / pdo_drivers does not accept any parameters
 Amo Chohan <amo.chohan@gmail.com>
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 --FILE--
 <?php
 PDO::getAvailableDrivers('fail');
diff --git a/ext/pdo/tests/pdorow.phpt b/ext/pdo/tests/pdorow.phpt
index 54850d386059d..00cfcaeffe285 100644
--- a/ext/pdo/tests/pdorow.phpt
+++ b/ext/pdo/tests/pdorow.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Trying instantiate a PDORow object manually
 --SKIPIF--
-<?php if (!extension_loaded('pdo')) die('skip'); ?>
+<?php if (!extension_loaded('pdo')) die('skip pdo extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo/tests/pecl_bug_5217.phpt b/ext/pdo/tests/pecl_bug_5217.phpt
index 7fe2bf4af7cdf..41c2edf9034ef 100644
--- a/ext/pdo/tests/pecl_bug_5217.phpt
+++ b/ext/pdo/tests/pecl_bug_5217.phpt
@@ -2,7 +2,7 @@
 PDO Common: PECL Bug #5217 (serialize/unserialize safety)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pecl_bug_5772.phpt b/ext/pdo/tests/pecl_bug_5772.phpt
index e38c8947e2024..bc515b45e181c 100644
--- a/ext/pdo/tests/pecl_bug_5772.phpt
+++ b/ext/pdo/tests/pecl_bug_5772.phpt
@@ -2,7 +2,7 @@
 PDO Common: PECL Bug #5772 (PDO::FETCH_FUNC breaks on mixed case func name)
 --SKIPIF--
 <?php # vim:ft=php:
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo/tests/pecl_bug_5809.phpt b/ext/pdo/tests/pecl_bug_5809.phpt
index bb412812e5ce5..789bca76b06ee 100644
--- a/ext/pdo/tests/pecl_bug_5809.phpt
+++ b/ext/pdo/tests/pecl_bug_5809.phpt
@@ -2,7 +2,7 @@
 PDO Common: PECL Bug #5809 (PDOStatement::execute(array()) changes param)
 --SKIPIF--
 <?php # vim:ft=php:
-if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo')) die('skip pdo extension not loaded');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
diff --git a/ext/pdo_firebird/tests/bug_47415.phpt b/ext/pdo_firebird/tests/bug_47415.phpt
index 12cd782f267e5..88d64e7f51192 100644
--- a/ext/pdo_firebird/tests/bug_47415.phpt
+++ b/ext/pdo_firebird/tests/bug_47415.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #47415 PDO_Firebird segfaults when passing lowercased column name to bindColumn()
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_48877.phpt b/ext/pdo_firebird/tests/bug_48877.phpt
index cbab84b3725ee..ea4722e678895 100644
--- a/ext/pdo_firebird/tests/bug_48877.phpt
+++ b/ext/pdo_firebird/tests/bug_48877.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PDO_Firebird: bug 48877 The "bindValue" and "bindParam" do not work for PDO Firebird if we use named parameters (:parameter).
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_53280.phpt b/ext/pdo_firebird/tests/bug_53280.phpt
index 3139867af1225..4c782395a97fe 100644
--- a/ext/pdo_firebird/tests/bug_53280.phpt
+++ b/ext/pdo_firebird/tests/bug_53280.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PDO_Firebird: bug 53280 segfaults if query column count is less than param count
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
index e046879c22a92..99defde85112c 100644
--- a/ext/pdo_firebird/tests/bug_62024.phpt
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #62024 Cannot insert second row with null using parametrized query (Firebird PDO)
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
index f7b53e57a342b..1a6cd9ae2e910 100644
--- a/ext/pdo_firebird/tests/bug_64037.phpt
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #64037 Firebird return wrong value for numeric field
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php
 
diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt
index cbe76e6865ee2..c9166a88ceaab 100644
--- a/ext/pdo_firebird/tests/connect.phpt
+++ b/ext/pdo_firebird/tests/connect.phpt
@@ -2,7 +2,7 @@
 PDO_Firebird: connect/disconnect
 --SKIPIF--
 <?php include("skipif.inc"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php /* $Id$ */
 
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index 9d2a0953ec52d..8eb526c274bba 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -2,7 +2,7 @@
 PDO_Firebird: DDL/transactions
 --SKIPIF--
 <?php include("skipif.inc"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php /* $Id$ */
 
diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt
index 3cec9e3aa8c19..afab77a4d9f36 100644
--- a/ext/pdo_firebird/tests/execute.phpt
+++ b/ext/pdo_firebird/tests/execute.phpt
@@ -2,7 +2,7 @@
 PDO_Firebird: prepare/execute/binding
 --SKIPIF--
 <?php include("skipif.inc"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --INI--
 ibase.timestampformat=%Y-%m-%d %H:%M:%S
 --FILE--
diff --git a/ext/pdo_firebird/tests/rowCount.phpt b/ext/pdo_firebird/tests/rowCount.phpt
index 1a009508e0006..bea2fa0c4ad74 100644
--- a/ext/pdo_firebird/tests/rowCount.phpt
+++ b/ext/pdo_firebird/tests/rowCount.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PDO_Firebird: rowCount
 --SKIPIF--
-<?php extension_loaded("pdo_firebird") or die("skip"); ?>
-<?php function_exists("ibase_query") or die("skip"); ?>
+<?php extension_loaded("pdo_firebird") or die("skip pdo_firebird extension not loaded"); ?>
+<?php function_exists("ibase_query") or die("skip ibase_query function not available"); ?>
 --FILE--
 <?php /* $Id$ */
 
diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt
index 1205e4e1aaf79..a256797a2d5ff 100644
--- a/ext/phar/tests/001.phpt
+++ b/ext/phar/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::apiVersion
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(Phar::apiVersion());
diff --git a/ext/phar/tests/002.phpt b/ext/phar/tests/002.phpt
index a7cf0cb2d2742..d331f60135438 100644
--- a/ext/phar/tests/002.phpt
+++ b/ext/phar/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar truncated manifest/improper params
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/003.phpt b/ext/phar/tests/003.phpt
index fcc95a848155e..fd8df685141b6 100644
--- a/ext/phar/tests/003.phpt
+++ b/ext/phar/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::canCompress
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 /* check this works and actually returns the boolean value */
diff --git a/ext/phar/tests/003a.phpt b/ext/phar/tests/003a.phpt
index 37e31072d499b..4bdf3da837c04 100644
--- a/ext/phar/tests/003a.phpt
+++ b/ext/phar/tests/003a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::canCompress, specific
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(Phar::canCompress(Phar::GZ) == extension_loaded("zlib"));
diff --git a/ext/phar/tests/004.phpt b/ext/phar/tests/004.phpt
index b8ebd4137db26..4eb85c1510902 100644
--- a/ext/phar/tests/004.phpt
+++ b/ext/phar/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar no __HALT_COMPILER();
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/005.phpt b/ext/phar/tests/005.phpt
index a6e3449016f9e..c6878dc2028eb 100644
--- a/ext/phar/tests/005.phpt
+++ b/ext/phar/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar truncated manifest (none)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/006.phpt b/ext/phar/tests/006.phpt
index b2e8b29ef951e..0011b189d3330 100644
--- a/ext/phar/tests/006.phpt
+++ b/ext/phar/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar truncated manifest (manifest length truncated)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/007.phpt b/ext/phar/tests/007.phpt
index a13c2a452afb3..ef4d78cbc1f7b 100644
--- a/ext/phar/tests/007.phpt
+++ b/ext/phar/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar manifest too big
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/008.phpt b/ext/phar/tests/008.phpt
index 664ffea5cb49b..8e2e3cae6bdb6 100644
--- a/ext/phar/tests/008.phpt
+++ b/ext/phar/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar truncated manifest (not enough for manifest length)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --FILE--
 <?php
 $file = "<?php
diff --git a/ext/phar/tests/009.phpt b/ext/phar/tests/009.phpt
index d2570fb88136b..dfe9f9c1a3a40 100644
--- a/ext/phar/tests/009.phpt
+++ b/ext/phar/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar too many manifest entries
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/010.phpt b/ext/phar/tests/010.phpt
index 3dce5f8f4c878..97c1c6ccfbb1e 100644
--- a/ext/phar/tests/010.phpt
+++ b/ext/phar/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar buffer overrun
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt
index 83bae148e00e9..eee4142c7355c 100644
--- a/ext/phar/tests/011.phpt
+++ b/ext/phar/tests/011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar filesize too small in manifest
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/012.phpt b/ext/phar/tests/012.phpt
index 3246eff468ac3..29d53605e0750 100644
--- a/ext/phar/tests/012.phpt
+++ b/ext/phar/tests/012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar valid file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt
index ae3ae72936423..883c1230f1b16 100644
--- a/ext/phar/tests/013.phpt
+++ b/ext/phar/tests/013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar filesize mismatch
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt
index d08e6550b688b..da82b5f66b218 100644
--- a/ext/phar/tests/014.phpt
+++ b/ext/phar/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar filesize mismatch
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/015.phpt b/ext/phar/tests/015.phpt
index b93b77e9fbc0c..9340ebdfa1d67 100644
--- a/ext/phar/tests/015.phpt
+++ b/ext/phar/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar valid file (gzipped)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/015b.phpt b/ext/phar/tests/015b.phpt
index 08ead2d9c006f..cbbefc8659b22 100644
--- a/ext/phar/tests/015b.phpt
+++ b/ext/phar/tests/015b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar valid file (bzip2)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt
index 302d06d3cb3d1..b1bd8cfd73adc 100644
--- a/ext/phar/tests/016.phpt
+++ b/ext/phar/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar invalid file (gzipped file length is too short)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt
index 8fe66826d6d37..fe3b1f2b5c2cc 100644
--- a/ext/phar/tests/016b.phpt
+++ b/ext/phar/tests/016b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::mapPhar invalid file (gzipped file length is too short)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index c04880604dfc7..23b5567c2817a 100644
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -2,7 +2,7 @@
 Phar: opendir test - no dir specified at all
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt
index fb7e0fee95e92..5827c6fd866cb 100644
--- a/ext/phar/tests/018.phpt
+++ b/ext/phar/tests/018.phpt
@@ -2,7 +2,7 @@
 Phar: opendir test, root directory
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/019.phpt b/ext/phar/tests/019.phpt
index 860edad236ebb..718470b5c0bb6 100644
--- a/ext/phar/tests/019.phpt
+++ b/ext/phar/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: opendir test, subdirectory
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt
index e594e7c791698..1a50f6a692292 100644
--- a/ext/phar/tests/019b.phpt
+++ b/ext/phar/tests/019b.phpt
@@ -2,7 +2,7 @@
 Phar: opendir test, recurse into
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt
index 9f899d718449d..7294cbb9acfb2 100644
--- a/ext/phar/tests/019c.phpt
+++ b/ext/phar/tests/019c.phpt
@@ -2,7 +2,7 @@
 Phar: opendir test, recurse into
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt
index 289fc39c959a4..531d166e14f88 100644
--- a/ext/phar/tests/020.phpt
+++ b/ext/phar/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: url stat
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt
index 3e3278b9f8b86..15410a77a85c6 100644
--- a/ext/phar/tests/021.phpt
+++ b/ext/phar/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: stream stat
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/022.phpt b/ext/phar/tests/022.phpt
index 20c24a021436f..65f5ee3f8b991 100644
--- a/ext/phar/tests/022.phpt
+++ b/ext/phar/tests/022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: stream stat
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt
index 808f91deaeff0..62f094a4c106f 100644
--- a/ext/phar/tests/023.phpt
+++ b/ext/phar/tests/023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar:// file_get_contents
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt
index ad30d2644d53c..9c5f1cc3ac135 100644
--- a/ext/phar/tests/024.phpt
+++ b/ext/phar/tests/024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar:// include
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt
index bbb5bc4e83cd5..23c23e8bd4306 100644
--- a/ext/phar/tests/025.phpt
+++ b/ext/phar/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar:// include (repeated names)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt
index 696fbcf415ad6..4d05a6f7ed522 100644
--- a/ext/phar/tests/026.phpt
+++ b/ext/phar/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar:// require from within
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 5cf6661200a61..575a285514068 100644
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -2,7 +2,7 @@
 Phar: phar:// opendir
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt
index 95aa7b08875d1..ac24e665323b3 100644
--- a/ext/phar/tests/028.phpt
+++ b/ext/phar/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::loadPhar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt
index 41fcec03e7fd6..c6c0d5e1cacdf 100644
--- a/ext/phar/tests/029.phpt
+++ b/ext/phar/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::loadPhar overloading alias names
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt
index 14df993e1b98a..f563ff700751f 100644
--- a/ext/phar/tests/030.phpt
+++ b/ext/phar/tests/030.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::loadPhar ignoring alias
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index d458f068f5513..b697edafe2ec7 100644
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: include and parser error
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index 4df6cc32b094f..090fbba340034 100644
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: require hash
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=1
 --FILE--
diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt
index d53c7f52fa879..fac76450c5bb2 100644
--- a/ext/phar/tests/033.phpt
+++ b/ext/phar/tests/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index e8725bdda635c..2df6712081b4d 100644
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/addfuncs.phpt b/ext/phar/tests/addfuncs.phpt
index 4312bff1a0803..0052596d31410 100644
--- a/ext/phar/tests/addfuncs.phpt
+++ b/ext/phar/tests/addfuncs.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: addFile/addFromString
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/alias_acrobatics.phpt b/ext/phar/tests/alias_acrobatics.phpt
index 1bb20a4b3a5dd..45db50ec66a40 100644
--- a/ext/phar/tests/alias_acrobatics.phpt
+++ b/ext/phar/tests/alias_acrobatics.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: alias edge cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index e8ddb1f62a894..9d9b431889e42 100644
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bad parameters to various methods
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt
index e742b955d7cd8..758af51281b88 100644
--- a/ext/phar/tests/bug13727.phpt
+++ b/ext/phar/tests/bug13727.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: SLOW TEST bug #13727: "Number of files in the Phar" limited to 2042
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (getenv('SKIP_SLOW_TESTS')) die('skip'); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/bug13786.phpt b/ext/phar/tests/bug13786.phpt
index 572d1eb9aa708..a569f0e9eb410 100644
--- a/ext/phar/tests/bug13786.phpt
+++ b/ext/phar/tests/bug13786.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #13786: "PHP crashes on phar recreate after unlink"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt
index aa98eb2339c5c..c7d5319fbb748 100644
--- a/ext/phar/tests/bug45218_SLOWTEST.phpt
+++ b/ext/phar/tests/bug45218_SLOWTEST.phpt
@@ -2,7 +2,7 @@
 Phar::buildFromIterator() iterator, too many files for open file handles (Bug #45218)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 ?>
 --INI--
diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt
index 57f3fc2dafcd6..18b1d53c71beb 100644
--- a/ext/phar/tests/bug46032.phpt
+++ b/ext/phar/tests/bug46032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #46032: PharData::__construct wrong memory read
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (getenv('SKIP_SLOW_TESTS')) die('skip'); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt
index 1ca346ea1923d..10e36f063fccc 100644
--- a/ext/phar/tests/bug46060.phpt
+++ b/ext/phar/tests/bug46060.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Bug #46060: addEmptyDir() breaks
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (getenv('SKIP_SLOW_TESTS')) die('skip'); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/bug46178.phpt b/ext/phar/tests/bug46178.phpt
index 9dab621485602..8e4d45f010bd3 100644
--- a/ext/phar/tests/bug46178.phpt
+++ b/ext/phar/tests/bug46178.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #46178: "memory leak in ext/phar"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt
index 9aaaed0670f54..a0d19a805d0f3 100644
--- a/ext/phar/tests/bug47085.phpt
+++ b/ext/phar/tests/bug47085.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #47085: "rename() returns true even if the file in PHAR does not exist"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug48377.2.phpt b/ext/phar/tests/bug48377.2.phpt
index 380f3e381f91d..2a4e23a9b4a8a 100644
--- a/ext/phar/tests/bug48377.2.phpt
+++ b/ext/phar/tests/bug48377.2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #48377 "error message unclear on converting phar with existing file" test #2
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug48377.phpt b/ext/phar/tests/bug48377.phpt
index 6282a1565e3a3..e2bd9b53475cc 100644
--- a/ext/phar/tests/bug48377.phpt
+++ b/ext/phar/tests/bug48377.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #48377 "error message unclear on converting phar with existing file"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug52013.phpt b/ext/phar/tests/bug52013.phpt
index 5ee37e7d4e96f..450f08a35a03a 100644
--- a/ext/phar/tests/bug52013.phpt
+++ b/ext/phar/tests/bug52013.phpt
@@ -7,7 +7,7 @@ http://bugs.php.net/bug.php?id=52013
 Frederic Hardy frederic.hardy@mageekbox.net
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip test needs zlib extension enabled to compress archives with gzip");
 ?>
 --INI--
diff --git a/ext/phar/tests/bug53872.phpt b/ext/phar/tests/bug53872.phpt
index 2fc55d9155a95..c1d5d4c238e86 100644
--- a/ext/phar/tests/bug53872.phpt
+++ b/ext/phar/tests/bug53872.phpt
@@ -2,7 +2,7 @@
 bug#53872 (internal corruption of phar)
 --SKIPIF--
 <?php 
-if (!extension_loaded("phar")) die("skip"); 
+if (!extension_loaded("phar")) die("skip phar extension not loaded"); 
 if (!extension_loaded("zlib")) die("skip Test needs ext/zlib"); 
 ?>
 --INI--
diff --git a/ext/phar/tests/bug54289.phpt b/ext/phar/tests/bug54289.phpt
index 729c4e0e093bb..26f7e8781231d 100644
--- a/ext/phar/tests/bug54289.phpt
+++ b/ext/phar/tests/bug54289.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54289 Phar::extractTo() does not accept specific directories to be extracted
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly = 0
 --FILE--
diff --git a/ext/phar/tests/bug54395.phpt b/ext/phar/tests/bug54395.phpt
index a3d90a1b3e8c2..e90c721feaec4 100644
--- a/ext/phar/tests/bug54395.phpt
+++ b/ext/phar/tests/bug54395.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54395 (Phar::mount() crashes when calling with wrong parameters)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/bug60164.phpt b/ext/phar/tests/bug60164.phpt
index 8fd5de5146879..22d93eb03760c 100644
--- a/ext/phar/tests/bug60164.phpt
+++ b/ext/phar/tests/bug60164.phpt
@@ -2,7 +2,7 @@
 Phar: verify stub of specific length does not break __HALT_COMPILER(); scanning in php
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/bug60261.phpt b/ext/phar/tests/bug60261.phpt
index 31baa82394da8..5df95d8489a0a 100644
--- a/ext/phar/tests/bug60261.phpt
+++ b/ext/phar/tests/bug60261.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #60261 (phar dos null pointer)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt
index 74273b850b0e5..5c604c9f3522f 100644
--- a/ext/phar/tests/bug65028.phpt
+++ b/ext/phar/tests/bug65028.phpt
@@ -3,7 +3,7 @@ Phar - test specific manifest length
 --INI--
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/bug65414.phpt b/ext/phar/tests/bug65414.phpt
index 964ec72870190..fb7edbb7dff86 100644
--- a/ext/phar/tests/bug65414.phpt
+++ b/ext/phar/tests/bug65414.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65414 Injection (A1) in .phar files magic .phar directory
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly = 0
 --FILE--
diff --git a/ext/phar/tests/bug66960.phpt b/ext/phar/tests/bug66960.phpt
index 0d2ffa6df06b6..f8c3f3e2d0a0a 100644
--- a/ext/phar/tests/bug66960.phpt
+++ b/ext/phar/tests/bug66960.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66960 phar long filename crash
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly = 0
 memory_limit = -1
diff --git a/ext/phar/tests/bug69324.phpt b/ext/phar/tests/bug69324.phpt
index 70e3f972e7882..ae81dfab13788 100644
--- a/ext/phar/tests/bug69324.phpt
+++ b/ext/phar/tests/bug69324.phpt
@@ -2,7 +2,7 @@
 Bug #69324: Buffer Over-read in unserialize when parsing Phar
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt
index 3536c3a83583c..2b3501f892014 100644
--- a/ext/phar/tests/bug69441.phpt
+++ b/ext/phar/tests/bug69441.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #69441: Buffer Overflow when parsing tar/zip/phar in phar_set_inode
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/bug69441.phar';
diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt
index 6f280a5351988..be27fca81cdfb 100644
--- a/ext/phar/tests/bug69453.phpt
+++ b/ext/phar/tests/bug69453.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #69453: Memory Corruption in phar_parse_tarfile when entry filename starts with null
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/bug69453.tar.phar';
diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt
index 286d3cbdbe0ae..0a35af59697bc 100644
--- a/ext/phar/tests/bug69720.phpt
+++ b/ext/phar/tests/bug69720.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar - bug #69720 - Null pointer dereference in phar_get_fp_offset()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt
index 96f2198b144fb..4945e359f0198 100644
--- a/ext/phar/tests/bug69958.phpt
+++ b/ext/phar/tests/bug69958.phpt
@@ -3,7 +3,7 @@ Phar: bug #69958: Segfault in Phar::convertToData on invalid file
 --XFAIL--
 Still has memory leaks, see https://bugs.php.net/bug.php?id=70005
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $tarphar = new PharData(__DIR__.'/bug69958.tar');
diff --git a/ext/phar/tests/bug71331.phpt b/ext/phar/tests/bug71331.phpt
index 0026c406e89b8..13083d5560167 100644
--- a/ext/phar/tests/bug71331.phpt
+++ b/ext/phar/tests/bug71331.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71331 (Uninitialized pointer in phar_make_dirstream())
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $p = new PharData(__DIR__."/bug71331.tar");
diff --git a/ext/phar/tests/bug71354.phpt b/ext/phar/tests/bug71354.phpt
index 43230f152044d..8e455821afb30 100644
--- a/ext/phar/tests/bug71354.phpt
+++ b/ext/phar/tests/bug71354.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #71354: Heap corruption in tar/zip/phar parser.
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $p = new PharData(__DIR__."/bug71354.tar");
diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt
index b8d84f5375918..9d7f4d282bd7e 100644
--- a/ext/phar/tests/bug71391.phpt
+++ b/ext/phar/tests/bug71391.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 // duplicate since the tar will change
diff --git a/ext/phar/tests/bug71488.phpt b/ext/phar/tests/bug71488.phpt
index 22d2bf098fedf..392e72446ad6e 100644
--- a/ext/phar/tests/bug71488.phpt
+++ b/ext/phar/tests/bug71488.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #71488: Stack overflow when decompressing tar archives
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $p = new PharData(__DIR__."/bug71488.tar");
diff --git a/ext/phar/tests/bug71498.phpt b/ext/phar/tests/bug71498.phpt
index 4157ac20b6800..2bf33ffa04319 100644
--- a/ext/phar/tests/bug71498.phpt
+++ b/ext/phar/tests/bug71498.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #71498: Out-of-Bound Read in phar_parse_zipfile()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/bug72321.phpt b/ext/phar/tests/bug72321.phpt
index 6e63da42d93c7..29bb7bf40abc0 100644
--- a/ext/phar/tests/bug72321.phpt
+++ b/ext/phar/tests/bug72321.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #72321: invalid free in phar_extract_file()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/phar/tests/bug72928.phpt b/ext/phar/tests/bug72928.phpt
index 8e6a95418cfc6..d76bb75698a1d 100644
--- a/ext/phar/tests/bug72928.phpt
+++ b/ext/phar/tests/bug72928.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: #72928 (Out of bound when verify signature of zip phar in phar_parse_zipfile)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/phar/tests/bug73035.phpt b/ext/phar/tests/bug73035.phpt
index 5928428abc77d..083267ca598d1 100644
--- a/ext/phar/tests/bug73035.phpt
+++ b/ext/phar/tests/bug73035.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/phar/tests/bug73764.phpt b/ext/phar/tests/bug73764.phpt
index cab314a7317ce..ac09e9a285fa8 100644
--- a/ext/phar/tests/bug73764.phpt
+++ b/ext/phar/tests/bug73764.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #73764: Crash while loading hostile phar archive
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/phar/tests/bug73768.phpt b/ext/phar/tests/bug73768.phpt
index 37a4da0253acf..691d8fe52b55f 100644
--- a/ext/phar/tests/bug73768.phpt
+++ b/ext/phar/tests/bug73768.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #73768: Memory corruption when loading hostile phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/phar/tests/bug74196.phpt b/ext/phar/tests/bug74196.phpt
index 4cd238d654743..24235f1870927 100644
--- a/ext/phar/tests/bug74196.phpt
+++ b/ext/phar/tests/bug74196.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PHP bug #74196: PharData->decompress() does not correctly support dot names
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt
index abe50831fcaf6..8db7936f38b2d 100644
--- a/ext/phar/tests/bug74383.phpt
+++ b/ext/phar/tests/bug74383.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #74383: Wrong reflection on Phar::running
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $rc = new ReflectionClass(Phar::class);
diff --git a/ext/phar/tests/bug74386.phpt b/ext/phar/tests/bug74386.phpt
index 0e60e00009909..4099ee6be3e8c 100644
--- a/ext/phar/tests/bug74386.phpt
+++ b/ext/phar/tests/bug74386.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: bug #74386: Phar::__construct(): wrong number of parameters by reflection
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $r = new ReflectionMethod(Phar::class, '__construct');
diff --git a/ext/phar/tests/bug74991.phpt b/ext/phar/tests/bug74991.phpt
index 88d47be5ab97e..757213667e9b4 100644
--- a/ext/phar/tests/bug74991.phpt
+++ b/ext/phar/tests/bug74991.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PHP bug #74991: include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
index 90b0a8fe464b5..e2be74818caa0 100644
--- a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite1.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
index 660776af054b9..8cf675d81d8fc 100644
--- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite10.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write10.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
index eae6a8e26e81c..bb03eaaa9671b 100644
--- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite11.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write11.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
index 40b544191d1a5..d2d6cfec5ad2a 100644
--- a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite12.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write12.phar
 --EXPECTF--
diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
index bbb3ab5aa9727..4f6d32aab6aca 100644
--- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite13.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write13.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
index 9e10b31591b77..2ac181f3686a3 100644
--- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite14.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write14.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
index a74439ddebe8d..8932d89a3fe07 100644
--- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite15.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write15.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
index 5e8744e9f3d7b..6e3d23190ff90 100644
--- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite16.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write16.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
index 6e13088512e24..f48b8c2f18439 100644
--- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite17.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write17.phar
 --EXPECTF--
diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
index 751194b330a0d..3cfd184468c4f 100644
--- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite18.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write18.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
index 4870550c4d096..7d1a35fc9ff4f 100644
--- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite19.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write19.phar
 --EXPECTF--
diff --git a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
index 8d21c813a4ed8..8e78f33124acf 100644
--- a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite2.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write2.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
index aa0c9653ee66d..2545b2dbba8ac 100644
--- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite20.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write20.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
index 6b32520f2da5d..9a9b9d001f8fd 100644
--- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite21.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write21.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
index 141f9c9ad797d..7423c58e80a3d 100644
--- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite22.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write22.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
index c6025fd125f2d..7e2148e6fa631 100644
--- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite23.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write23.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
index 3bf0e11c3d1dd..77802aecfdd00 100644
--- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite24.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write24.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
index 13cae01e85a33..eb0f03de77540 100644
--- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite25.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib extension"); ?>
 --FILE_EXTERNAL--
 files/write25.phar
diff --git a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
index 7e2c94c5b2849..83fd1ceacb84c 100644
--- a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite3.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write3.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
index 20ff78e282499..c57a7b69475fb 100644
--- a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite4.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write4.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt
index 1945e31f16a80..b35f4a809224f 100644
--- a/ext/phar/tests/cache_list/copyonwrite4a.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite4.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.txt'));
diff --git a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
index 89990a7af1fb6..6129689bf6576 100644
--- a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite5.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write5.phar
 --CLEAN--
diff --git a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
index 6d6d56187e34b..1cb54cbf35af7 100644
--- a/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
@@ -6,7 +6,7 @@ phar.cache_list={PWD}/copyonwrite6.phar.php
 phar.readonly=0
 open_basedir=
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write6.phar
 --CLEAN--
diff --git a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
index d6faded9cc3bd..951e3e7336335 100644
--- a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite7.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write7.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
index 7217d336e2d65..bfe63ed3fdf75 100644
--- a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite8.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write8.phar
 --EXPECTF--
diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
index ee0eb349371f4..42dd2faf742af 100644
--- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/copyonwrite9.phar.php
 phar.readonly=0
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/write9.phar
 --EXPECT--
diff --git a/ext/phar/tests/cache_list/frontcontroller1.phpt b/ext/phar/tests/cache_list/frontcontroller1.phpt
index d0d5552f167d4..b4b603946f734 100644
--- a/ext/phar/tests/cache_list/frontcontroller1.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller1.phpt
@@ -3,7 +3,7 @@ Phar front controller other
 --INI--
 phar.cache_list={PWD}/frontcontroller1.php [cache_list]
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller1.php
 REQUEST_URI=/frontcontroller1.php/a.jpg
diff --git a/ext/phar/tests/cache_list/frontcontroller10.phpt b/ext/phar/tests/cache_list/frontcontroller10.phpt
index 00177d4ff5580..8256d0e69d826 100644
--- a/ext/phar/tests/cache_list/frontcontroller10.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller10.phpt
@@ -4,7 +4,7 @@ Phar front controller rewrite access denied [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller10.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller10.php
 REQUEST_URI=/frontcontroller10.php/hi
diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt
index f5e4e2269fb5a..eee72a8dc3b60 100644
--- a/ext/phar/tests/cache_list/frontcontroller11.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller11.phpt
@@ -4,7 +4,7 @@ Phar front controller mime type extension is not a string [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller11.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.php
diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt
index 6d798f9f8a249..8f7ad25d8ef4d 100644
--- a/ext/phar/tests/cache_list/frontcontroller12.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller12.phpt
@@ -4,7 +4,7 @@ Phar front controller mime type unknown int [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller12.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.php
 REQUEST_URI=/frontcontroller12.php/a.php
diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt
index c81d0cfbd97f3..dd25d6a240629 100644
--- a/ext/phar/tests/cache_list/frontcontroller13.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller13.phpt
@@ -4,7 +4,7 @@ Phar front controller mime type not string/int [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller13.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.php
 REQUEST_URI=/frontcontroller13.php/a.php
diff --git a/ext/phar/tests/cache_list/frontcontroller14.phpt b/ext/phar/tests/cache_list/frontcontroller14.phpt
index bbd9637d242f5..fa16227d931c7 100644
--- a/ext/phar/tests/cache_list/frontcontroller14.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller14.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, other [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller14.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.php
 REQUEST_URI=/frontcontroller14.php/a.jpg
diff --git a/ext/phar/tests/cache_list/frontcontroller15.phpt b/ext/phar/tests/cache_list/frontcontroller15.phpt
index d142a5d742861..d6a26d9fa545f 100644
--- a/ext/phar/tests/cache_list/frontcontroller15.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller15.phpt
@@ -4,7 +4,7 @@ Phar front controller mime type override, Phar::PHPS [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller15.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.php
 REQUEST_URI=/frontcontroller15.php/a.php
diff --git a/ext/phar/tests/cache_list/frontcontroller16.phpt b/ext/phar/tests/cache_list/frontcontroller16.phpt
index 10bebdccef14f..d0bc2d62a4454 100644
--- a/ext/phar/tests/cache_list/frontcontroller16.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller16.phpt
@@ -4,7 +4,7 @@ Phar front controller mime type override, Phar::PHP [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller16.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.php
 REQUEST_URI=/frontcontroller16.php/a.phps
diff --git a/ext/phar/tests/cache_list/frontcontroller17.phpt b/ext/phar/tests/cache_list/frontcontroller17.phpt
index 35d3ae4e9cf2c..69570d5806157 100644
--- a/ext/phar/tests/cache_list/frontcontroller17.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller17.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type unknown [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller17.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.php
 REQUEST_URI=/frontcontroller17.php/fronk.gronk
diff --git a/ext/phar/tests/cache_list/frontcontroller18.phpt b/ext/phar/tests/cache_list/frontcontroller18.phpt
index 77c0303d0c5ae..f10ea675794b5 100644
--- a/ext/phar/tests/cache_list/frontcontroller18.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller18.phpt
@@ -3,7 +3,7 @@ Phar front controller $_SERVER munging failure [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller18.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.php
 REQUEST_URI=/frontcontroller18.php/fronk.gronk
diff --git a/ext/phar/tests/cache_list/frontcontroller19.phpt b/ext/phar/tests/cache_list/frontcontroller19.phpt
index 548c6db479009..7fb26d9de1057 100644
--- a/ext/phar/tests/cache_list/frontcontroller19.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller19.phpt
@@ -3,7 +3,7 @@ Phar front controller $_SERVER munging failure 2 [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller19.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller19.php
 REQUEST_URI=/frontcontroller19.php/
diff --git a/ext/phar/tests/cache_list/frontcontroller2.phpt b/ext/phar/tests/cache_list/frontcontroller2.phpt
index 67ccfc1e047a4..5d4499c152009 100644
--- a/ext/phar/tests/cache_list/frontcontroller2.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller2.phpt
@@ -4,7 +4,7 @@ Phar front controller PHP test [cache_list]
 default_charset=UTF-8
 phar.cache_list=frontcontroller2.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.php
 REQUEST_URI=/frontcontroller2.php/a.php
diff --git a/ext/phar/tests/cache_list/frontcontroller20.phpt b/ext/phar/tests/cache_list/frontcontroller20.phpt
index 68591c962a3c2..454260f70e74d 100644
--- a/ext/phar/tests/cache_list/frontcontroller20.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller20.phpt
@@ -3,7 +3,7 @@ Phar front controller $_SERVER munging failure 3 [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller20.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller20.php
 REQUEST_URI=/frontcontroller20.php/
diff --git a/ext/phar/tests/cache_list/frontcontroller21.phpt b/ext/phar/tests/cache_list/frontcontroller21.phpt
index 9766b6e771483..5b9948f6e052e 100644
--- a/ext/phar/tests/cache_list/frontcontroller21.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller21.phpt
@@ -5,7 +5,7 @@ default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller21.php
 cgi.fix_pathinfo=1
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.php
 REQUEST_URI=/frontcontroller21.php/index.php?test=hi
diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt
index 82a8389ad5fe2..05a7a50a3810e 100644
--- a/ext/phar/tests/cache_list/frontcontroller22.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller22.phpt
@@ -4,7 +4,7 @@ Phar front controller include from cwd test 1 [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller22.phpt
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller22.php
 REQUEST_URI=/frontcontroller22.php/index.php
diff --git a/ext/phar/tests/cache_list/frontcontroller23.phpt b/ext/phar/tests/cache_list/frontcontroller23.phpt
index 3da9631dfb160..9ea09cac33e74 100644
--- a/ext/phar/tests/cache_list/frontcontroller23.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller23.phpt
@@ -4,7 +4,7 @@ Phar front controller with generic action router test [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller23.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller23.php
 REQUEST_URI=/frontcontroller23.php/hi/there
diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt
index cd7c990c29d6f..85cd561d8d6cd 100644
--- a/ext/phar/tests/cache_list/frontcontroller24.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller24.phpt
@@ -4,7 +4,7 @@ Phar front controller with custom 404 php script [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller24.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller24.php
 REQUEST_URI=/frontcontroller24.php/unknown/file
diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt
index 3ec1d52d54ae0..0bfd8d6163df5 100644
--- a/ext/phar/tests/cache_list/frontcontroller25.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller25.phpt
@@ -4,7 +4,7 @@ Phar front controller with extra path_info [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller25.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller25.php
 REQUEST_URI=/frontcontroller25.php/a1.phps/extra/stuff
diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt
index b7d1270107580..f35600f9d54e3 100644
--- a/ext/phar/tests/cache_list/frontcontroller26.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller26.phpt
@@ -3,7 +3,7 @@ Phar front controller with unknown extension mime type [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller26.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller26.php
 REQUEST_URI=/frontcontroller26.php/unknown.ext
diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt
index 1e0898dffc143..c9a88b0ca8221 100644
--- a/ext/phar/tests/cache_list/frontcontroller27.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller27.phpt
@@ -4,7 +4,7 @@ Phar front controller with no extension [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller27.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller27.php
 REQUEST_URI=/frontcontroller27.php/noext
diff --git a/ext/phar/tests/cache_list/frontcontroller28.phpt b/ext/phar/tests/cache_list/frontcontroller28.phpt
index 80059a9da2688..a13a8f8252a70 100644
--- a/ext/phar/tests/cache_list/frontcontroller28.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller28.phpt
@@ -4,7 +4,7 @@ Phar front controller with huge file [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller28.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller28.php
 REQUEST_URI=/frontcontroller28.php/bigfile.txt
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index c86cdfe4acabf..99d51ac5314e0 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -4,7 +4,7 @@ Phar front controller with fatal error in php file [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller29.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller29.php
 REQUEST_URI=/frontcontroller29.php/fatalerror.phps
diff --git a/ext/phar/tests/cache_list/frontcontroller3.phpt b/ext/phar/tests/cache_list/frontcontroller3.phpt
index 1c1b47988133a..fbbf760ed06bf 100644
--- a/ext/phar/tests/cache_list/frontcontroller3.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller3.phpt
@@ -4,7 +4,7 @@ Phar front controller phps [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller3.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.php
 REQUEST_URI=/frontcontroller3.php/a.phps
diff --git a/ext/phar/tests/cache_list/frontcontroller30.phpt b/ext/phar/tests/cache_list/frontcontroller30.phpt
index 5a63da874c240..3077cbef11f4a 100644
--- a/ext/phar/tests/cache_list/frontcontroller30.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller30.phpt
@@ -3,7 +3,7 @@ Phar front controller with weird SCRIPT_NAME [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller30.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/huh?
 REQUEST_URI=/huh?
diff --git a/ext/phar/tests/cache_list/frontcontroller31.phpt b/ext/phar/tests/cache_list/frontcontroller31.phpt
index 9ef1221a289f9..77e9dcc39934c 100644
--- a/ext/phar/tests/cache_list/frontcontroller31.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller31.phpt
@@ -4,7 +4,7 @@ Phar front controller with invalid callback for rewrites [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller31.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller31.php
 REQUEST_URI=/frontcontroller31.php
diff --git a/ext/phar/tests/cache_list/frontcontroller32.phpt b/ext/phar/tests/cache_list/frontcontroller32.phpt
index cb9abb8c198c1..0236e6d4ac09a 100644
--- a/ext/phar/tests/cache_list/frontcontroller32.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller32.phpt
@@ -4,7 +4,7 @@ Phar front controller with valid callback that is not good [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller32.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller32.php
 REQUEST_URI=/frontcontroller32.php
diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt
index 65e0733670bc9..48463016bbb35 100644
--- a/ext/phar/tests/cache_list/frontcontroller33.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller33.phpt
@@ -4,7 +4,7 @@ Phar front controller with valid callback that does not return any value [cache_
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller33.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller33.php
 REQUEST_URI=/frontcontroller33.php
diff --git a/ext/phar/tests/cache_list/frontcontroller34.phpt b/ext/phar/tests/cache_list/frontcontroller34.phpt
index 83c22f58f8f2b..c9801e5b5513d 100644
--- a/ext/phar/tests/cache_list/frontcontroller34.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller34.phpt
@@ -4,7 +4,7 @@ Phar front controller with cwd [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller34.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller34.php
 REQUEST_URI=/frontcontroller34.php/start/index.php
diff --git a/ext/phar/tests/cache_list/frontcontroller4.phpt b/ext/phar/tests/cache_list/frontcontroller4.phpt
index 5cf3682277020..105d7626fe069 100644
--- a/ext/phar/tests/cache_list/frontcontroller4.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller4.phpt
@@ -3,7 +3,7 @@ Phar front controller index.php relocate (no /) [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller4.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller4.php
 REQUEST_URI=/frontcontroller4.php
diff --git a/ext/phar/tests/cache_list/frontcontroller5.phpt b/ext/phar/tests/cache_list/frontcontroller5.phpt
index 2c738d7bfb383..81e93fcbb4148 100644
--- a/ext/phar/tests/cache_list/frontcontroller5.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller5.phpt
@@ -3,7 +3,7 @@ Phar front controller index.php relocate [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller5.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller5.php
 REQUEST_URI=/frontcontroller5.php/
diff --git a/ext/phar/tests/cache_list/frontcontroller6.phpt b/ext/phar/tests/cache_list/frontcontroller6.phpt
index 2480be41293a6..2e96f0a923dc4 100644
--- a/ext/phar/tests/cache_list/frontcontroller6.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller6.phpt
@@ -3,7 +3,7 @@ Phar front controller 404 [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller6.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.php
 REQUEST_URI=/frontcontroller6.php/notfound.php
diff --git a/ext/phar/tests/cache_list/frontcontroller7.phpt b/ext/phar/tests/cache_list/frontcontroller7.phpt
index a8a88a95fe4b3..b52bff1f59c40 100644
--- a/ext/phar/tests/cache_list/frontcontroller7.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller7.phpt
@@ -3,7 +3,7 @@ Phar front controller alternate index file [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller7.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.php
 REQUEST_URI=/frontcontroller7.php/
diff --git a/ext/phar/tests/cache_list/frontcontroller8.phpt b/ext/phar/tests/cache_list/frontcontroller8.phpt
index bf9b390defc43..dc279e4261aa6 100644
--- a/ext/phar/tests/cache_list/frontcontroller8.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller8.phpt
@@ -3,7 +3,7 @@ Phar front controller no index file 404 [cache_list]
 --INI--
 phar.cache_list={PWD}/frontcontroller8.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller8.php
 REQUEST_URI=/frontcontroller8.php/
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt
index 1a8b9168ccf2b..94e7b66925e18 100644
--- a/ext/phar/tests/cache_list/frontcontroller9.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller9.phpt
@@ -4,7 +4,7 @@ Phar front controller rewrite array [cache_list]
 default_charset=UTF-8
 phar.cache_list={PWD}/frontcontroller9.php
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller9.php
 REQUEST_URI=/frontcontroller9.php/hi
diff --git a/ext/phar/tests/cached_manifest_1.phpt b/ext/phar/tests/cached_manifest_1.phpt
index d9c40723aec19..ffd3b2c8de0bd 100644
--- a/ext/phar/tests/cached_manifest_1.phpt
+++ b/ext/phar/tests/cached_manifest_1.phpt
@@ -2,7 +2,7 @@
 Phar: phar.cache_list basic read test
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.cache_list={PWD}/files/nophar.phar
diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt
index 029ea7a53f4f7..f75f87ed894e5 100644
--- a/ext/phar/tests/create_new_and_modify.phpt
+++ b/ext/phar/tests/create_new_and_modify.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create and modify phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/create_new_phar.phpt b/ext/phar/tests/create_new_phar.phpt
index 26794095e15f9..d01248ecb7c9e 100644
--- a/ext/phar/tests/create_new_phar.phpt
+++ b/ext/phar/tests/create_new_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create a completely new phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index 39fc31e27b283..4aa09192dcd6e 100644
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create a completely new phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=1
diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt
index d32f758f93fd0..6e88c0db4b85b 100644
--- a/ext/phar/tests/create_new_phar_c.phpt
+++ b/ext/phar/tests/create_new_phar_c.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create a completely new phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index fd200d8613d64..e3433c4d72e34 100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create with illegal path
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt
index 1d985090645f0..1b56f27d6f51c 100644
--- a/ext/phar/tests/delete.phpt
+++ b/ext/phar/tests/delete.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt
index d28f136f77bc4..5775668eac354 100644
--- a/ext/phar/tests/delete_in_phar.phpt
+++ b/ext/phar/tests/delete_in_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt
index a6d5b3a35e000..3cdea9da26292 100644
--- a/ext/phar/tests/delete_in_phar_b.phpt
+++ b/ext/phar/tests/delete_in_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt
index 0d4eb1e2aa246..d5b5baebdaa90 100644
--- a/ext/phar/tests/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/delete_in_phar_confirm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a .phar (confirm disk file is changed)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt
index a8f9d3f889bde..4e67240080e59 100644
--- a/ext/phar/tests/dir.phpt
+++ b/ext/phar/tests/dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: mkdir/rmdir test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/fatal_error_webphar.phpt b/ext/phar/tests/fatal_error_webphar.phpt
index 3db863470ab3d..12431ac42ef7b 100644
--- a/ext/phar/tests/fatal_error_webphar.phpt
+++ b/ext/phar/tests/fatal_error_webphar.phpt
@@ -3,7 +3,7 @@ Phar web-based phar with fatal error
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/fatal_error_webphar.php
 REQUEST_URI=/fatal_error_webphar.php/index.php
diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt
index b75601a07b64c..dbd67933e090c 100644
--- a/ext/phar/tests/fgc_edgecases.phpt
+++ b/ext/phar/tests/fgc_edgecases.phpt
@@ -2,7 +2,7 @@
 Phar: test edge cases of file_get_contents() function interception
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/file_get_contents.phpt b/ext/phar/tests/file_get_contents.phpt
index fcc9d64655970..12b31864b75c6 100644
--- a/ext/phar/tests/file_get_contents.phpt
+++ b/ext/phar/tests/file_get_contents.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test file_get_contents() interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt
index b55bc59c84326..f5ea8dcaa1560 100644
--- a/ext/phar/tests/fopen.phpt
+++ b/ext/phar/tests/fopen.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test fopen() interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt
index 4c28ff31a11c7..14b0f773f77dc 100644
--- a/ext/phar/tests/fopen_edgecases.phpt
+++ b/ext/phar/tests/fopen_edgecases.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen/stat/fseek/unlink/rename edge cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt
index 4ac529a4e00f0..bcb1fec1dc309 100644
--- a/ext/phar/tests/fopen_edgecases2.phpt
+++ b/ext/phar/tests/fopen_edgecases2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test edge cases of fopen() function interception #2
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/front.phar.phpt b/ext/phar/tests/front.phar.phpt
index bab8ada0fdd35..d2f57547e6490 100644
--- a/ext/phar/tests/front.phar.phpt
+++ b/ext/phar/tests/front.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller with mounted external file
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/front.phar.php
 REQUEST_URI=/front.phar.php/index.php
diff --git a/ext/phar/tests/frontcontroller1.phpt b/ext/phar/tests/frontcontroller1.phpt
index 7093323617197..78768cd1a86a2 100644
--- a/ext/phar/tests/frontcontroller1.phpt
+++ b/ext/phar/tests/frontcontroller1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller other
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller1.php
 REQUEST_URI=/frontcontroller1.php/a.jpg
diff --git a/ext/phar/tests/frontcontroller10.phpt b/ext/phar/tests/frontcontroller10.phpt
index 667d5c243cd4e..b17e173490523 100644
--- a/ext/phar/tests/frontcontroller10.phpt
+++ b/ext/phar/tests/frontcontroller10.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite access denied
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller10.php
 REQUEST_URI=/frontcontroller10.php/hi
diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt
index aa20e19e97b0b..ea95d08a4edaf 100644
--- a/ext/phar/tests/frontcontroller11.phpt
+++ b/ext/phar/tests/frontcontroller11.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type extension is not a string
 --INI--
 default_charset=
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.php
diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index bad71d0ac5b29..4520e6489e2bc 100644
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type unknown int
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.php
 REQUEST_URI=/frontcontroller12.php/a.php
diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index 7d018a141a038..f14c655b4823d 100644
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type not string/int
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.php
 REQUEST_URI=/frontcontroller13.php/a.php
diff --git a/ext/phar/tests/frontcontroller14.phpt b/ext/phar/tests/frontcontroller14.phpt
index 2bdb145c6e365..3146780777783 100644
--- a/ext/phar/tests/frontcontroller14.phpt
+++ b/ext/phar/tests/frontcontroller14.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type override, other
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.php
 REQUEST_URI=/frontcontroller14.php/a.jpg
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
index 370098014d156..307bb3ce58b1b 100644
--- a/ext/phar/tests/frontcontroller15.phpt
+++ b/ext/phar/tests/frontcontroller15.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHPS
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.php
 REQUEST_URI=/frontcontroller15.php/a.php
diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt
index 712af40bf3e87..7166d258f6ff8 100644
--- a/ext/phar/tests/frontcontroller16.phpt
+++ b/ext/phar/tests/frontcontroller16.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHP
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.php
 REQUEST_URI=/frontcontroller16.php/a.phps
diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt
index 233e2e2a49078..6b52beb4deaec 100644
--- a/ext/phar/tests/frontcontroller17.phpt
+++ b/ext/phar/tests/frontcontroller17.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type unknown
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.php
 REQUEST_URI=/frontcontroller17.php/fronk.gronk
diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt
index d01886e6b0a19..354b164f5f125 100644
--- a/ext/phar/tests/frontcontroller18.phpt
+++ b/ext/phar/tests/frontcontroller18.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.php
 REQUEST_URI=/frontcontroller18.php/fronk.gronk
diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt
index e577ecb6a4d12..4bdea7da0a6e6 100644
--- a/ext/phar/tests/frontcontroller19.phpt
+++ b/ext/phar/tests/frontcontroller19.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 2
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller19.php
 REQUEST_URI=/frontcontroller19.php/
diff --git a/ext/phar/tests/frontcontroller2.phpt b/ext/phar/tests/frontcontroller2.phpt
index d0744dea1dcde..3268e8d7f9175 100644
--- a/ext/phar/tests/frontcontroller2.phpt
+++ b/ext/phar/tests/frontcontroller2.phpt
@@ -3,7 +3,7 @@ Phar front controller PHP test
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.php
 REQUEST_URI=/frontcontroller2.php/a.php
diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt
index e67ec06a5c1bd..fb2111df01227 100644
--- a/ext/phar/tests/frontcontroller20.phpt
+++ b/ext/phar/tests/frontcontroller20.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 3
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller20.php
 REQUEST_URI=/frontcontroller20.php/
diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt
index 2dad6cae0d03a..28287d41122c4 100644
--- a/ext/phar/tests/frontcontroller21.phpt
+++ b/ext/phar/tests/frontcontroller21.phpt
@@ -4,7 +4,7 @@ Phar front controller $_SERVER munging success
 default_charset=UTF-8
 cgi.fix_pathinfo=1
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.php
 REQUEST_URI=/frontcontroller21.php/index.php?test=hi
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 827c5688c7861..b97e88246a081 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -3,7 +3,7 @@ Phar front controller include from cwd test 1
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller22.php
 REQUEST_URI=/frontcontroller22.php/index.php
diff --git a/ext/phar/tests/frontcontroller23.phpt b/ext/phar/tests/frontcontroller23.phpt
index 24464c9beb4b1..9b6f85a6af160 100644
--- a/ext/phar/tests/frontcontroller23.phpt
+++ b/ext/phar/tests/frontcontroller23.phpt
@@ -3,7 +3,7 @@ Phar front controller with generic action router test
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller23.php
 REQUEST_URI=/frontcontroller23.php/hi/there
diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt
index 69cd9f92b66a7..e9a4fb0dad2fc 100644
--- a/ext/phar/tests/frontcontroller24.phpt
+++ b/ext/phar/tests/frontcontroller24.phpt
@@ -3,7 +3,7 @@ Phar front controller with custom 404 php script
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller24.php
 REQUEST_URI=/frontcontroller24.php/unknown/file
diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt
index 1ef9117550102..04f5546ed4290 100644
--- a/ext/phar/tests/frontcontroller25.phpt
+++ b/ext/phar/tests/frontcontroller25.phpt
@@ -3,7 +3,7 @@ Phar front controller with extra path_info
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller25.php
 REQUEST_URI=/frontcontroller25.php/a1.phps/extra/stuff
diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt
index e66dd2036ba4a..8c5b0af02857b 100644
--- a/ext/phar/tests/frontcontroller26.phpt
+++ b/ext/phar/tests/frontcontroller26.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller with unknown extension mime type
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller26.php
 REQUEST_URI=/frontcontroller26.php/unknown.ext
diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt
index 9aa82f13493cf..33c7434c3d225 100644
--- a/ext/phar/tests/frontcontroller27.phpt
+++ b/ext/phar/tests/frontcontroller27.phpt
@@ -3,7 +3,7 @@ Phar front controller with no extension
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller27.php
 REQUEST_URI=/frontcontroller27.php/noext
diff --git a/ext/phar/tests/frontcontroller28.phpt b/ext/phar/tests/frontcontroller28.phpt
index 577800885b1f2..51807c00aaccf 100644
--- a/ext/phar/tests/frontcontroller28.phpt
+++ b/ext/phar/tests/frontcontroller28.phpt
@@ -3,7 +3,7 @@ Phar front controller with huge file
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller28.php
 REQUEST_URI=/frontcontroller28.php/bigfile.txt
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 710a58f91b1dc..eacd980d1c6be 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -3,7 +3,7 @@ Phar front controller with fatal error in php file
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller29.php
 REQUEST_URI=/frontcontroller29.php/fatalerror.phps
diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt
index ac36485837bd3..a23e6ea3b9a01 100644
--- a/ext/phar/tests/frontcontroller3.phpt
+++ b/ext/phar/tests/frontcontroller3.phpt
@@ -3,7 +3,7 @@ Phar front controller phps
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.php
 REQUEST_URI=/frontcontroller3.php/a.phps
diff --git a/ext/phar/tests/frontcontroller30.phpt b/ext/phar/tests/frontcontroller30.phpt
index de6960c244482..015cdef22a806 100644
--- a/ext/phar/tests/frontcontroller30.phpt
+++ b/ext/phar/tests/frontcontroller30.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller with weird SCRIPT_NAME
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/huh?
 REQUEST_URI=/huh?
diff --git a/ext/phar/tests/frontcontroller31.phpt b/ext/phar/tests/frontcontroller31.phpt
index 13c305d2f3e11..60718d11699ec 100644
--- a/ext/phar/tests/frontcontroller31.phpt
+++ b/ext/phar/tests/frontcontroller31.phpt
@@ -3,7 +3,7 @@ Phar front controller with invalid callback for rewrites
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller31.php
 REQUEST_URI=/frontcontroller31.php
diff --git a/ext/phar/tests/frontcontroller32.phpt b/ext/phar/tests/frontcontroller32.phpt
index 032d0f571d28c..eeca1d29a92d5 100644
--- a/ext/phar/tests/frontcontroller32.phpt
+++ b/ext/phar/tests/frontcontroller32.phpt
@@ -3,7 +3,7 @@ Phar front controller with valid callback that is not good
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller32.php
 REQUEST_URI=/frontcontroller32.php
diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt
index 6247a4ebfc858..9d45c417d3465 100644
--- a/ext/phar/tests/frontcontroller33.phpt
+++ b/ext/phar/tests/frontcontroller33.phpt
@@ -3,7 +3,7 @@ Phar front controller with valid callback that does not return any value
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller33.php
 REQUEST_URI=/frontcontroller33.php
diff --git a/ext/phar/tests/frontcontroller34.phpt b/ext/phar/tests/frontcontroller34.phpt
index 34a49ded4dfad..5fb03f6f3de53 100644
--- a/ext/phar/tests/frontcontroller34.phpt
+++ b/ext/phar/tests/frontcontroller34.phpt
@@ -3,7 +3,7 @@ Phar front controller with cwd
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller34.php
 REQUEST_URI=/frontcontroller34.php/start/index.php
diff --git a/ext/phar/tests/frontcontroller4.phpt b/ext/phar/tests/frontcontroller4.phpt
index f2482b9219791..f49c18461f595 100644
--- a/ext/phar/tests/frontcontroller4.phpt
+++ b/ext/phar/tests/frontcontroller4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate (no /)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller4.php
 REQUEST_URI=/frontcontroller4.php
diff --git a/ext/phar/tests/frontcontroller5.phpt b/ext/phar/tests/frontcontroller5.phpt
index 1990a2b008322..e46fde0679e43 100644
--- a/ext/phar/tests/frontcontroller5.phpt
+++ b/ext/phar/tests/frontcontroller5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller5.php
 REQUEST_URI=/frontcontroller5.php/
diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt
index 1a2cc2cd23d12..819d5b4fa6d86 100644
--- a/ext/phar/tests/frontcontroller6.phpt
+++ b/ext/phar/tests/frontcontroller6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller 404
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.php
 REQUEST_URI=/frontcontroller6.php/notfound.php
diff --git a/ext/phar/tests/frontcontroller7.phpt b/ext/phar/tests/frontcontroller7.phpt
index aff2087522c3a..0034fc66bfa2a 100644
--- a/ext/phar/tests/frontcontroller7.phpt
+++ b/ext/phar/tests/frontcontroller7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller alternate index file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.php
 REQUEST_URI=/frontcontroller7.php/
diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt
index 36e3206d66879..22d3eee93debf 100644
--- a/ext/phar/tests/frontcontroller8.phpt
+++ b/ext/phar/tests/frontcontroller8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller no index file 404
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller8.php
 REQUEST_URI=/frontcontroller8.php/
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
index d47a2898e6030..6e71c72fe1d0e 100644
--- a/ext/phar/tests/frontcontroller9.phpt
+++ b/ext/phar/tests/frontcontroller9.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite array
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller9.php
 REQUEST_URI=/frontcontroller9.php/hi
diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt
index 5f9462c260972..35795aa81ce19 100644
--- a/ext/phar/tests/include_path.phpt
+++ b/ext/phar/tests/include_path.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: include_path with phar:// wrapper
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/include_path_advanced.phpt b/ext/phar/tests/include_path_advanced.phpt
index 6feee422b4ca2..ece2404557f98 100644
--- a/ext/phar/tests/include_path_advanced.phpt
+++ b/ext/phar/tests/include_path_advanced.phpt
@@ -3,7 +3,7 @@ Phar: include_path advanced code coverage test
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE_EXTERNAL--
 files/include_path.phar
 --EXPECT--
diff --git a/ext/phar/tests/ini_set.phpt b/ext/phar/tests/ini_set.phpt
index 6bba43991a79d..6ecb114afb04e 100644
--- a/ext/phar/tests/ini_set.phpt
+++ b/ext/phar/tests/ini_set.phpt
@@ -2,7 +2,7 @@
 Phar: test ini_set with readonly and require_hash enabled
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=1
diff --git a/ext/phar/tests/ini_set_off.phpt b/ext/phar/tests/ini_set_off.phpt
index 127a07a7ceaa2..6c4ce30073505 100644
--- a/ext/phar/tests/ini_set_off.phpt
+++ b/ext/phar/tests/ini_set_off.phpt
@@ -2,7 +2,7 @@
 Phar: test ini_set with readonly and require_hash disabled
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt
index dc0c71ed11984..e22349c5138f2 100644
--- a/ext/phar/tests/invalid_alias.phpt
+++ b/ext/phar/tests/invalid_alias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: set alias with invalid alias containing / \ : or ;
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt
index 04cb779ddb24f..4f7cdac6bd592 100644
--- a/ext/phar/tests/invalid_setstubalias.phpt
+++ b/ext/phar/tests/invalid_setstubalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: invalid set alias or stub via array access
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/metadata_read.phpt b/ext/phar/tests/metadata_read.phpt
index 638653eccab8c..ec5cbb4314c53 100644
--- a/ext/phar/tests/metadata_read.phpt
+++ b/ext/phar/tests/metadata_read.phpt
@@ -2,7 +2,7 @@
 Phar with meta-data (read)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt
index 23986fbd36926..3c742b46b7751 100644
--- a/ext/phar/tests/metadata_write.phpt
+++ b/ext/phar/tests/metadata_write.phpt
@@ -2,7 +2,7 @@
 Phar with meta-data (write)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt
index 35e1bd72dd3d4..4d78bea7db952 100644
--- a/ext/phar/tests/metadata_write_commit.phpt
+++ b/ext/phar/tests/metadata_write_commit.phpt
@@ -2,7 +2,7 @@
 Phar with meta-data (write)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt
index 45c1d4674f5b2..968f88e566afa 100644
--- a/ext/phar/tests/mkdir.phpt
+++ b/ext/phar/tests/mkdir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 phar: mkdir/rmdir edge cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt
index 3620f1ee66f3c..1d02b4a760d33 100644
--- a/ext/phar/tests/mounteddir.phpt
+++ b/ext/phar/tests/mounteddir.phpt
@@ -2,7 +2,7 @@
 Phar: mounted manifest directory test
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt
index e9e2c05b9e91d..ceed63582b501 100644
--- a/ext/phar/tests/open_for_write_existing.phpt
+++ b/ext/phar/tests/open_for_write_existing.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (existing file)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index e253f12493cb3..24fb9d6067e8a 100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index be56d9952ac73..df2967750ecd1 100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt
index 13114072da0e6..65dbf001bb84f 100644
--- a/ext/phar/tests/open_for_write_newfile.phpt
+++ b/ext/phar/tests/open_for_write_newfile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (new file)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 28c9dda90667e..f34c3eefc03a2 100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index efa0da877f675..9073347a0f681 100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt
index ca6e391b06fbf..bac536c0ed199 100644
--- a/ext/phar/tests/opendir.phpt
+++ b/ext/phar/tests/opendir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test opendir() interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt
index be899df81b7a6..a8f52bdeb297a 100644
--- a/ext/phar/tests/opendir_edgecases.phpt
+++ b/ext/phar/tests/opendir_edgecases.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test edge cases of opendir() function interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 880bd53f3addd..1f71ee3665bcf 100644
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -2,7 +2,7 @@
 Phar::startBuffering()/setStub()/stopBuffering()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt
index 957f246664f67..c2e441b6d7db6 100644
--- a/ext/phar/tests/phar_buildfromdirectory1.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromDirectory() - readonly
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
index 5ed890a48bfb1..2ddf67fadcacb 100644
--- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -2,7 +2,7 @@
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
 <?php
-	if (!extension_loaded("phar")) die("skip");
+	if (!extension_loaded("phar")) die("skip phar extension not loaded");
 	if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only test");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt
index a33e50abbb0b7..d9c5ea0d44136 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -2,7 +2,7 @@
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
 <?php
-	if (!extension_loaded("phar")) die("skip");
+	if (!extension_loaded("phar")) die("skip phar extension not loaded");
 	if (substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_buildfromdirectory3.phpt b/ext/phar/tests/phar_buildfromdirectory3.phpt
index 921e39593ddc8..379efce48e347 100644
--- a/ext/phar/tests/phar_buildfromdirectory3.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromDirectory() - object passed as second parameter
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt
index 5ee2c33871a51..144e0b03c2581 100644
--- a/ext/phar/tests/phar_buildfromdirectory4.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromDirectory(), directory exists
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt
index f20c52ab91f95..5f7e6e0eff6a7 100644
--- a/ext/phar/tests/phar_buildfromdirectory5.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromDirectory() with matching regex
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt
index 5537ebac2358b..92275040b3537 100644
--- a/ext/phar/tests/phar_buildfromdirectory6.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromDirectory() with non-matching regex
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator1.phpt b/ext/phar/tests/phar_buildfromiterator1.phpt
index 0f656b64f2053..9e5de9cf2fbe2 100644
--- a/ext/phar/tests/phar_buildfromiterator1.phpt
+++ b/ext/phar/tests/phar_buildfromiterator1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() readonly
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt
index e6b9c025da8c8..7e098626c7a20 100644
--- a/ext/phar/tests/phar_buildfromiterator10.phpt
+++ b/ext/phar/tests/phar_buildfromiterator10.phpt
@@ -2,7 +2,7 @@
 Phar::buildFromIterator() RegexIterator(RecursiveIteratorIterator), SplFileInfo as current
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_buildfromiterator2.phpt b/ext/phar/tests/phar_buildfromiterator2.phpt
index e9dd26e9de074..3f085c304d5f0 100644
--- a/ext/phar/tests/phar_buildfromiterator2.phpt
+++ b/ext/phar/tests/phar_buildfromiterator2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() wrong object
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator3.phpt b/ext/phar/tests/phar_buildfromiterator3.phpt
index 1603631278397..f63a8b584c9aa 100644
--- a/ext/phar/tests/phar_buildfromiterator3.phpt
+++ b/ext/phar/tests/phar_buildfromiterator3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, but object passed
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt
index 9277db562b481..cf446d606efbd 100644
--- a/ext/phar/tests/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/phar_buildfromiterator4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file passed in
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt
index b6fafec6f4f92..b4fe4ce8defaa 100644
--- a/ext/phar/tests/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/phar_buildfromiterator5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, iterator returns non-string
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt
index 3a315fae4dcb3..a2d261e7a1fce 100644
--- a/ext/phar/tests/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/phar_buildfromiterator6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, key is int
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt
index 3dd8fc1b001d0..fc48e09cafb29 100644
--- a/ext/phar/tests/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/phar_buildfromiterator7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, file can't be opened
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt
index de37ee868784d..ce4d672ac3fbc 100644
--- a/ext/phar/tests/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/phar_buildfromiterator8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() RegexIterator(DirectoryIterator), SplFileInfo as current
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt
index 2c9306b6cc86e..8cd690cd3e3a9 100644
--- a/ext/phar/tests/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/phar_buildfromiterator9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file resource passed in
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index c269a8b34f093..d8de6e69cc765 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -2,7 +2,7 @@
 Phar: bzipped phar
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index cd9e52f36f6f7..9bc55a0657875 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/stopBuffering()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_construct_invalidurl.phpt b/ext/phar/tests/phar_construct_invalidurl.phpt
index 30a4687289ed5..66d509bcdd0bd 100644
--- a/ext/phar/tests/phar_construct_invalidurl.phpt
+++ b/ext/phar/tests/phar_construct_invalidurl.phpt
@@ -3,7 +3,7 @@ Phar object passed URL
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt
index bbf2c6633a6ed..e8fa88fbc1464 100644
--- a/ext/phar/tests/phar_convert_again.phpt
+++ b/ext/phar/tests/phar_convert_again.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::conversion to other formats
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib"); ?>
 <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?>
 --INI--
diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt
index 351e54af04400..73e958ed21ee6 100644
--- a/ext/phar/tests/phar_convert_repeated.phpt
+++ b/ext/phar/tests/phar_convert_repeated.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::convertToZip|Tar|Phar() repeated (phar_based archives)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt
index 647bb842d78c5..a30bc103bd120 100644
--- a/ext/phar/tests/phar_convert_repeated_b.phpt
+++ b/ext/phar/tests/phar_convert_repeated_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 PharData::convertToZip|Tar|Phar() repeated (phardata_based archives)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt
index d4031ec32f4c5..34cea74ab2afd 100644
--- a/ext/phar/tests/phar_convert_tar.phpt
+++ b/ext/phar/tests/phar_convert_tar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::convertToTar()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index f0f0f698258f9..69f24d19d1132 100644
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar::convertToTar() gzip compressed
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt
index 52fd0f555a95a..8c2c7e07dce7d 100644
--- a/ext/phar/tests/phar_convert_tar3.phpt
+++ b/ext/phar/tests/phar_convert_tar3.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar::convertToTar() bz2 compressed
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("bz2")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 734551ee9c2d3..445af26f2f0b9 100644
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::convertToZip()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt
index 8b270302eff64..53dc27c7f232c 100644
--- a/ext/phar/tests/phar_copy.phpt
+++ b/ext/phar/tests/phar_copy.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: copy()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index cafc8a1cfb009..7536cc482597f 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: attempt to create a Phar with relative path
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt
index e074d649bd640..17e9d319548b2 100644
--- a/ext/phar/tests/phar_createdefaultstub.phpt
+++ b/ext/phar/tests/phar_createdefaultstub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::createDefaultStub() with and without arg
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt
index 13b4d6a781216..d4f07af170c65 100644
--- a/ext/phar/tests/phar_ctx_001.phpt
+++ b/ext/phar/tests/phar_ctx_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar context
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt
index abf385a68f195..26d09a7fbc51e 100644
--- a/ext/phar/tests/phar_decompress.phpt
+++ b/ext/phar/tests/phar_decompress.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::decompress()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt
index 6c04571d86c05..39e82aa1d1c12 100644
--- a/ext/phar/tests/phar_dir_iterate.phpt
+++ b/ext/phar/tests/phar_dir_iterate.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: iterate test with sub-directories and RecursiveIteratorIterator
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_dotted_path.phpt b/ext/phar/tests/phar_dotted_path.phpt
index f6d626e6cf9fa..87734a362bedc 100644
--- a/ext/phar/tests/phar_dotted_path.phpt
+++ b/ext/phar/tests/phar_dotted_path.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create new Phar with broken.dirname in path
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 default_charset=
 phar.readonly=0
diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt
index f7d1403d599a3..f2262c2d3e1ae 100644
--- a/ext/phar/tests/phar_extract.phpt
+++ b/ext/phar/tests/phar_extract.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::extractTo()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_extract2.phpt b/ext/phar/tests/phar_extract2.phpt
index 7de8cee5b0e90..9af031728cb51 100644
--- a/ext/phar/tests/phar_extract2.phpt
+++ b/ext/phar/tests/phar_extract2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::extractTo() - .phar safety
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_extract3.phpt b/ext/phar/tests/phar_extract3.phpt
index 475583938bb0d..fd35efd7354b9 100644
--- a/ext/phar/tests/phar_extract3.phpt
+++ b/ext/phar/tests/phar_extract3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::extractTo() - check that phar exists
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_get_supported_signatures_001.phpt b/ext/phar/tests/phar_get_supported_signatures_001.phpt
index 64874f66e0b18..2c925a68aa1c7 100644
--- a/ext/phar/tests/phar_get_supported_signatures_001.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_001.phpt
@@ -2,7 +2,7 @@
 Phar::getSupportedSignatures()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (extension_loaded("hash")) die("skip extension hash conflicts");
 $arr = Phar::getSupportedSignatures();
 if (in_array("OpenSSL", $arr)) die("skip openssl support enabled");
diff --git a/ext/phar/tests/phar_get_supported_signatures_001a.phpt b/ext/phar/tests/phar_get_supported_signatures_001a.phpt
index ad929df262185..96570acfb5bd5 100644
--- a/ext/phar/tests/phar_get_supported_signatures_001a.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_001a.phpt
@@ -2,7 +2,7 @@
 Phar::getSupportedSignatures()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (extension_loaded("hash")) die("skip extension hash conflicts");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/phar_get_supported_signatures_002.phpt b/ext/phar/tests/phar_get_supported_signatures_002.phpt
index 3c5cf7f0f4876..907bf615edae5 100644
--- a/ext/phar/tests/phar_get_supported_signatures_002.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_002.phpt
@@ -2,7 +2,7 @@
 Phar::getSupportedSignatures()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("hash")) die("skip extension hash required");
 $arr = Phar::getSupportedSignatures();
 if (in_array("OpenSSL", $arr)) die("skip openssl support enabled");
diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
index 32437a30a181d..40845973f24e8 100644
--- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
@@ -2,7 +2,7 @@
 Phar::getSupportedSignatures()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("hash")) die("skip extension hash required");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt
index fecb806f2ee96..4df6ac8a0901a 100644
--- a/ext/phar/tests/phar_get_supportedcomp1.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getSupportedCompression() (bz2 and zlib)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt
index aa941d0e4b38c..2dd1c2cf85d2e 100644
--- a/ext/phar/tests/phar_get_supportedcomp2.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getSupportedCompression() (bz2 only)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?>
 --INI--
diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt
index fadb482042b4d..f9412ac70985b 100644
--- a/ext/phar/tests/phar_get_supportedcomp3.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getSupportedCompression() (zlib only)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt
index 1d953e2e38f53..7475f716f5130 100644
--- a/ext/phar/tests/phar_get_supportedcomp4.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getSupportedCompression() (none)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (extension_loaded("bz2")) die("skip bz2 is available"); ?>
 <?php if (extension_loaded("zlib")) die("skip zlib is available"); ?>
 --FILE--
diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt
index 526a8cbf91538..04a639600efe8 100644
--- a/ext/phar/tests/phar_gobyebye-win32.phpt
+++ b/ext/phar/tests/phar_gobyebye-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test edge cases of intercepted functions when the underlying phar archive has been unlinkArchive()d
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (strpos(PHP_OS, 'WIN') === false) die("skip Extra warning on Windows.");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt
index 608e95076895f..1347d087e0966 100644
--- a/ext/phar/tests/phar_gobyebye.phpt
+++ b/ext/phar/tests/phar_gobyebye.phpt
@@ -3,7 +3,7 @@ Phar: test edge cases of intercepted functions when the underlying phar archive
 --SKIPIF--
 <?php
 if (defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip");
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt
index 3308424fa9cd6..f778116d9b9b3 100644
--- a/ext/phar/tests/phar_gzip.phpt
+++ b/ext/phar/tests/phar_gzip.phpt
@@ -2,7 +2,7 @@
 Phar: gzipped phar
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt
index da07bec2876f0..83babe94c8285 100644
--- a/ext/phar/tests/phar_isvalidpharfilename.phpt
+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::isValidPharFilename()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=1
 --FILE--
diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt
index c2b25685f1897..b79fdc803c8b4 100644
--- a/ext/phar/tests/phar_magic.phpt
+++ b/ext/phar/tests/phar_magic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: include/fopen magic
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt
index da23218196055..29776e059137b 100644
--- a/ext/phar/tests/phar_metadata_read.phpt
+++ b/ext/phar/tests/phar_metadata_read.phpt
@@ -2,7 +2,7 @@
 Phar with metadata (read)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt
index 2aadc7423f4d6..8fa05db030812 100644
--- a/ext/phar/tests/phar_metadata_write.phpt
+++ b/ext/phar/tests/phar_metadata_write.phpt
@@ -2,7 +2,7 @@
 Phar with metadata (write)
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt
index 80f8cda38943e..12900e47acb5d 100644
--- a/ext/phar/tests/phar_mount.phpt
+++ b/ext/phar/tests/phar_mount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::mount
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_offset_check.phpt b/ext/phar/tests/phar_offset_check.phpt
index 469dce6c11b43..7996c0d8ed838 100644
--- a/ext/phar/tests/phar_offset_check.phpt
+++ b/ext/phar/tests/phar_offset_check.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: disallow stub and alias setting via offset*() methods
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt
index 8e96246eef331..7d5680765a9c2 100644
--- a/ext/phar/tests/phar_offset_get_error.phpt
+++ b/ext/phar/tests/phar_offset_get_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: ignore filenames starting with / on offsetSet
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index 7ee7ca6fa5f2e..50743d6a3d0f1 100644
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -2,7 +2,7 @@
 Phar object: basics
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index f62c9a509ab82..15a3f4fa91a40 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -2,7 +2,7 @@
 Phar object: iterator & entries
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index 01ca493a2fd75..2f152b93e4b34 100644
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: entry & openFile()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index 12492e2eefb0f..b5c74b1d0547b 100644
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -2,7 +2,7 @@
 Phar and DirectoryIterator
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 62887655b1a0d..2bfc4998ba71e 100644
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -2,7 +2,7 @@
 Phar and RecursiveDirectoryIterator
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index de9b499a8373e..60738fd01a975 100644
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: array access
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index ff9c721150e0e..1de20d9d00a07 100644
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: access through SplFileObject
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index b0f518d39be00..a4b577148bd97 100644
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: iterating via SplFileObject
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index f651a525635c5..87fce29933f1c 100644
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: iterating via SplFileObject and reading csv
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!defined('SplFileObject::READ_CSV') || !defined('SplFileObject::SKIP_EMPTY')) die('skip newer SPL version is required'); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index 0869828f8fe68..29bcbbe252a00 100644
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: ArrayAccess and isset
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index 5b929363dbbcb..421bad0490228 100644
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: add file
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index b7a1c420f1581..d4fa8f2440758 100644
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: add file
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index f5566807fbeb8..0f3de203f9daf 100644
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: unset file
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index d2798c3dd4dac..8c9a44390c94b 100644
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: unset file (confirm disk file is changed)
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index cb17a601e4be2..1570f63344192 100644
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: unset file
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt
index f6bf3f23a0147..d05cc7318c9b7 100644
--- a/ext/phar/tests/phar_oo_compressallbz2.phpt
+++ b/ext/phar/tests/phar_oo_compressallbz2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::compressFiles(Phar::BZ2)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt
index 8a23e7de84a7f..7aee340224447 100644
--- a/ext/phar/tests/phar_oo_compressallgz.phpt
+++ b/ext/phar/tests/phar_oo_compressallgz.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::compressFiles(Phar::GZ)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt
index 4bd04dec37533..ed977568de42c 100644
--- a/ext/phar/tests/phar_oo_compressed_001.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::compress(Phar::GZ)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt
index 97c3cbb7caa66..611bfa9baba78 100644
--- a/ext/phar/tests/phar_oo_compressed_001b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::compress(Phar::BZ2)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt
index 1a539ac803c6a..926b01b74e94b 100644
--- a/ext/phar/tests/phar_oo_compressed_002.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: context/compress=GZ
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt
index 278137c676831..6c91f79bc0732 100644
--- a/ext/phar/tests/phar_oo_compressed_002b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: context/compress=BZip2
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not present"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt
index e3a0c2dea7453..593bc1d8c82f2 100644
--- a/ext/phar/tests/phar_oo_getcontents.phpt
+++ b/ext/phar/tests/phar_oo_getcontents.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: getContent()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt
index e77b5cad1a273..5940081eaeacd 100644
--- a/ext/phar/tests/phar_oo_getcontentsgz.phpt
+++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar object: getContent() (verify it works with compression)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt
index 9ed19966b37b2..8b5d3ae297dbf 100644
--- a/ext/phar/tests/phar_oo_getmodified.phpt
+++ b/ext/phar/tests/phar_oo_getmodified.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getModified()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt
index 9fbca2c9eac88..5e3fe85805d89 100644
--- a/ext/phar/tests/phar_oo_iswriteable.phpt
+++ b/ext/phar/tests/phar_oo_iswriteable.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::isWriteable
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index 5710f4fca53c9..4815bfd9fb46d 100644
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::getSignature() no signature
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt
index ef348563f16a3..18a59155e80a6 100644
--- a/ext/phar/tests/phar_oo_uncompressall.phpt
+++ b/ext/phar/tests/phar_oo_uncompressall.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::decompressFiles()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_running.phpt b/ext/phar/tests/phar_running.phpt
index 25acf82285f6e..6216c52486769 100644
--- a/ext/phar/tests/phar_running.phpt
+++ b/ext/phar/tests/phar_running.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::running()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt
index ef9fa283d5be5..f8232255ca03c 100644
--- a/ext/phar/tests/phar_setalias.phpt
+++ b/ext/phar/tests/phar_setalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt
index 901e4d2ebd548..2b179c5516d9f 100644
--- a/ext/phar/tests/phar_setalias2.phpt
+++ b/ext/phar/tests/phar_setalias2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias() error
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt
index fc7143af7b809..8843899685f9a 100644
--- a/ext/phar/tests/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/phar_setdefaultstub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::setDefaultStub() with and without arg
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt
index eacee7bb808d6..2da1205572c8b 100644
--- a/ext/phar/tests/phar_setsignaturealgo1.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setSignatureAlgorithm()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if ( extension_loaded("hash")) die("skip extension hash conflicts"); ?>
 <?php if (!defined("Phar::PGP")) die("skip PGP Signature algorithm not available"); ?>
 --INI--
diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt
index 9f548d0803f49..8e7bd0801e717 100644
--- a/ext/phar/tests/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
@@ -2,7 +2,7 @@
 Phar::setSupportedSignatures() with hash
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("hash")) die("skip hash extension required");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt
index ed306816e2dd6..17e5ce8238621 100644
--- a/ext/phar/tests/phar_stub.phpt
+++ b/ext/phar/tests/phar_stub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
index 99f313bc2ff92..1e5e5fe20b1c9 100644
--- a/ext/phar/tests/phar_stub_error.phpt
+++ b/ext/phar/tests/phar_stub_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/getStub()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt
index 9e5d6d56352d2..d2c994ff31cea 100644
--- a/ext/phar/tests/phar_stub_write.phpt
+++ b/ext/phar/tests/phar_stub_write.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/getStub()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt
index c5a0a1eba9014..1ebdfb738ca2c 100644
--- a/ext/phar/tests/phar_stub_write_file.phpt
+++ b/ext/phar/tests/phar_stub_write_file.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/getStub() from file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt
index 2f441bace507d..7bad78e414839 100644
--- a/ext/phar/tests/phar_unlinkarchive.phpt
+++ b/ext/phar/tests/phar_unlinkarchive.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::unlinkArchive()
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index 9544a1a5e075e..d6c4a249872ee 100644
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::chmod extra code coverage
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 551776194ee55..67c37a7ad2cfd 100644
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo compression-related methods
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib"); ?>
 <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?>
 --INI--
diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt
index 53ee5143cf049..483b19125d5c4 100644
--- a/ext/phar/tests/pharfileinfo_construct.phpt
+++ b/ext/phar/tests/pharfileinfo_construct.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::__construct
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt
index 23e7042fa475f..611dd9c5ae2c7 100644
--- a/ext/phar/tests/pharfileinfo_destruct.phpt
+++ b/ext/phar/tests/pharfileinfo_destruct.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::__destruct
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt
index 436ac7c5900da..e3f88fa8fb6c6 100644
--- a/ext/phar/tests/pharfileinfo_getcrc32.phpt
+++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::getCRC32
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt
index 8fb6935f2679e..d2d2bffe5591f 100644
--- a/ext/phar/tests/pharfileinfo_setmetadata.phpt
+++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: PharFileInfo::setMetadata/delMetadata extra code coverage
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt
index d99ccd1803150..e91a2ca0eb2be 100644
--- a/ext/phar/tests/phpinfo_001.phpt
+++ b/ext/phar/tests/phpinfo_001.phpt
@@ -2,7 +2,7 @@
 Phar: phpinfo display 1
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not loaded");
 if (!extension_loaded("bz2")) die("skip bz2 not loaded");
 $arr = Phar::getSupportedSignatures();
diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt
index ef505fedad50c..a62ab966db960 100644
--- a/ext/phar/tests/phpinfo_002.phpt
+++ b/ext/phar/tests/phpinfo_002.phpt
@@ -2,7 +2,7 @@
 Phar: phpinfo display 2
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not loaded");
 if (!extension_loaded("bz2")) die("skip bz2 not loaded");
 $arr = Phar::getSupportedSignatures();
diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt
index 045f1a090d3a1..26c17e9fd095b 100644
--- a/ext/phar/tests/phpinfo_003.phpt
+++ b/ext/phar/tests/phpinfo_003.phpt
@@ -2,7 +2,7 @@
 Phar: phpinfo display 3
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (extension_loaded("zlib")) die("skip zlib loaded");
 if (extension_loaded("bz2")) die("skip bz2 loaded");
 $arr = Phar::getSupportedSignatures();
diff --git a/ext/phar/tests/phpinfo_004.phpt b/ext/phar/tests/phpinfo_004.phpt
index b6df340815819..dcb230e53cdb3 100644
--- a/ext/phar/tests/phpinfo_004.phpt
+++ b/ext/phar/tests/phpinfo_004.phpt
@@ -2,7 +2,7 @@
 Phar: phpinfo display 4
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not loaded");
 if (!extension_loaded("bz2")) die("skip bz2 not loaded");
 $arr = Phar::getSupportedSignatures();
diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt
index 60fdad1792cea..e9d7b7ebcfa7f 100644
--- a/ext/phar/tests/readfile.phpt
+++ b/ext/phar/tests/readfile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test readfile() interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt
index f6a0dc65b94a3..db72c863a7445 100644
--- a/ext/phar/tests/readfile_edgecases.phpt
+++ b/ext/phar/tests/readfile_edgecases.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test edge cases of readfile() function interception
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt
index e2cb3b8cffd61..e2bd364f6b571 100644
--- a/ext/phar/tests/refcount1.phpt
+++ b/ext/phar/tests/refcount1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test that refcounting avoids problems with deleting a file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt
index c73c98ec816f4..2019d59f07f10 100644
--- a/ext/phar/tests/rename.phpt
+++ b/ext/phar/tests/rename.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt
index d19a37f70fc09..e9adc4e92f8a1 100644
--- a/ext/phar/tests/rename_dir.phpt
+++ b/ext/phar/tests/rename_dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename_dir test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/rename_dir_and_mount.phpt b/ext/phar/tests/rename_dir_and_mount.phpt
index b74f47b91d4f7..ec9a25cda4102 100644
--- a/ext/phar/tests/rename_dir_and_mount.phpt
+++ b/ext/phar/tests/rename_dir_and_mount.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename_dir and mount test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/rmdir.phpt b/ext/phar/tests/rmdir.phpt
index ef061bf7c2c4e..041efa1665879 100644
--- a/ext/phar/tests/rmdir.phpt
+++ b/ext/phar/tests/rmdir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rmdir test
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt
index f2944da413a80..612a5fd9dbfef 100644
--- a/ext/phar/tests/security.phpt
+++ b/ext/phar/tests/security.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test to ensure phar.readonly cannot be circumvented
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index 184aa6d2ecb12..d79a72229b119 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test stat function interceptions
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt
index 99f658fa78c3b..1c8e311df79ed 100644
--- a/ext/phar/tests/stat2_5.3.phpt
+++ b/ext/phar/tests/stat2_5.3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.3+)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt
index 1054cb1f6678f..680f517d206be 100644
--- a/ext/phar/tests/tar/033.phpt
+++ b/ext/phar/tests/tar/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt
index 09b5446aecb12..c486e5141de91 100644
--- a/ext/phar/tests/tar/033a.phpt
+++ b/ext/phar/tests/tar/033a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/alias_acrobatics.phpt b/ext/phar/tests/tar/alias_acrobatics.phpt
index d08dc0467c539..44ebb03950773 100644
--- a/ext/phar/tests/tar/alias_acrobatics.phpt
+++ b/ext/phar/tests/tar/alias_acrobatics.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: alias edge cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/all.phpt b/ext/phar/tests/tar/all.phpt
index 848f50502d51c..1ce1c0dd3f5fb 100644
--- a/ext/phar/tests/tar/all.phpt
+++ b/ext/phar/tests/tar/all.phpt
@@ -2,7 +2,7 @@
 Phar: test that creation of tar-based phar generates valid tar with all bells/whistles
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
diff --git a/ext/phar/tests/tar/badalias.phpt b/ext/phar/tests/tar/badalias.phpt
index 441fc03ae7ddb..04c3694cacba8 100644
--- a/ext/phar/tests/tar/badalias.phpt
+++ b/ext/phar/tests/tar/badalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: invalid aliases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib"); ?>
 <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?>
 --FILE--
diff --git a/ext/phar/tests/tar/badchecksum.phpt b/ext/phar/tests/tar/badchecksum.phpt
index fae19b153db49..75cebcd444102 100644
--- a/ext/phar/tests/tar/badchecksum.phpt
+++ b/ext/phar/tests/tar/badchecksum.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with bad checksum
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt
index c10b1cea2f3bb..c3efb07af552e 100644
--- a/ext/phar/tests/tar/bignames.phpt
+++ b/ext/phar/tests/tar/bignames.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with huge filenames
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/bignames_overflow.phpt b/ext/phar/tests/tar/bignames_overflow.phpt
index 359e9c63417dc..88ab5b69e3c94 100644
--- a/ext/phar/tests/tar/bignames_overflow.phpt
+++ b/ext/phar/tests/tar/bignames_overflow.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with huge filenames, buffer overflow
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/bug49910.phpt b/ext/phar/tests/tar/bug49910.phpt
index 6fb66a50a090e..003920944e9cd 100644
--- a/ext/phar/tests/tar/bug49910.phpt
+++ b/ext/phar/tests/tar/bug49910.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #49910: no support for ././@LongLink for long filenames in phar tar support
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $fname = str_replace('\\', '/', dirname(__FILE__) . '/files/Structures_Graph-1.0.3.tgz');
diff --git a/ext/phar/tests/tar/bug64343.phpt b/ext/phar/tests/tar/bug64343.phpt
index ed4501dd6a0ab..bc789ae050d90 100644
--- a/ext/phar/tests/tar/bug64343.phpt
+++ b/ext/phar/tests/tar/bug64343.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #64343 (phar cannot open tars with pax headers)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
index b8004138bc6ce..726f36af7f254 100644
--- a/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
+++ b/ext/phar/tests/tar/bug71317-duplicate-filename.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71317: regression in opening tar based phar files
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/tar/bug71504.phpt b/ext/phar/tests/tar/bug71504.phpt
index 178d4ed750de5..590d526985be0 100644
--- a/ext/phar/tests/tar/bug71504.phpt
+++ b/ext/phar/tests/tar/bug71504.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71504: Parsing of tar file with duplicate filenames causes memory leak
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt
index 8620ca052072a..ba74eadac4676 100644
--- a/ext/phar/tests/tar/create_new_and_modify.phpt
+++ b/ext/phar/tests/tar/create_new_and_modify.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create and modify tar-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt
index 371e47d93b71f..dc0fda1023d6c 100644
--- a/ext/phar/tests/tar/create_new_phar_b.phpt
+++ b/ext/phar/tests/tar/create_new_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create a completely new tar-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=1
diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt
index 32b2b1e28b334..c1ef8b168f6b4 100644
--- a/ext/phar/tests/tar/delete.phpt
+++ b/ext/phar/tests/tar/delete.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete test, tar-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt
index 1982b6bda9c1c..5b029660e841c 100644
--- a/ext/phar/tests/tar/delete_in_phar.phpt
+++ b/ext/phar/tests/tar/delete_in_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a tar-based .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/delete_in_phar_b.phpt b/ext/phar/tests/tar/delete_in_phar_b.phpt
index a67bf7a160e5c..885f17ecc9ee0 100644
--- a/ext/phar/tests/tar/delete_in_phar_b.phpt
+++ b/ext/phar/tests/tar/delete_in_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a tar-based .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt
index 7593ebc1fb0a8..71e1dbbf63dc9 100644
--- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a tar-based .phar (confirm disk file is changed)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/dir.phpt b/ext/phar/tests/tar/dir.phpt
index 64d5d12761263..469d886580e2d 100644
--- a/ext/phar/tests/tar/dir.phpt
+++ b/ext/phar/tests/tar/dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: mkdir/rmdir test tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/exists_as_phar.phpt b/ext/phar/tests/tar/exists_as_phar.phpt
index 9a8cfc81f0079..59a82eccc507d 100644
--- a/ext/phar/tests/tar/exists_as_phar.phpt
+++ b/ext/phar/tests/tar/exists_as_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar-based phar named with ".tar" fails
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/frontcontroller1.phar.phpt b/ext/phar/tests/tar/frontcontroller1.phar.phpt
index 77158169bbb46..cc4e66290bc7c 100644
--- a/ext/phar/tests/tar/frontcontroller1.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller1.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller other tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller1.phar.php
 REQUEST_URI=/frontcontroller1.phar.php/a.jpg
diff --git a/ext/phar/tests/tar/frontcontroller10.phar.phpt b/ext/phar/tests/tar/frontcontroller10.phar.phpt
index f1fc6e3d0fd00..de5975ec45c51 100644
--- a/ext/phar/tests/tar/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller10.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite array invalid tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller10.phar.php
 REQUEST_URI=/frontcontroller10.phar.php/hi
diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt
index 4b8c29dd1bdb6..92b62b39025ac 100644
--- a/ext/phar/tests/tar/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type extension is not a string tar-based
 --INI--
 default_charset=
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.phar.php
diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt
index 53804e476a638..a55511aeba485 100644
--- a/ext/phar/tests/tar/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type unknown int tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.phar.php
 REQUEST_URI=/frontcontroller12.phar.php/a.php
diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt
index 7fc0676aeaf2c..4538026c8adee 100644
--- a/ext/phar/tests/tar/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type not string/int tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.phar.php
 REQUEST_URI=/frontcontroller13.phar.php/a.php
diff --git a/ext/phar/tests/tar/frontcontroller14.phar.phpt b/ext/phar/tests/tar/frontcontroller14.phar.phpt
index c40f9b6c34fb3..a417618c68a4a 100644
--- a/ext/phar/tests/tar/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller14.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type override, other tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.phar.php
 REQUEST_URI=/frontcontroller14.phar.php/a.jpg
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt
index 2147121dbe206..ed6f93c54e227 100644
--- a/ext/phar/tests/tar/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller15.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHPS tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.phar.php
 REQUEST_URI=/frontcontroller15.phar.php/a.php
diff --git a/ext/phar/tests/tar/frontcontroller16.phar.phpt b/ext/phar/tests/tar/frontcontroller16.phar.phpt
index caa0c3119ddbc..4793dffc2f0eb 100644
--- a/ext/phar/tests/tar/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller16.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHP tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.phar.php
 REQUEST_URI=/frontcontroller16.phar.php/a.phps
diff --git a/ext/phar/tests/tar/frontcontroller17.phar.phpt b/ext/phar/tests/tar/frontcontroller17.phar.phpt
index 17d04baf309df..f41d0bd00a20e 100644
--- a/ext/phar/tests/tar/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller17.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type unknown tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.phar.php
 REQUEST_URI=/frontcontroller17.phar.php/fronk.gronk
diff --git a/ext/phar/tests/tar/frontcontroller18.phar.phpt b/ext/phar/tests/tar/frontcontroller18.phar.phpt
index 1dddcef069bfd..ab07faf7db2be 100644
--- a/ext/phar/tests/tar/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller18.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.phar.php
 REQUEST_URI=/frontcontroller18.phar.php/fronk.gronk
diff --git a/ext/phar/tests/tar/frontcontroller19.phar.phpt b/ext/phar/tests/tar/frontcontroller19.phar.phpt
index 21a173f9bef96..1ca82c7dc2a5c 100644
--- a/ext/phar/tests/tar/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller19.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 2 tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller19.phar.php
 REQUEST_URI=/frontcontroller19.phar.php/
diff --git a/ext/phar/tests/tar/frontcontroller2.phar.phpt b/ext/phar/tests/tar/frontcontroller2.phar.phpt
index 82070e3b55aac..15643749e1a5a 100644
--- a/ext/phar/tests/tar/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller2.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller PHP test tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.phar.php
 REQUEST_URI=/frontcontroller2.phar.php/a.php
diff --git a/ext/phar/tests/tar/frontcontroller20.phar.phpt b/ext/phar/tests/tar/frontcontroller20.phar.phpt
index b88903eb53ed6..73ef084a2c300 100644
--- a/ext/phar/tests/tar/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller20.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 3 tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller20.phar.php
 REQUEST_URI=/frontcontroller20.phar.php/
diff --git a/ext/phar/tests/tar/frontcontroller21.phar.phpt b/ext/phar/tests/tar/frontcontroller21.phar.phpt
index a067de7835b64..acd1e9e1c20c0 100644
--- a/ext/phar/tests/tar/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller21.phar.phpt
@@ -4,7 +4,7 @@ Phar front controller $_SERVER munging success tar-based
 default_charset=UTF-8
 cgi.fix_pathinfo=1
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.phar.php
 REQUEST_URI=/frontcontroller21.phar.php/index.php?test=hi
diff --git a/ext/phar/tests/tar/frontcontroller3.phar.phpt b/ext/phar/tests/tar/frontcontroller3.phar.phpt
index 06a4948f6b712..0a461ac618b65 100644
--- a/ext/phar/tests/tar/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller3.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller phps tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.phar.php
 REQUEST_URI=/frontcontroller3.phar.php/a.phps
diff --git a/ext/phar/tests/tar/frontcontroller4.phar.phpt b/ext/phar/tests/tar/frontcontroller4.phar.phpt
index db4846c69b19c..b89aeaa24eb91 100644
--- a/ext/phar/tests/tar/frontcontroller4.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller4.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate (no /) tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller4.phar.php
 REQUEST_URI=/frontcontroller4.phar.php
diff --git a/ext/phar/tests/tar/frontcontroller5.phar.phpt b/ext/phar/tests/tar/frontcontroller5.phar.phpt
index 534e66a1e324b..243db5346ac5a 100644
--- a/ext/phar/tests/tar/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller5.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller5.phar.php
 REQUEST_URI=/frontcontroller5.phar.php/
diff --git a/ext/phar/tests/tar/frontcontroller6.phar.phpt b/ext/phar/tests/tar/frontcontroller6.phar.phpt
index 5375beef8cc8b..8bf55e077980f 100644
--- a/ext/phar/tests/tar/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller6.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller 404 tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.phar.php
 REQUEST_URI=/frontcontroller6.phar.php/notfound.php
diff --git a/ext/phar/tests/tar/frontcontroller7.phar.phpt b/ext/phar/tests/tar/frontcontroller7.phar.phpt
index 3b73f2075c82b..c439bad25c7b0 100644
--- a/ext/phar/tests/tar/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller7.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller alternate index file tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.phar.php
 REQUEST_URI=/frontcontroller7.phar.php/
diff --git a/ext/phar/tests/tar/frontcontroller8.phar.phpt b/ext/phar/tests/tar/frontcontroller8.phar.phpt
index 19844cb19942d..1272ecbeaade3 100644
--- a/ext/phar/tests/tar/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller8.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller no index file 404 tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller8.phar.php
 REQUEST_URI=/frontcontroller8.phar.php/
diff --git a/ext/phar/tests/tar/frontcontroller9.phar.phpt b/ext/phar/tests/tar/frontcontroller9.phar.phpt
index 48e655c75a26a..bf2df0994fcb0 100644
--- a/ext/phar/tests/tar/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller9.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite array tar-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller9.phar.php
 REQUEST_URI=/frontcontroller9.phar.php/hi
diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt
index d702cacc45b75..c5aedca9f1817 100644
--- a/ext/phar/tests/tar/links.phpt
+++ b/ext/phar/tests/tar/links.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with hard link and symbolic link
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/links2.phpt b/ext/phar/tests/tar/links2.phpt
index 1939e002bd4eb..1bb21d6057f84 100644
--- a/ext/phar/tests/tar/links2.phpt
+++ b/ext/phar/tests/tar/links2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with hard link to nowhere
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
diff --git a/ext/phar/tests/tar/links3.phpt b/ext/phar/tests/tar/links3.phpt
index def399e2603c9..3a91e1eec5188 100644
--- a/ext/phar/tests/tar/links3.phpt
+++ b/ext/phar/tests/tar/links3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with link to absolute path
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/links4.phpt b/ext/phar/tests/tar/links4.phpt
index 1d658a72e92c3..4d1c3efa134c9 100644
--- a/ext/phar/tests/tar/links4.phpt
+++ b/ext/phar/tests/tar/links4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with link to root directory file from root directory file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/links5.phpt b/ext/phar/tests/tar/links5.phpt
index 6d11d3eb85549..5067580fdf6e8 100644
--- a/ext/phar/tests/tar/links5.phpt
+++ b/ext/phar/tests/tar/links5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar with relative link to subdirectory file from subdirectory file
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 --FILE--
diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt
index 95fd8fb701042..985b145f9a394 100644
--- a/ext/phar/tests/tar/links6.phpt
+++ b/ext/phar/tests/tar/links6.phpt
@@ -2,7 +2,7 @@
 Phar: test nested linked files
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/open_for_write_existing.phpt b/ext/phar/tests/tar/open_for_write_existing.phpt
index 641e5ce21d6bc..bf4350b80212d 100644
--- a/ext/phar/tests/tar/open_for_write_existing.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (existing file) tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index a6759d8e9202c..9cabca6cfcf90 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file) tar-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 9e778e9279d14..290eafb650d20 100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file) tar-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt
index 31e9d4a7e91eb..184019f206e38 100644
--- a/ext/phar/tests/tar/open_for_write_newfile.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (new file) tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index f31878e3efc05..cf4bc06db2d73 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file) tar-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index 815d41c274693..5e602413d1476 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file) tar-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index 1ef19ab1302b4..e07d29856389e 100644
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -2,7 +2,7 @@
 Phar::startBuffering()/setStub()/stopBuffering() tar-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
index b7d6d56f64dbe..f13b430ade1bc 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file passed in tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt
index 54972cbb0b70f..d897d941af31d 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, iterator returns non-string tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt
index 408775cd75644..21204d5c2d81b 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, key is int tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt
index 65084f3724d7a..d8b3104fd96df 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, file can't be opened tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
index f42640f692cf3..64d08da883f59 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, SplFileInfo as current tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
index f9deef4d9fd01..6d5407aefa0ac 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file resource passed in tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt
index bfbac61a91f0c..b4cfee3b7422f 100644
--- a/ext/phar/tests/tar/phar_commitwrite.phpt
+++ b/ext/phar/tests/tar/phar_commitwrite.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/stopBuffering() tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index c827c218edf72..5b2adce1c7021 100644
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::convertToPhar() from tar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index e21a9843a558c..0715d39a49d8c 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar::convertToPhar() gzipped
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
@@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index 39cf120d2d25d..c3b093760de59 100644
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar::convertToPhar() bzipped
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("bz2")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("bz2")) die("skip bz2 extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
@@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt
index 3ad27dcbc870f..1aaf5276e114e 100644
--- a/ext/phar/tests/tar/phar_convert_phar4.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar4.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar::convertToPhar() with global metadata
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt
index 782bb4fb5da6c..a9da8bd0dde6e 100644
--- a/ext/phar/tests/tar/phar_copy.phpt
+++ b/ext/phar/tests/tar/phar_copy.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: copy() tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt
index 11a36fd930022..610a9ffe052a7 100644
--- a/ext/phar/tests/tar/phar_magic.phpt
+++ b/ext/phar/tests/tar/phar_magic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: include/fopen magic tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt
index a1bc51154cd7c..353df247afaeb 100644
--- a/ext/phar/tests/tar/phar_setalias.phpt
+++ b/ext/phar/tests/tar/phar_setalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias() tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_setalias2.phpt b/ext/phar/tests/tar/phar_setalias2.phpt
index a44cc397c21dd..a7b0b644f25ec 100644
--- a/ext/phar/tests/tar/phar_setalias2.phpt
+++ b/ext/phar/tests/tar/phar_setalias2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias() error tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt
index c1e6642a17656..f24687073ad5b 100644
--- a/ext/phar/tests/tar/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::setDefaultStub() with and without arg, tar-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
index c16e7523f885c..3a12f21a86e76 100644
--- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setSupportedSignatures() with hash, tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("hash")) die("skip extension hash required");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt
index e0d728f6f8419..016ce0ea71154 100644
--- a/ext/phar/tests/tar/phar_stub.phpt
+++ b/ext/phar/tests/tar/phar_stub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub() (tar-based)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt
index 61532b9b42fce..f5de2da3311a9 100644
--- a/ext/phar/tests/tar/phar_stub_error.phpt
+++ b/ext/phar/tests/tar/phar_stub_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/getStub() tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt
index 7b4f05417a0bf..91c598cf30b54 100644
--- a/ext/phar/tests/tar/refcount1.phpt
+++ b/ext/phar/tests/tar/refcount1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test that refcounting avoids problems with deleting a file tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/rename.phpt b/ext/phar/tests/tar/rename.phpt
index 96588a659673f..c58b9d56768b0 100644
--- a/ext/phar/tests/tar/rename.phpt
+++ b/ext/phar/tests/tar/rename.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename test tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/rename_dir.phpt b/ext/phar/tests/tar/rename_dir.phpt
index 0b9578945a6c5..a9f31783ba4b8 100644
--- a/ext/phar/tests/tar/rename_dir.phpt
+++ b/ext/phar/tests/tar/rename_dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename_dir test tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt
index 3841d1dce39d5..4dee918d4ff8a 100644
--- a/ext/phar/tests/tar/require_hash.phpt
+++ b/ext/phar/tests/tar/require_hash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar, require_hash=1, no signature
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/rmdir.phpt b/ext/phar/tests/tar/rmdir.phpt
index be037823d6571..e546b40681a2d 100644
--- a/ext/phar/tests/tar/rmdir.phpt
+++ b/ext/phar/tests/tar/rmdir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rmdir test tar-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt
index a2c4f36fa3855..f6a13ffbc9a46 100644
--- a/ext/phar/tests/tar/tar_001.phpt
+++ b/ext/phar/tests/tar/tar_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar corrupted
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/make_invalid_tar.php.inc';
diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt
index 7fc09c806f78c..f7c45f34e777b 100644
--- a/ext/phar/tests/tar/tar_002.phpt
+++ b/ext/phar/tests/tar/tar_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar corrupted 2
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/tar/tar_003.phpt b/ext/phar/tests/tar/tar_003.phpt
index fe7e1d854e086..b384d91c6ed48 100644
--- a/ext/phar/tests/tar/tar_003.phpt
+++ b/ext/phar/tests/tar/tar_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar, valid 1
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_004.phpt b/ext/phar/tests/tar/tar_004.phpt
index d142857388ba6..70cfe0f2631be 100644
--- a/ext/phar/tests/tar/tar_004.phpt
+++ b/ext/phar/tests/tar/tar_004.phpt
@@ -2,7 +2,7 @@
 Phar: tar-based phar, tar phar with stub, mapPhar()
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt
index d7e6dc0e26e14..61b96948b63fc 100644
--- a/ext/phar/tests/tar/tar_bz2.phpt
+++ b/ext/phar/tests/tar/tar_bz2.phpt
@@ -2,7 +2,7 @@
 Phar: tar-based phar, bzipped tar
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt
index f64962c8c884a..531eed2f702af 100644
--- a/ext/phar/tests/tar/tar_gzip.phpt
+++ b/ext/phar/tests/tar/tar_gzip.phpt
@@ -2,7 +2,7 @@
 Phar: tar-based phar, gzipped tar
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 ?>
 --INI--
diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt
index 91b0da7c72934..fe30258684ebe 100644
--- a/ext/phar/tests/tar/tar_makebz2.phpt
+++ b/ext/phar/tests/tar/tar_makebz2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar, make new bzipped tar
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt
index 93d515280afe7..eeec35adc3e36 100644
--- a/ext/phar/tests/tar/tar_makegz.phpt
+++ b/ext/phar/tests/tar/tar_makegz.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar, make new gzipped tar
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt
index 3d1d0010a0727..032c1c1376a99 100644
--- a/ext/phar/tests/tar/tar_nohash.phpt
+++ b/ext/phar/tests/tar/tar_nohash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar archive, require_hash=1, should not error out
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=1
diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index 210f8815ec1a5..12ce2e5386afe 100644
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar-based phar, third-party tar with no stub, Phar->getStub()
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0
diff --git a/ext/phar/tests/tar/tar_openssl_hash.phpt b/ext/phar/tests/tar/tar_openssl_hash.phpt
index 075136f687538..5fe70a2ede6aa 100644
--- a/ext/phar/tests/tar/tar_openssl_hash.phpt
+++ b/ext/phar/tests/tar/tar_openssl_hash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: tar archive, require_hash=1, OpenSSL hash
 --SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php if (!extension_loaded('phar')) die('skip phar extension not loaded'); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 <?php if (!extension_loaded("openssl")) die("skip openssl not available"); ?>
 --INI--
diff --git a/ext/phar/tests/tar/truncated.phpt b/ext/phar/tests/tar/truncated.phpt
index fbcabb79869e7..62647dd773c82 100644
--- a/ext/phar/tests/tar/truncated.phpt
+++ b/ext/phar/tests/tar/truncated.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: truncated tar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt
index 0127d8bba21aa..da969a53e7276 100644
--- a/ext/phar/tests/test_alias_unset.phpt
+++ b/ext/phar/tests/test_alias_unset.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test for the odd case where we intend to remove an archive from memory
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt
index 7cbf6c05137d3..d8a61d79d3746 100644
--- a/ext/phar/tests/test_signaturealgos.phpt
+++ b/ext/phar/tests/test_signaturealgos.phpt
@@ -2,7 +2,7 @@
 Phar: verify signature parsing works
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("hash")) die("skip extension hash conflicts");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt
index 3da537c13cb7c..6021f7bb9e78f 100644
--- a/ext/phar/tests/test_unset.phpt
+++ b/ext/phar/tests/test_unset.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: ensure unset() works properly on a non-flushed phar archive
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/webphar_compilefail.phpt b/ext/phar/tests/webphar_compilefail.phpt
index ab5532d6be381..118efb346c960 100644
--- a/ext/phar/tests/webphar_compilefail.phpt
+++ b/ext/phar/tests/webphar_compilefail.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::webPhar, open compiled file fails
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.readonly=1
 --FILE--
diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt
index c422fa9843a65..6e29da2e975d7 100644
--- a/ext/phar/tests/withphar.phpt
+++ b/ext/phar/tests/withphar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar run with pecl/phar with default stub
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/nophar.phar';
diff --git a/ext/phar/tests/withphar_web.phpt b/ext/phar/tests/withphar_web.phpt
index 487873a1344e0..7c87da1bef36d 100644
--- a/ext/phar/tests/withphar_web.phpt
+++ b/ext/phar/tests/withphar_web.phpt
@@ -3,7 +3,7 @@ Phar: default web stub, with phar extension
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --ENV--
 SCRIPT_NAME=/withphar_web.php
 REQUEST_URI=/withphar_web.php/web.php
diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt
index c5d587dc9c270..40bec667d8855 100644
--- a/ext/phar/tests/zf_test.phpt
+++ b/ext/phar/tests/zf_test.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test broken app
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/033.phpt b/ext/phar/tests/zip/033.phpt
index c980758a83a33..872771faff6ea 100644
--- a/ext/phar/tests/zip/033.phpt
+++ b/ext/phar/tests/zip/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index 429d3bdd985b9..47d8c105ec414 100644
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::chmod zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/alias_acrobatics.phpt b/ext/phar/tests/zip/alias_acrobatics.phpt
index 2a58e39efc92c..22af536aefaa6 100644
--- a/ext/phar/tests/zip/alias_acrobatics.phpt
+++ b/ext/phar/tests/zip/alias_acrobatics.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: alias edge cases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/all.phpt b/ext/phar/tests/zip/all.phpt
index 1b9f832fb5182..58d01972d1c9e 100644
--- a/ext/phar/tests/zip/all.phpt
+++ b/ext/phar/tests/zip/all.phpt
@@ -2,7 +2,7 @@
 Phar: test that creation of zip-based phar generates valid zip with all bells/whistles
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 if (!extension_loaded("zlib")) die("skip zlib not available");
 if (!extension_loaded("bz2")) die("skip bz2 not available");
 ?>
diff --git a/ext/phar/tests/zip/badalias.phpt b/ext/phar/tests/zip/badalias.phpt
index 0291c4b089845..b69c29359de68 100644
--- a/ext/phar/tests/zip/badalias.phpt
+++ b/ext/phar/tests/zip/badalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: invalid aliases
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib"); ?>
 <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?>
 --FILE--
diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt
index 5ad1344bd7f34..1001ea8969cbe 100644
--- a/ext/phar/tests/zip/bug48791.phpt
+++ b/ext/phar/tests/zip/bug48791.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Bug #48791: open office documents always reported as corrupted by phar extension
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/bzip2.phpt b/ext/phar/tests/zip/bzip2.phpt
index 551e419b8757d..1538bc162848b 100644
--- a/ext/phar/tests/zip/bzip2.phpt
+++ b/ext/phar/tests/zip/bzip2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: process bzip2-compressed zip entry
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt
index 000018aab6979..cff775afa484f 100644
--- a/ext/phar/tests/zip/corrupt_001.phpt
+++ b/ext/phar/tests/zip/corrupt_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (count mismatch)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt
index 345d1d81db957..5b5570ac5ae34 100644
--- a/ext/phar/tests/zip/corrupt_002.phpt
+++ b/ext/phar/tests/zip/corrupt_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (no end of zip record)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt
index 40c5ff1877754..b60aad2b70ce1 100644
--- a/ext/phar/tests/zip/corrupt_003.phpt
+++ b/ext/phar/tests/zip/corrupt_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (truncated file comment)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt
index a36281151d243..dcee07e097e14 100644
--- a/ext/phar/tests/zip/corrupt_004.phpt
+++ b/ext/phar/tests/zip/corrupt_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (central directory offset incorrect)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt
index e3e0d88849d57..84d0ccb8a783e 100644
--- a/ext/phar/tests/zip/corrupt_005.phpt
+++ b/ext/phar/tests/zip/corrupt_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: encrypted zip
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt
index dd7937850f944..5714109367cad 100644
--- a/ext/phar/tests/zip/corrupt_006.phpt
+++ b/ext/phar/tests/zip/corrupt_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: zip with file created from stdin
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt
index 52a6c1e79295a..888316f0880c4 100644
--- a/ext/phar/tests/zip/corrupt_007.phpt
+++ b/ext/phar/tests/zip/corrupt_007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (truncated filename record)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt
index eb706b7e554c9..62304fc12d922 100644
--- a/ext/phar/tests/zip/corrupt_008.phpt
+++ b/ext/phar/tests/zip/corrupt_008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: unsupported compression methods
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt
index 0ca80c00c1e9a..3935bac7e9b9f 100644
--- a/ext/phar/tests/zip/corrupt_009.phpt
+++ b/ext/phar/tests/zip/corrupt_009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: corrupted zip (extra field way too long)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt
index b95a03272afb5..a393db0374d6d 100644
--- a/ext/phar/tests/zip/corrupt_010.phpt
+++ b/ext/phar/tests/zip/corrupt_010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: unable to process zip (zip spanning multiple archives)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 try {
diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt
index 3ff2346f67e0a..673d7a44700c1 100644
--- a/ext/phar/tests/zip/create_new_and_modify.phpt
+++ b/ext/phar/tests/zip/create_new_and_modify.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create and modify zip-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index 5fda5b4fdf7b3..9f9c56b445393 100644
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: create a completely new zip-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=1
diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt
index 06078b3a39c02..caea4b5a040d0 100644
--- a/ext/phar/tests/zip/delete.phpt
+++ b/ext/phar/tests/zip/delete.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete test, zip-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt
index f01280013f068..2476100c2e3a0 100644
--- a/ext/phar/tests/zip/delete_in_phar.phpt
+++ b/ext/phar/tests/zip/delete_in_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a zip-based .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt
index eb1a6cca6a6a9..5bdd4c18c6355 100644
--- a/ext/phar/tests/zip/delete_in_phar_b.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a zip-based .phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
index 008049917706c..9a778714b095d 100644
--- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: delete a file within a zip-based .phar (confirm disk file is changed)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/dir.phpt b/ext/phar/tests/zip/dir.phpt
index 3cbeacd1c1881..75c9e5ac12d64 100644
--- a/ext/phar/tests/zip/dir.phpt
+++ b/ext/phar/tests/zip/dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: mkdir/rmdir test zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/exists_as_phar.phpt b/ext/phar/tests/zip/exists_as_phar.phpt
index ccb37e8187a7e..cd1550e6a538a 100644
--- a/ext/phar/tests/zip/exists_as_phar.phpt
+++ b/ext/phar/tests/zip/exists_as_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: phar-based phar named with ".zip" fails
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/frontcontroller1.phar.phpt b/ext/phar/tests/zip/frontcontroller1.phar.phpt
index b4ace60869e2c..e855a3b18668f 100644
--- a/ext/phar/tests/zip/frontcontroller1.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller1.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller other zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller1.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt
index 56d16c2064ab5..ae7e90ff21bf1 100644
--- a/ext/phar/tests/zip/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite array invalid zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller10.phar.php
 REQUEST_URI=/frontcontroller10.phar.php/hi
diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index c0c555a1a4818..d686db297967c 100644
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type extension is not a string zip-based
 --INI--
 default_charset=
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 <?php die("skip"); ?>
 --ENV--
diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index a74a0d5d32a07..d57afe8ebd921 100644
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type unknown int zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 4ed1dc867069a..a833ceee9b462 100644
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type not string/int zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller14.phar.phpt b/ext/phar/tests/zip/frontcontroller14.phar.phpt
index 496160b12fbf3..b65507148d0e3 100644
--- a/ext/phar/tests/zip/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller14.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type override, other zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
index f6cd29a3c53f7..540c1b4817090 100644
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHPS zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt
index d3f457bea6d1c..66fddbbe0417d 100644
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller mime type override, Phar::PHP zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller17.phar.phpt b/ext/phar/tests/zip/frontcontroller17.phar.phpt
index 5d52653687434..b31fad41ba894 100644
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller mime type unknown zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt
index 3d01527122729..5cebf0d2b6e80 100644
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt
index db66ea48b0a92..85149794267f6 100644
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 2 zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller19.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller2.phar.phpt b/ext/phar/tests/zip/frontcontroller2.phar.phpt
index e143e79f3f6fc..6ba621390fb85 100644
--- a/ext/phar/tests/zip/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller2.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller PHP test zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt
index 3bab3bfd80c98..3d8b1dc3df75c 100644
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller $_SERVER munging failure 3 zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller20.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt
index eb1c7861f738d..acec7524de82e 100644
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -4,7 +4,7 @@ Phar front controller $_SERVER munging success zip-based
 default_charset=UTF-8
 cgi.fix_pathinfo=1
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt
index 88a8a2490d8bc..3278efe58091e 100644
--- a/ext/phar/tests/zip/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller3.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller phps zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller4.phar.phpt b/ext/phar/tests/zip/frontcontroller4.phar.phpt
index ff85eb6ab6071..c374d4d5f6235 100644
--- a/ext/phar/tests/zip/frontcontroller4.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller4.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate (no /) zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller4.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller5.phar.phpt b/ext/phar/tests/zip/frontcontroller5.phar.phpt
index 1705fac4c492b..1328262942c3f 100644
--- a/ext/phar/tests/zip/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller5.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller index.php relocate zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller5.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt
index 15489f6ca7280..dcf80f7b03521 100644
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller 404 zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller7.phar.phpt b/ext/phar/tests/zip/frontcontroller7.phar.phpt
index 828da0aeb4945..a88b815f5c068 100644
--- a/ext/phar/tests/zip/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller7.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller alternate index file zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.phar.php
diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt
index 1b0d133bc7170..f1ce241901c17 100644
--- a/ext/phar/tests/zip/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar front controller no index file 404 zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller8.phar.php
 REQUEST_URI=/frontcontroller8.phar.php/
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
index 4f12c9cd430e7..fb0a3aaffecdb 100644
--- a/ext/phar/tests/zip/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -3,7 +3,7 @@ Phar front controller rewrite array zip-based
 --INI--
 default_charset=UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller9.phar.php
 REQUEST_URI=/frontcontroller9.phar.php/hi
diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt
index 9c917633c9201..4d8e1fbbe0a05 100644
--- a/ext/phar/tests/zip/getalias.phpt
+++ b/ext/phar/tests/zip/getalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: getAlias() with an existing phar.zip
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/largezip.phpt b/ext/phar/tests/zip/largezip.phpt
index a8438eb7b721d..c2ebea180a340 100644
--- a/ext/phar/tests/zip/largezip.phpt
+++ b/ext/phar/tests/zip/largezip.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: large zip file (zip edge cases)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded");?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/metadata_write_commit.phpt b/ext/phar/tests/zip/metadata_write_commit.phpt
index 0de63401ceb1a..66cc1b06035f5 100644
--- a/ext/phar/tests/zip/metadata_write_commit.phpt
+++ b/ext/phar/tests/zip/metadata_write_commit.phpt
@@ -2,7 +2,7 @@
 Phar with meta-data (write) zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt
index ab4ff52e1ef73..1b92aafe28251 100644
--- a/ext/phar/tests/zip/notphar.phpt
+++ b/ext/phar/tests/zip/notphar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: a non-executable zip with no stub named .phar.zip
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=1
 detect_unicode=0
diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt
index 20f9f112df33e..3289b8de48fd0 100644
--- a/ext/phar/tests/zip/odt.phpt
+++ b/ext/phar/tests/zip/odt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test a zip archive created by openoffice
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt
index 94f85b4e3f753..84df1a2988071 100644
--- a/ext/phar/tests/zip/open_for_write_existing.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (existing file) zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index e77beaecefeef..1e05054333aa9 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file) zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 44c8f8bb30fca..630845949133b 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (existing file) zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt
index c3782d4fd3d11..bcdd75072d61c 100644
--- a/ext/phar/tests/zip/open_for_write_newfile.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: fopen a .phar for writing (new file) zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index da2b18beb0266..fdbed35725ae0 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file) zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index b94448b347fc9..495f2bbf5e736 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -2,7 +2,7 @@
 Phar: fopen a .phar for writing (new file) zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index fe200949e8832..d601cfc59487d 100644
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -2,7 +2,7 @@
 Phar::startBuffering()/setStub()/stopBuffering() zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
index cc11fe553725d..1cc5e2b4988d8 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file passed in zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
index 1d14686d5bc68..dc35c9d97cc4f 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, iterator returns non-string zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
index 936dda9f6dff4..d77b1800027da 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, key is int zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
index 777dbf86dd792..09f433e23fcb7 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, file can't be opened zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
index d2b1be2087cd9..44d76a06e8a51 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, SplFileInfo as current zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
index 0b56307545677..6022700ebfb00 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::buildFromIterator() iterator, 1 file resource passed in
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt
index eb3aeae04b9ec..b94378f0710f0 100644
--- a/ext/phar/tests/zip/phar_commitwrite.phpt
+++ b/ext/phar/tests/zip/phar_commitwrite.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/stopBuffering() zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index 9cf942bd0ace7..da78bfcd4a33f 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::convertToPhar() from zip
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt
index d4d00a125931b..b05972c8e5eec 100644
--- a/ext/phar/tests/zip/phar_copy.phpt
+++ b/ext/phar/tests/zip/phar_copy.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: copy() zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=1
diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt
index 4dfdd2e84dd7b..1e20230588ff2 100644
--- a/ext/phar/tests/zip/phar_magic.phpt
+++ b/ext/phar/tests/zip/phar_magic.phpt
@@ -2,7 +2,7 @@
 Phar: include/fopen magic zip-based
 --SKIPIF--
 <?php
-if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("phar")) die("skip phar extension not loaded");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
index 7632bd03b3798..299cfd3e8fd33 100644
--- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
+++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::compressFiles(Phar::BZ2) zip format
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not present"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt
index 97b9e19d6e2b5..b73402c519e70 100644
--- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt
+++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::compressFiles(Phar::GZ) zip format
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not present"); ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_setalias.phpt b/ext/phar/tests/zip/phar_setalias.phpt
index 1a39633863942..f392afbf81558 100644
--- a/ext/phar/tests/zip/phar_setalias.phpt
+++ b/ext/phar/tests/zip/phar_setalias.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias() zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip no zlib"); ?>
 <?php if (!extension_loaded("bz2")) die("skip no bz2"); ?>
 --INI--
diff --git a/ext/phar/tests/zip/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt
index c89f4c777a784..8ae92f1794da0 100644
--- a/ext/phar/tests/zip/phar_setalias2.phpt
+++ b/ext/phar/tests/zip/phar_setalias2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setAlias() error zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt
index e21d764487845..6574164403e7b 100644
--- a/ext/phar/tests/zip/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: Phar::setDefaultStub() with and without arg, zip-based phar
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
index 7d3730c4161ed..6d6096254e385 100644
--- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setSupportedSignatures() with hash, zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("hash")) die("skip extension hash required");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt
index a2a6aa6f2a1b4..1ca819d3c3c3f 100644
--- a/ext/phar/tests/zip/phar_stub.phpt
+++ b/ext/phar/tests/zip/phar_stub.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub() (zip-based)
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt
index dafb312cf288a..4a1cd7b2e632b 100644
--- a/ext/phar/tests/zip/phar_stub_error.phpt
+++ b/ext/phar/tests/zip/phar_stub_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar::setStub()/getStub() zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index 82a6f5218fbb1..dcc5526013071 100644
--- a/ext/phar/tests/zip/refcount1.phpt
+++ b/ext/phar/tests/zip/refcount1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test that refcounting avoids problems with deleting a file zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt
index 9b1f5c98cdadc..409dc0cae3bca 100644
--- a/ext/phar/tests/zip/rename.phpt
+++ b/ext/phar/tests/zip/rename.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename test zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt
index bb03c7fd66f2d..c9f9bd3a63d7a 100644
--- a/ext/phar/tests/zip/rename_dir.phpt
+++ b/ext/phar/tests/zip/rename_dir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rename_dir test zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/rmdir.phpt b/ext/phar/tests/zip/rmdir.phpt
index c7ef9dacacd75..b869c17776141 100644
--- a/ext/phar/tests/zip/rmdir.phpt
+++ b/ext/phar/tests/zip/rmdir.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: rmdir test zip-based
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt
index d6cbe47898e52..db506c622235c 100644
--- a/ext/phar/tests/zip/unixzip.phpt
+++ b/ext/phar/tests/zip/unixzip.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: test a zip archive created by unix "zip" command
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 --FILE--
 <?php
 $a = new PharData(dirname(__FILE__) . '/files/zip.zip');
diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt
index bb3e012be2643..88a88119bcc37 100644
--- a/ext/phar/tests/zip/zlib.phpt
+++ b/ext/phar/tests/zip/zlib.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar: process zlib-compressed zip alias
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?>
 <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt
index 62615d17a2480..49e84d1a6052a 100644
--- a/ext/simplexml/tests/000.phpt
+++ b/ext/simplexml/tests/000.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: var_dump()
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/001-mb.phpt b/ext/simplexml/tests/001-mb.phpt
index ee4d6f085fc11..f627f078cd855 100644
--- a/ext/simplexml/tests/001-mb.phpt
+++ b/ext/simplexml/tests/001-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple document
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt
index 0be77710e5fbb..2003e2d5978e2 100644
--- a/ext/simplexml/tests/001.phpt
+++ b/ext/simplexml/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple document
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt
index 4f1f6b622406c..5f00c6a07815d 100644
--- a/ext/simplexml/tests/002.phpt
+++ b/ext/simplexml/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: clone
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt
index 105f616d60e52..0bd8593f283ea 100644
--- a/ext/simplexml/tests/003.phpt
+++ b/ext/simplexml/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Entities
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt
index 21cb5469e0106..4b008fd90db23 100644
--- a/ext/simplexml/tests/004.phpt
+++ b/ext/simplexml/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: CDATA
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt
index 1411065435146..f0d0399b0b667 100644
--- a/ext/simplexml/tests/005.phpt
+++ b/ext/simplexml/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Text data
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt
index 72ad0c80893d2..ce1b8aff5a6ec 100644
--- a/ext/simplexml/tests/006.phpt
+++ b/ext/simplexml/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt
index 51d7a847f7e58..da7f2bcbac8a0 100644
--- a/ext/simplexml/tests/007.phpt
+++ b/ext/simplexml/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attributes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt
index f6c41f43e5a23..ce504733f638f 100644
--- a/ext/simplexml/tests/008.phpt
+++ b/ext/simplexml/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: XPath 
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt
index a76f3d1116172..6782c43510d79 100644
--- a/ext/simplexml/tests/009.phpt
+++ b/ext/simplexml/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach 
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $sxe = simplexml_load_string(<<<EOF
diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt
index dba300c72fbd9..5566369dc5cca 100644
--- a/ext/simplexml/tests/009b.phpt
+++ b/ext/simplexml/tests/009b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach 
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $sxe = simplexml_load_string(<<<EOF
diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt
index 267780905b8c8..c57dbab616d4f 100644
--- a/ext/simplexml/tests/010.phpt
+++ b/ext/simplexml/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple Inheritance
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index d1d736e7b59ce..d1e1e04f1d776 100644
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (direct)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index 649828b4ddf59..3fefe5fac3106 100644
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (single)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 034396751a259..e327a8cff0932 100644
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (second)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt
index 11e9cd55cda2a..8d96586e02353 100644
--- a/ext/simplexml/tests/015.phpt
+++ b/ext/simplexml/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: accessing singular subnode as array
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index ab80a7a19aa10..482e7e12719bd 100644
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: modifying attributes of singular subnode
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt
index 9797e2930564b..35931dad4a697 100644
--- a/ext/simplexml/tests/016a.phpt
+++ b/ext/simplexml/tests/016a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: concatenating attributes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/017.phpt b/ext/simplexml/tests/017.phpt
index ba42ac46a93ff..bda4a2f9aa1ad 100644
--- a/ext/simplexml/tests/017.phpt
+++ b/ext/simplexml/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: iteration through subnodes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt
index e5c810944e915..7b2a87212642f 100644
--- a/ext/simplexml/tests/018.phpt
+++ b/ext/simplexml/tests/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: iteration through subnodes and attributes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt
index aec74ba42e71a..dac85d409104c 100644
--- a/ext/simplexml/tests/019.phpt
+++ b/ext/simplexml/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach with children()
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/020.phpt b/ext/simplexml/tests/020.phpt
index 9e91b5ac3a976..25cdb5196a622 100644
--- a/ext/simplexml/tests/020.phpt
+++ b/ext/simplexml/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attribute compared to string
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?> 
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?> 
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/021.phpt b/ext/simplexml/tests/021.phpt
index d5138685f5e12..68e10a75cc397 100644
--- a/ext/simplexml/tests/021.phpt
+++ b/ext/simplexml/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Element check
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?> 
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?> 
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt
index 2af4a1dd280fd..2982c51326e2b 100644
--- a/ext/simplexml/tests/022.phpt
+++ b/ext/simplexml/tests/022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attributes inside foreach
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt
index 515a1460c9d4f..1ae755dda22c1 100644
--- a/ext/simplexml/tests/023.phpt
+++ b/ext/simplexml/tests/023.phpt
@@ -1,9 +1,9 @@
 --TEST--
 SimpleXML: Attributes with entities
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/024.phpt b/ext/simplexml/tests/024.phpt
index 9f31fd5e93ff1..582f23f1e8ea2 100644
--- a/ext/simplexml/tests/024.phpt
+++ b/ext/simplexml/tests/024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: XPath and attributes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/025.phpt b/ext/simplexml/tests/025.phpt
index 955410a5eeb97..dfa79b441698e 100644
--- a/ext/simplexml/tests/025.phpt
+++ b/ext/simplexml/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: getting namespaces
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt
index 7b6ca54183dfd..48b1b3df51315 100644
--- a/ext/simplexml/tests/026.phpt
+++ b/ext/simplexml/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: getName()
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/027.phpt b/ext/simplexml/tests/027.phpt
index a531ccad46fbe..7d8465a3edae5 100644
--- a/ext/simplexml/tests/027.phpt
+++ b/ext/simplexml/tests/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Adding an elements
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt
index 9adb923ddc269..2a1dbcced25ab 100644
--- a/ext/simplexml/tests/028.phpt
+++ b/ext/simplexml/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Adding an elements without text
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt
index 117e6b7939568..3d04a0ae094d4 100644
--- a/ext/simplexml/tests/029.phpt
+++ b/ext/simplexml/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach and count
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/030.phpt b/ext/simplexml/tests/030.phpt
index 774a5f14595ae..49f1ef4a60b6c 100644
--- a/ext/simplexml/tests/030.phpt
+++ b/ext/simplexml/tests/030.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: isset and unset by offset
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt
index cd2d266ba1e8e..8ab00c75bc7d4 100644
--- a/ext/simplexml/tests/031.phpt
+++ b/ext/simplexml/tests/031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: addChild and addAttribute
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt
index 55e2bc186d68e..763f12a5f7f1b 100644
--- a/ext/simplexml/tests/032.phpt
+++ b/ext/simplexml/tests/032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: comparing instances
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/033.phpt b/ext/simplexml/tests/033.phpt
index ba01b21555b0f..a3652ccba0d67 100644
--- a/ext/simplexml/tests/033.phpt
+++ b/ext/simplexml/tests/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: casting instances
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/034.phpt b/ext/simplexml/tests/034.phpt
index 3d52a60a0c219..e7ab66c56061d 100644
--- a/ext/simplexml/tests/034.phpt
+++ b/ext/simplexml/tests/034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: cast to array
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $string = '<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/035.phpt b/ext/simplexml/tests/035.phpt
index 2162c865f3b1a..d8d2b7db18e75 100644
--- a/ext/simplexml/tests/035.phpt
+++ b/ext/simplexml/tests/035.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: __toString
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $string = '<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/036.phpt b/ext/simplexml/tests/036.phpt
index 24bfe60e7dc3c..ca4d2c5fdab5f 100644
--- a/ext/simplexml/tests/036.phpt
+++ b/ext/simplexml/tests/036.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: overriden count() method
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 class SXE extends SimpleXmlElement {
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
index fc918798a5216..2ed3eac6c13be 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXMLElement->addAttribute()
 --SKIPIF-- 
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
+<?php if (!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE-- 
 <?php
 	$simple = simplexml_load_file(dirname(__FILE__)."/book.xml");
diff --git a/ext/simplexml/tests/bug27010.phpt b/ext/simplexml/tests/bug27010.phpt
index 364ca4675fe22..e684b58ecad0a 100644
--- a/ext/simplexml/tests/bug27010.phpt
+++ b/ext/simplexml/tests/bug27010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27010 (segfault and node text not displayed when returned from children())
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug35785.phpt b/ext/simplexml/tests/bug35785.phpt
index 10bae9ca10470..8bbad96548e58 100644
--- a/ext/simplexml/tests/bug35785.phpt
+++ b/ext/simplexml/tests/bug35785.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #35785 (SimpleXML memory read error)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt
index fdcfd4743c1a4..fdb19ca5869ef 100644
--- a/ext/simplexml/tests/bug36611.phpt
+++ b/ext/simplexml/tests/bug36611.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36611 (assignment to SimpleXML object attribute changes argument type to string)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug37076.phpt b/ext/simplexml/tests/bug37076.phpt
index c7f19b3cc2a3c..f7ab017d42746 100644
--- a/ext/simplexml/tests/bug37076.phpt
+++ b/ext/simplexml/tests/bug37076.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37076 (SimpleXML ignores .=)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = simplexml_load_string("<root><foo /></root>");
diff --git a/ext/simplexml/tests/bug37076_1.phpt b/ext/simplexml/tests/bug37076_1.phpt
index d4f4e03337bfd..2fcb9e934e85c 100644
--- a/ext/simplexml/tests/bug37076_1.phpt
+++ b/ext/simplexml/tests/bug37076_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = simplexml_load_string("<root><foo /></root>");
diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt
index 0af93deaf3219..7ea6a86942db5 100644
--- a/ext/simplexml/tests/bug37565.phpt
+++ b/ext/simplexml/tests/bug37565.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37565 (Using reflection::export with simplexml causing a crash)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38347.phpt b/ext/simplexml/tests/bug38347.phpt
index 0ea7b5d2fef36..df14a5ce56d76 100644
--- a/ext/simplexml/tests/bug38347.phpt
+++ b/ext/simplexml/tests/bug38347.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38347 (Segmentation fault when using foreach with an unknown/empty SimpleXMLElement)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt
index 04ed8f2823047..0ecbfc7fb62cb 100644
--- a/ext/simplexml/tests/bug38354.phpt
+++ b/ext/simplexml/tests/bug38354.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38354 (Unwanted reformatting of XML when using AsXML)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt
index c64b52b8477e7..c519cf53c7167 100644
--- a/ext/simplexml/tests/bug38406.phpt
+++ b/ext/simplexml/tests/bug38406.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38406 (crash when assigning objects to SimpleXML attributes)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38424.phpt b/ext/simplexml/tests/bug38424.phpt
index baab45fe54575..5362520f4f95e 100644
--- a/ext/simplexml/tests/bug38424.phpt
+++ b/ext/simplexml/tests/bug38424.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38424 (Different attribute assignment if new or exists)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug40451.phpt b/ext/simplexml/tests/bug40451.phpt
index afd78c769f9f5..63932140bc334 100644
--- a/ext/simplexml/tests/bug40451.phpt
+++ b/ext/simplexml/tests/bug40451.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40451 (addAttribute() may crash when used with non-existent child node)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt
index db03da977ed65..4e39f9044a9f7 100644
--- a/ext/simplexml/tests/bug41175.phpt
+++ b/ext/simplexml/tests/bug41175.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41175 (addAttribute() fails to add an attribute with an empty value)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41582.phpt b/ext/simplexml/tests/bug41582.phpt
index 8733810d71a3b..53ca0d5468b0a 100644
--- a/ext/simplexml/tests/bug41582.phpt
+++ b/ext/simplexml/tests/bug41582.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41582 (SimpleXML crashes when accessing newly created element)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41861.phpt b/ext/simplexml/tests/bug41861.phpt
index 607d301f7b4ea..d80be470c28de 100644
--- a/ext/simplexml/tests/bug41861.phpt
+++ b/ext/simplexml/tests/bug41861.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41861 (getNamespaces() returns the namespaces of a node's siblings)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41867.phpt b/ext/simplexml/tests/bug41867.phpt
index 33e2de9e22a4e..2e42fad036ea2 100644
--- a/ext/simplexml/tests/bug41867.phpt
+++ b/ext/simplexml/tests/bug41867.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41867 (getName is broken)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41947.phpt b/ext/simplexml/tests/bug41947.phpt
index 0b974ce4f5aa7..d60222ea54520 100644
--- a/ext/simplexml/tests/bug41947.phpt
+++ b/ext/simplexml/tests/bug41947.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41947 (addChild incorrectly registers empty strings as namespaces)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><root xmlns:myns="http://myns" />');
diff --git a/ext/simplexml/tests/bug43221.phpt b/ext/simplexml/tests/bug43221.phpt
index 53b6efdccdd4c..a15e74d2cc9fc 100644
--- a/ext/simplexml/tests/bug43221.phpt
+++ b/ext/simplexml/tests/bug43221.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43221 (SimpleXML adding default namespace in addAttribute)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><root />');
diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt
index 377754f792e9f..2d60e4d3961cb 100644
--- a/ext/simplexml/tests/bug44478.phpt
+++ b/ext/simplexml/tests/bug44478.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44478 (Inconsistent behaviour when assigning new nodes)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml_element = new simpleXMLElement('<root></root>');
diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt
index 663449855634d..360e0e355453a 100644
--- a/ext/simplexml/tests/bug45553.phpt
+++ b/ext/simplexml/tests/bug45553.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45553 (Using XPath to return values for attributes with a namespace does not work)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml =<<<XML
diff --git a/ext/simplexml/tests/bug46003.phpt b/ext/simplexml/tests/bug46003.phpt
index e21a4ce742151..91e7fcf84c9d1 100644
--- a/ext/simplexml/tests/bug46003.phpt
+++ b/ext/simplexml/tests/bug46003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46003 (isset on nonexisting nodes return unexpected results)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml =<<<XML
diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt
index 61b6316e6d5bd..007dde4531e7a 100644
--- a/ext/simplexml/tests/bug46047.phpt
+++ b/ext/simplexml/tests/bug46047.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46047 (SimpleXML converts empty nodes into object with nested array)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>', 
diff --git a/ext/simplexml/tests/bug46048.phpt b/ext/simplexml/tests/bug46048.phpt
index 97fc9ed083019..5b56f2491fcf0 100644
--- a/ext/simplexml/tests/bug46048.phpt
+++ b/ext/simplexml/tests/bug46048.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46048 (SimpleXML top-level @attributes not part of iterator)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 $xml = '
diff --git a/ext/simplexml/tests/bug48601.phpt b/ext/simplexml/tests/bug48601.phpt
index 20d6060a365b7..6973bf1ee5925 100644
--- a/ext/simplexml/tests/bug48601.phpt
+++ b/ext/simplexml/tests/bug48601.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48601 (xpath() returns FALSE for legitimate query)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt
index c96b3ae7cad91..fa1aac3618d59 100644
--- a/ext/simplexml/tests/bug51615.phpt
+++ b/ext/simplexml/tests/bug51615.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #51615 (PHP crash with wrong HTML in SimpleXML)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; 
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); 
  if (!extension_loaded("dom")) print "skip";
 ?>
 --FILE--
diff --git a/ext/simplexml/tests/bug62328.phpt b/ext/simplexml/tests/bug62328.phpt
index a6e60e488c554..3a80dbe0ffcb6 100644
--- a/ext/simplexml/tests/bug62328.phpt
+++ b/ext/simplexml/tests/bug62328.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62328 (implementing __toString and a cast to string fails)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 class UberSimpleXML extends SimpleXMLElement {
diff --git a/ext/simplexml/tests/foreach_by_reference.phpt b/ext/simplexml/tests/foreach_by_reference.phpt
index 070a3cf2cdb75..da4826a12cad8 100644
--- a/ext/simplexml/tests/foreach_by_reference.phpt
+++ b/ext/simplexml/tests/foreach_by_reference.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXml: foreach by reference
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile01.phpt b/ext/simplexml/tests/profile01.phpt
index 91b9544f66bc1..79bb7fa142a24 100644
--- a/ext/simplexml/tests/profile01.phpt
+++ b/ext/simplexml/tests/profile01.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a simple node
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile02.phpt b/ext/simplexml/tests/profile02.phpt
index 14b5bb86b28f4..64147b6e70a43 100644
--- a/ext/simplexml/tests/profile02.phpt
+++ b/ext/simplexml/tests/profile02.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an array of subnodes
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile03.phpt b/ext/simplexml/tests/profile03.phpt
index 14f1c5fe8886c..f16c5fb9629cc 100644
--- a/ext/simplexml/tests/profile03.phpt
+++ b/ext/simplexml/tests/profile03.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an attribute
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile04.phpt b/ext/simplexml/tests/profile04.phpt
index 27714e992710b..16068e749e334 100644
--- a/ext/simplexml/tests/profile04.phpt
+++ b/ext/simplexml/tests/profile04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced element
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php 
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile05.phpt b/ext/simplexml/tests/profile05.phpt
index f69622118a1ae..64f3cd1aa9fff 100644
--- a/ext/simplexml/tests/profile05.phpt
+++ b/ext/simplexml/tests/profile05.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an aliased namespaced element
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile06.phpt b/ext/simplexml/tests/profile06.phpt
index e519fa9d642c9..f889b85a03637 100644
--- a/ext/simplexml/tests/profile06.phpt
+++ b/ext/simplexml/tests/profile06.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced attribute
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile07.phpt b/ext/simplexml/tests/profile07.phpt
index c8a426927439a..52cfb8cc70463 100644
--- a/ext/simplexml/tests/profile07.phpt
+++ b/ext/simplexml/tests/profile07.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an aliased namespaced attribute
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile08.phpt b/ext/simplexml/tests/profile08.phpt
index bbb69b75a8c5c..ca4b5f70d7aab 100644
--- a/ext/simplexml/tests/profile08.phpt
+++ b/ext/simplexml/tests/profile08.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced attribute without a namespace
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile09.phpt b/ext/simplexml/tests/profile09.phpt
index 714572df1efb9..cb7221f64f5cf 100644
--- a/ext/simplexml/tests/profile09.phpt
+++ b/ext/simplexml/tests/profile09.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced element without a namespace
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile10.phpt b/ext/simplexml/tests/profile10.phpt
index 6ef7456c51ea2..0e09c5fe097b9 100644
--- a/ext/simplexml/tests/profile10.phpt
+++ b/ext/simplexml/tests/profile10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing two attributes with the same name, but different namespaces
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile11.phpt b/ext/simplexml/tests/profile11.phpt
index 54c31bf7101e1..380199cb3cf39 100644
--- a/ext/simplexml/tests/profile11.phpt
+++ b/ext/simplexml/tests/profile11.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing two elements with the same name, but different namespaces
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt
index 51a0d355312c3..6b6f53d8396b9 100644
--- a/ext/simplexml/tests/profile12.phpt
+++ b/ext/simplexml/tests/profile12.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing namespaced root and non namespaced children
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile13.phpt b/ext/simplexml/tests/profile13.phpt
index 2ae89e7449336..ad38e4b094e67 100644
--- a/ext/simplexml/tests/profile13.phpt
+++ b/ext/simplexml/tests/profile13.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing by namespace prefix
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+<?php if(!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/simplexml_import_dom.phpt b/ext/simplexml/tests/simplexml_import_dom.phpt
index e108e0554d176..2b235c8ab49f6 100644
--- a/ext/simplexml/tests/simplexml_import_dom.phpt
+++ b/ext/simplexml/tests/simplexml_import_dom.phpt
@@ -1,10 +1,10 @@
 --TEST--
 SimpleXML [interop]: simplexml_import_dom
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
+<?php if (!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 <?php if (!extension_loaded("dom")) die("skip dom extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 $dom = new domDocument;
 $dom->load(dirname(__FILE__)."/book.xml");
 if(!$dom) {
diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt
index 1442a0ed4765c..c2ce0252765a6 100644
--- a/ext/simplexml/tests/simplexml_load_file.phpt
+++ b/ext/simplexml/tests/simplexml_load_file.phpt
@@ -1,7 +1,7 @@
 --TEST--
 simplexml_load_file()
 --SKIPIF-- 
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
+<?php if (!extension_loaded("simplexml")) die("skip simplexml extension not loaded"); ?>
 --FILE-- 
 <?php
 	$simple = simplexml_load_file(dirname(__FILE__)."/book.xml");
diff --git a/ext/sodium/tests/crypto_auth.phpt b/ext/sodium/tests/crypto_auth.phpt
index 3c6e75098a031..b724f2d1276ad 100644
--- a/ext/sodium/tests/crypto_auth.phpt
+++ b/ext/sodium/tests/crypto_auth.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium auth
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $msg = random_bytes(1000);
diff --git a/ext/sodium/tests/crypto_box.phpt b/ext/sodium/tests/crypto_box.phpt
index 392fad1d91b1a..0538feb7c3b61 100644
--- a/ext/sodium/tests/crypto_box.phpt
+++ b/ext/sodium/tests/crypto_box.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium box
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $keypair = sodium_crypto_box_keypair();
diff --git a/ext/sodium/tests/crypto_generichash.phpt b/ext/sodium/tests/crypto_generichash.phpt
index 5a7b0c4285048..27ba6abfd62e8 100644
--- a/ext/sodium/tests/crypto_generichash.phpt
+++ b/ext/sodium/tests/crypto_generichash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium generichash
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $q = sodium_crypto_generichash('msg');
diff --git a/ext/sodium/tests/crypto_hex.phpt b/ext/sodium/tests/crypto_hex.phpt
index 0f872ee8676ba..94b430d536420 100644
--- a/ext/sodium/tests/crypto_hex.phpt
+++ b/ext/sodium/tests/crypto_hex.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium bin2hex
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $bin = random_bytes(random_int(1, 1000));
diff --git a/ext/sodium/tests/crypto_kdf.phpt b/ext/sodium/tests/crypto_kdf.phpt
index c9f0949ed0f60..b734215a9ac95 100644
--- a/ext/sodium/tests/crypto_kdf.phpt
+++ b/ext/sodium/tests/crypto_kdf.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium KDF
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $key = sodium_crypto_kdf_keygen();
diff --git a/ext/sodium/tests/crypto_kx.phpt b/ext/sodium/tests/crypto_kx.phpt
index a1dd00a0a73d0..5d55afe8f16ee 100644
--- a/ext/sodium/tests/crypto_kx.phpt
+++ b/ext/sodium/tests/crypto_kx.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium-based key exchange
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $client_seed = sodium_hex2bin('0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef');
diff --git a/ext/sodium/tests/crypto_scalarmult.phpt b/ext/sodium/tests/crypto_scalarmult.phpt
index 2636963e32d8b..2212a7b5e834d 100644
--- a/ext/sodium/tests/crypto_scalarmult.phpt
+++ b/ext/sodium/tests/crypto_scalarmult.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium scalarmult
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $n = sodium_hex2bin("5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb");
diff --git a/ext/sodium/tests/crypto_secretbox.phpt b/ext/sodium/tests/crypto_secretbox.phpt
index b9d4d1ccfe5dc..c390a694b6b8c 100644
--- a/ext/sodium/tests/crypto_secretbox.phpt
+++ b/ext/sodium/tests/crypto_secretbox.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium secretbox
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
diff --git a/ext/sodium/tests/crypto_shorthash.phpt b/ext/sodium/tests/crypto_shorthash.phpt
index 68bffc823b00b..7ae633b389ffe 100644
--- a/ext/sodium/tests/crypto_shorthash.phpt
+++ b/ext/sodium/tests/crypto_shorthash.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium shorthash
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $m1 = 'message';
diff --git a/ext/sodium/tests/crypto_sign.phpt b/ext/sodium/tests/crypto_sign.phpt
index 14e0c49e91e18..c433098228813 100644
--- a/ext/sodium/tests/crypto_sign.phpt
+++ b/ext/sodium/tests/crypto_sign.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium ed25519 signatures
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $keypair = sodium_crypto_sign_keypair();
diff --git a/ext/sodium/tests/crypto_stream.phpt b/ext/sodium/tests/crypto_stream.phpt
index 27e163c071aa7..9366e4873a7ce 100644
--- a/ext/sodium/tests/crypto_stream.phpt
+++ b/ext/sodium/tests/crypto_stream.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium stream
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $nonce = random_bytes(SODIUM_CRYPTO_STREAM_NONCEBYTES);
diff --git a/ext/sodium/tests/exception_trace_without_args.phpt b/ext/sodium/tests/exception_trace_without_args.phpt
index 4885f9309331d..64c55fbdd5d4f 100644
--- a/ext/sodium/tests/exception_trace_without_args.phpt
+++ b/ext/sodium/tests/exception_trace_without_args.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SodiumException backtraces do not contain function arguments
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/sodium/tests/inc_add.phpt b/ext/sodium/tests/inc_add.phpt
index 23410d140c7b8..18027f4aca699 100644
--- a/ext/sodium/tests/inc_add.phpt
+++ b/ext/sodium/tests/inc_add.phpt
@@ -1,7 +1,7 @@
 --TEST--
 increment and add edge cases
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/sodium/tests/installed.phpt b/ext/sodium/tests/installed.phpt
index e548b5f8dcceb..2f4b01bbc7526 100644
--- a/ext/sodium/tests/installed.phpt
+++ b/ext/sodium/tests/installed.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for sodium presence
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 echo "sodium extension is available";
diff --git a/ext/sodium/tests/pwhash_argon2i.phpt b/ext/sodium/tests/pwhash_argon2i.phpt
index aee90bd6face5..016f65b09ee8a 100644
--- a/ext/sodium/tests/pwhash_argon2i.phpt
+++ b/ext/sodium/tests/pwhash_argon2i.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium argon2i
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip";
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded");
 if (!defined('SODIUM_CRYPTO_PWHASH_SALTBYTES')) print "skip libsodium without argon2i"; ?>
 --FILE--
 <?php
diff --git a/ext/sodium/tests/pwhash_scrypt.phpt b/ext/sodium/tests/pwhash_scrypt.phpt
index 92db7ac7e00f0..a4e54f99f6c51 100644
--- a/ext/sodium/tests/pwhash_scrypt.phpt
+++ b/ext/sodium/tests/pwhash_scrypt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium scrypt
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip";
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded");
 if (!defined('SODIUM_CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES')) print "skip libsodium without scrypt"; ?>
 --FILE--
 <?php
diff --git a/ext/sodium/tests/utils.phpt b/ext/sodium/tests/utils.phpt
index ff380ff78ca3e..fe78df42b281c 100644
--- a/ext/sodium/tests/utils.phpt
+++ b/ext/sodium/tests/utils.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium utils
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 $a = 'test';
diff --git a/ext/sodium/tests/version.phpt b/ext/sodium/tests/version.phpt
index f13345ea07018..2524464457002 100644
--- a/ext/sodium/tests/version.phpt
+++ b/ext/sodium/tests/version.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for libsodium version
 --SKIPIF--
-<?php if (!extension_loaded("sodium")) print "skip"; ?>
+<?php if(!extension_loaded("sodium")) die("skip sodium extension not loaded"); ?>
 --FILE--
 <?php
 echo strlen(SODIUM_LIBRARY_VERSION) >= 5;
diff --git a/ext/sqlite3/tests/bug63921-32bit.phpt b/ext/sqlite3/tests/bug63921-32bit.phpt
index d2cc7b20022c7..20b6849052ffb 100644
--- a/ext/sqlite3/tests/bug63921-32bit.phpt
+++ b/ext/sqlite3/tests/bug63921-32bit.phpt
@@ -2,7 +2,7 @@
 Bug #63921 sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 if (PHP_INT_SIZE > 4) die('skip'); // skip for 64bit builds - there is another test for that
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/bug63921-64bit.phpt b/ext/sqlite3/tests/bug63921-64bit.phpt
index d6c539e185a36..b72caaf268921 100644
--- a/ext/sqlite3/tests/bug63921-64bit.phpt
+++ b/ext/sqlite3/tests/bug63921-64bit.phpt
@@ -2,7 +2,7 @@
 Bug #63921 sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 if (PHP_INT_SIZE < 8) die('skip'); // skip for 32bit builds - there is another test for that
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/bug66550.phpt b/ext/sqlite3/tests/bug66550.phpt
index a44515b0d9dec..95c935d9071f1 100644
--- a/ext/sqlite3/tests/bug66550.phpt
+++ b/ext/sqlite3/tests/bug66550.phpt
@@ -2,7 +2,7 @@
 Bug #66550 (SQLite prepared statement use-after-free)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt
index 901926ebd7167..ff426ab859bf2 100644
--- a/ext/sqlite3/tests/bug68760.phpt
+++ b/ext/sqlite3/tests/bug68760.phpt
@@ -2,7 +2,7 @@
 Bug #68760 (Callback throws exception behaviour. Segfault in 5.6)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/sqlite3/tests/bug69972.phpt b/ext/sqlite3/tests/bug69972.phpt
index 539ebd2696318..88a88fd00bc9d 100644
--- a/ext/sqlite3/tests/bug69972.phpt
+++ b/ext/sqlite3/tests/bug69972.phpt
@@ -2,7 +2,7 @@
 Bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/sqlite3/tests/bug70628.phpt b/ext/sqlite3/tests/bug70628.phpt
index 3d807baaa8894..ed90d651db0b7 100644
--- a/ext/sqlite3/tests/bug70628.phpt
+++ b/ext/sqlite3/tests/bug70628.phpt
@@ -2,7 +2,7 @@
 Bug #70628 (Clearing bindings on an SQLite3 statement doesn't work)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded'); ?>
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug71049.phpt b/ext/sqlite3/tests/bug71049.phpt
index 5c2843f34598b..b97454121c56a 100644
--- a/ext/sqlite3/tests/bug71049.phpt
+++ b/ext/sqlite3/tests/bug71049.phpt
@@ -2,7 +2,7 @@
 Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug72571.phpt b/ext/sqlite3/tests/bug72571.phpt
index 3ffde291c71f6..3d84e918d4420 100644
--- a/ext/sqlite3/tests/bug72571.phpt
+++ b/ext/sqlite3/tests/bug72571.phpt
@@ -2,7 +2,7 @@
 Bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded'); ?>
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug72668.phpt b/ext/sqlite3/tests/bug72668.phpt
index 2845fa0a7caec..11700a52a6e13 100644
--- a/ext/sqlite3/tests/bug72668.phpt
+++ b/ext/sqlite3/tests/bug72668.phpt
@@ -2,7 +2,7 @@
 Bug #72668 (Spurious warning when exception is thrown in user defined function)
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded'); ?>
 --FILE--
 <?php
 function my_udf_md5($string) {
diff --git a/ext/sqlite3/tests/skipif.inc b/ext/sqlite3/tests/skipif.inc
index 3427965d1d006..96f3856ce97ef 100644
--- a/ext/sqlite3/tests/skipif.inc
+++ b/ext/sqlite3/tests/skipif.inc
@@ -1,7 +1 @@
-<?php
-
-if (!extension_loaded('sqlite3')) {
-	die("skip");
-}
-
-?>
+<?php if (!extension_loaded('sqlite3')) die("skip sqlite3 extension not loaded"); ?>
diff --git a/ext/standard/tests/class_object/get_object_vars_variation_004.phpt b/ext/standard/tests/class_object/get_object_vars_variation_004.phpt
index f52b3fed78e65..a22e1a91a176b 100644
Binary files a/ext/standard/tests/class_object/get_object_vars_variation_004.phpt and b/ext/standard/tests/class_object/get_object_vars_variation_004.phpt differ
diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt
index c707dd36913d7..879b44c35322e 100644
--- a/ext/standard/tests/strings/bug65230.phpt
+++ b/ext/standard/tests/strings/bug65230.phpt
@@ -3,7 +3,7 @@ Bug #65230 setting locale randomly broken
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip');
+    die('skip windows only');
 }
 ?>
 --INI--
@@ -11,7 +11,7 @@ date.timezone=Europe/Berlin
 --FILE--
 <?php
 
-function test($locale, $value) 
+function test($locale, $value)
 {
 	$newlocale = setlocale(LC_ALL, $locale);
 	$conv      = localeconv();
@@ -57,4 +57,3 @@ German_Germany.1252
   %f: 3,410000
   %F: 3.410000
 date: 05.12.2014
-
diff --git a/ext/standard/tests/url/base64_decode_basic_003.phpt b/ext/standard/tests/url/base64_decode_basic_003.phpt
index 3bcd51e192841..1864d71609f51 100644
--- a/ext/standard/tests/url/base64_decode_basic_003.phpt
+++ b/ext/standard/tests/url/base64_decode_basic_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test base64_decode() function : basic functionality - padding and whitespace
 --SKIPIF--
-<?php if (!extension_loaded("json")) print "skip"; ?>
+<?php if(!extension_loaded("json")) die("skip json extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
diff --git a/ext/tidy/tests/001.phpt b/ext/tidy/tests/001.phpt
index bfd3782078bf3..7023ca7e547ac 100644
--- a/ext/tidy/tests/001.phpt
+++ b/ext/tidy/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for tidy presence
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 echo "tidy extension is available";
diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt
index 89c3804b89d38..af01686649e0c 100644
--- a/ext/tidy/tests/002.phpt
+++ b/ext/tidy/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_string()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
     	$a = tidy_parse_string("<HTML></HTML>");
diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index 1a63d44dfdd40..6b7742d1db9e7 100644
--- a/ext/tidy/tests/003.phpt
+++ b/ext/tidy/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_clean_repair()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 
diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index 9d3cd2ef5a93c..e5b1581366491 100644
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -1,9 +1,9 @@
 --TEST--
 tidy_diagnose()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 $a = tidy_parse_string('<HTML></HTML>');
 var_dump(tidy_diagnose($a));
 echo str_replace("\r", "", tidy_get_error_buffer($a));
diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt
index b63ec09635ef3..2f95e78fbd7aa 100644
--- a/ext/tidy/tests/005-mb.phpt
+++ b/ext/tidy/tests/005-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_file()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 	$a = tidy_parse_file(dirname(__FILE__)."/005私はガラスを食べられます.html");
diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt
index 1d3a10c2ffadd..a9be7141f3a94 100644
--- a/ext/tidy/tests/005.phpt
+++ b/ext/tidy/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_file()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 	$a = tidy_parse_file(dirname(__FILE__)."/005.html");
diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt
index c8261813145a0..8389ebc94a837 100644
--- a/ext/tidy/tests/006.phpt
+++ b/ext/tidy/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Verbose tidy_get_error_buffer()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 	$a = tidy_parse_string("<HTML><asd asdf></HTML>");
diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt
index 150b98f56074a..2f37ff7083072 100644
--- a/ext/tidy/tests/008.phpt
+++ b/ext/tidy/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing the error buffer via $obj->error_buf...
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
    	$a = tidy_parse_string("<HTML><asd asdf></HTML>");
diff --git a/ext/tidy/tests/009.phpt b/ext/tidy/tests/009.phpt
index 02c65df7cbd98..e1e71a130dfaa 100644
--- a/ext/tidy/tests/009.phpt
+++ b/ext/tidy/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_doc object overloading
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
     
diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt
index 695e1c9ce56f4..06406d9b5a870 100644
--- a/ext/tidy/tests/010.phpt
+++ b/ext/tidy/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing root, body, html, and head nodes..
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
 $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>", array('newline' => 'LF'));
diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt
index 2a9461675907f..5267a033e9803 100644
--- a/ext/tidy/tests/011.phpt
+++ b/ext/tidy/tests/011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing attributes of a node
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php 
     	$a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>");
diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt
index e86aa6c45c290..471ab30aa3754 100644
--- a/ext/tidy/tests/012.phpt
+++ b/ext/tidy/tests/012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing children nodes
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/013.phpt b/ext/tidy/tests/013.phpt
index 8f1ac94ef4a13..af5b0f232cffc 100644
--- a/ext/tidy/tests/013.phpt
+++ b/ext/tidy/tests/013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Parsing a file using constructor
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
         $tidy = new tidy(dirname(__FILE__)."/013.html", array("show-body-only"=>true));
diff --git a/ext/tidy/tests/014.phpt b/ext/tidy/tests/014.phpt
index a391b3dc9ebf3..41b6225d91f51 100644
--- a/ext/tidy/tests/014.phpt
+++ b/ext/tidy/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration options through tidy_parse_string().
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
         $text = "<B>testing</I>";
diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt
index 03018ffa198fd..c2a05ad84d5a6 100644
--- a/ext/tidy/tests/015.phpt
+++ b/ext/tidy/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration options through tidy_parse_file().
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
         $tidy = tidy_parse_file(dirname(__FILE__)."/015.html", array('show-body-only'=>true));
diff --git a/ext/tidy/tests/016.phpt b/ext/tidy/tests/016.phpt
index 05b7cc18f9af3..fb077ccfeeba4 100644
--- a/ext/tidy/tests/016.phpt
+++ b/ext/tidy/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration file through tidy_parse_file() (may fail with buggy libtidy)
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
         $tidy = tidy_parse_file(dirname(__FILE__)."/016.html",
diff --git a/ext/tidy/tests/017.phpt b/ext/tidy/tests/017.phpt
index 24597e1a4ad2e..40d60656bd93a 100644
--- a/ext/tidy/tests/017.phpt
+++ b/ext/tidy/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 The Tidy Output Buffer Filter
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php ob_start("ob_tidyhandler"); ?>
 <B>testing</I>
diff --git a/ext/tidy/tests/018.phpt b/ext/tidy/tests/018.phpt
index 405a46d42b204..bb342da3f3f1b 100644
--- a/ext/tidy/tests/018.phpt
+++ b/ext/tidy/tests/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 binary safety
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 $x = tidy_repair_string("<p>abra\0cadabra</p>", 
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt
index 5e9c38d75a3be..b9379532f67dc 100644
--- a/ext/tidy/tests/019.phpt
+++ b/ext/tidy/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_repair_*() and invalid parameters
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/024.phpt b/ext/tidy/tests/024.phpt
index 6a258b30aad0b..048b7100dc4bf 100644
--- a/ext/tidy/tests/024.phpt
+++ b/ext/tidy/tests/024.phpt
@@ -2,7 +2,7 @@
 libtidy handling of 'new-blocklevel-tags'
 --SKIPIF--
 <?php
-if (!extension_loaded('tidy')) die('skip');
+if (!extension_loaded('tidy')) die('skip tidy extension not loaded');
 if (strtotime(tidy_get_release()) < strtotime('20 january 2007')) die ('skip old libtidy');
 ?>
 --FILE--
diff --git a/ext/tidy/tests/025.phpt b/ext/tidy/tests/025.phpt
index df9392eb2f58e..10285098f2c41 100644
--- a/ext/tidy/tests/025.phpt
+++ b/ext/tidy/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidyNode tests
 --SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+<?php if (!extension_loaded('tidy')) die('skip tidy extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/026.phpt b/ext/tidy/tests/026.phpt
index b46cd5464b9b7..31332f8cd58cd 100644
--- a/ext/tidy/tests/026.phpt
+++ b/ext/tidy/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy.clean_output test
 --SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+<?php if (!extension_loaded('tidy')) die('skip tidy extension not loaded'); ?>
 --INI--
 tidy.clean_output=1
 --FILE--
diff --git a/ext/tidy/tests/027.phpt b/ext/tidy/tests/027.phpt
index cd984dd9e7df0..4e1b21fea1a36 100644
--- a/ext/tidy/tests/027.phpt
+++ b/ext/tidy/tests/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug: tidy segfaults with markup=false
 --SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+<?php if (!extension_loaded('tidy')) die('skip tidy extension not loaded'); ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/028.phpt b/ext/tidy/tests/028.phpt
index 01f3fd1e1a99d..5ab05240c1f3d 100644
--- a/ext/tidy/tests/028.phpt
+++ b/ext/tidy/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidyNode::getParent()
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 $x = tidy_parse_string("<body><div>Content</div></body>");
diff --git a/ext/tidy/tests/029.phpt b/ext/tidy/tests/029.phpt
index 1709cd6f09b05..e4dcaedb54b45 100644
--- a/ext/tidy/tests/029.phpt
+++ b/ext/tidy/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_get_body() crash
 --SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+<?php if (!extension_loaded('tidy')) die('skip tidy extension not loaded'); ?>
 --FILE--
 <?php
 
@@ -13,7 +13,7 @@ $inputs = array(
 );
 
 
-foreach ($inputs as $input) { 
+foreach ($inputs as $input) {
 
 	$t = tidy_parse_string($input);
 	$t->cleanRepair();
diff --git a/ext/tidy/tests/bug54682.phpt b/ext/tidy/tests/bug54682.phpt
index 2bebe11bdbd71..f9031645f7769 100644
--- a/ext/tidy/tests/bug54682.phpt
+++ b/ext/tidy/tests/bug54682.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Tidy::diagnose() NULL pointer dereference
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/bug_50558.phpt b/ext/tidy/tests/bug_50558.phpt
index b37cb92196a4a..c9050fc2fbaab 100644
--- a/ext/tidy/tests/bug_50558.phpt
+++ b/ext/tidy/tests/bug_50558.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50558 - Broken object model when extending tidy
 --SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+<?php if(!extension_loaded("tidy")) die("skip tidy extension not loaded"); ?>
 --FILE--
 <?php
 class MyTidy extends tidy
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index a09e5ef19cc0b..6fb3dd522a33e 100644
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -2,7 +2,7 @@
 token_name()
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
-if (!extension_loaded("tokenizer")) print "skip"; ?>
+if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/002.phpt b/ext/tokenizer/tests/002.phpt
index 2a40ffe292fd5..47ebd2c72ef47 100644
--- a/ext/tokenizer/tests/002.phpt
+++ b/ext/tokenizer/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 token_get_all()
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --INI--
 short_open_tag=1
 --FILE--
diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt
index fdcf7748a8440..cc8c5426ea4c2 100644
--- a/ext/tokenizer/tests/003.phpt
+++ b/ext/tokenizer/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 token_get_all() and wrong parameters
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt
index d07476b2046c8..59a08baa56804 100644
--- a/ext/tokenizer/tests/bug26463.phpt
+++ b/ext/tokenizer/tests/bug26463.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26463 (token_get_all() does not correctly handle semicolons after T_END_HEREDOC)
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 $str = '<?php
diff --git a/ext/tokenizer/tests/bug54089.phpt b/ext/tokenizer/tests/bug54089.phpt
index 77a4c1f3247df..2b52b07ee3a6a 100644
--- a/ext/tokenizer/tests/bug54089.phpt
+++ b/ext/tokenizer/tests/bug54089.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54089 (token_get_all() does not stop after __halt_compiler)
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 $codes = array(
diff --git a/ext/tokenizer/tests/bug60097.phpt b/ext/tokenizer/tests/bug60097.phpt
index e628dee1ef06a..91a2b68240a46 100644
--- a/ext/tokenizer/tests/bug60097.phpt
+++ b/ext/tokenizer/tests/bug60097.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug 60097: token_get_all fails to lex nested heredoc
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug67395.phpt b/ext/tokenizer/tests/bug67395.phpt
index 8101c81edb67b..0f85246aab54f 100644
--- a/ext/tokenizer/tests/bug67395.phpt
+++ b/ext/tokenizer/tests/bug67395.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug 67395: token_name() does not return name for T_POW and T_POW_EQUAL token
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/parse_errors.phpt b/ext/tokenizer/tests/parse_errors.phpt
index 700326ff41f20..bdff776f1d316 100644
--- a/ext/tokenizer/tests/parse_errors.phpt
+++ b/ext/tokenizer/tests/parse_errors.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Parse errors during token_get_all()
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
index b9da91502a687..c19791165390a 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_000.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Parse errors during token_get_all() with TOKEN_PARSE flag
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
index 3d2a37e64f13b..47c4522072217 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Semi reserved words support: member access
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 $tokens = token_get_all('<?php
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt
index b2c9f1cf68b42..58be7d7b233bf 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Semi reserved words support: class const
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 $tokens = token_get_all('<?php
diff --git a/ext/tokenizer/tests/token_get_all_basic.phpt b/ext/tokenizer/tests/token_get_all_basic.phpt
index 7af8109f89622..b45d00bd1acb1 100644
--- a/ext/tokenizer/tests/token_get_all_basic.phpt
+++ b/ext/tokenizer/tests/token_get_all_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : basic functionality 
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_error.phpt b/ext/tokenizer/tests/token_get_all_error.phpt
index 9ded0a177425f..4c628a46dd490 100644
--- a/ext/tokenizer/tests/token_get_all_error.phpt
+++ b/ext/tokenizer/tests/token_get_all_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : error conditions 
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation1.phpt b/ext/tokenizer/tests/token_get_all_variation1.phpt
index 276453fd157ae..8aeb148042d14 100644
--- a/ext/tokenizer/tests/token_get_all_variation1.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - unexpected values for 'source' argument
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation10.phpt b/ext/tokenizer/tests/token_get_all_variation10.phpt
index 55e9d7edf8228..b0b298be5ab75 100644
--- a/ext/tokenizer/tests/token_get_all_variation10.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with constant tokens
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation11.phpt b/ext/tokenizer/tests/token_get_all_variation11.phpt
index 98d89961b77bd..b08d2eea2c73b 100644
--- a/ext/tokenizer/tests/token_get_all_variation11.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation11.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with control structure tokens
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation12.phpt b/ext/tokenizer/tests/token_get_all_variation12.phpt
index 368fb0867cb5f..dabe40c2a15a8 100644
--- a/ext/tokenizer/tests/token_get_all_variation12.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation12.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with predefined language constants
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation13.phpt b/ext/tokenizer/tests/token_get_all_variation13.phpt
index 6f85492a99a7f..b5c552cacb1d1 100644
--- a/ext/tokenizer/tests/token_get_all_variation13.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation13.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with class/object constructs
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt
index 52d29198c7f7b..e6ddca6a03959 100644
--- a/ext/tokenizer/tests/token_get_all_variation14.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation14.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - invalid token values
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt
index fbb50dee862c8..089fe2ffbd67b 100644
--- a/ext/tokenizer/tests/token_get_all_variation15.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation15.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - heredoc string for 'source' 
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --INI--
 short_open_tag=On
 --FILE--
diff --git a/ext/tokenizer/tests/token_get_all_variation16.phpt b/ext/tokenizer/tests/token_get_all_variation16.phpt
index db9bde1ad6230..2834ccb10cbc8 100644
--- a/ext/tokenizer/tests/token_get_all_variation16.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation16.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with function constructs
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt
index d34508a8d5606..3cfde6d1657e0 100644
--- a/ext/tokenizer/tests/token_get_all_variation17.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation17.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with exception keywords
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation18.phpt b/ext/tokenizer/tests/token_get_all_variation18.phpt
index 01219ffaa4ce3..dafcde6545314 100644
--- a/ext/tokenizer/tests/token_get_all_variation18.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation18.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with HTML code 
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation19.phpt b/ext/tokenizer/tests/token_get_all_variation19.phpt
index 9ae6759a8fec2..d2bd2c5991538 100644
--- a/ext/tokenizer/tests/token_get_all_variation19.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation19.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Reconstructing a script using token_get_all()
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/token_get_all_variation2.phpt b/ext/tokenizer/tests/token_get_all_variation2.phpt
index 1f206260c7854..d8cf1e6fa6247 100644
--- a/ext/tokenizer/tests/token_get_all_variation2.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with different arithmetic operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation3.phpt b/ext/tokenizer/tests/token_get_all_variation3.phpt
index 66cf4aa87f044..7eae98a27dd32 100644
--- a/ext/tokenizer/tests/token_get_all_variation3.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with logical operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation4.phpt b/ext/tokenizer/tests/token_get_all_variation4.phpt
index 6bc111efbac25..dd442e61cb089 100644
--- a/ext/tokenizer/tests/token_get_all_variation4.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with comparison operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation5.phpt b/ext/tokenizer/tests/token_get_all_variation5.phpt
index 681fb48e573ff..6b4b59b5e9bb4 100644
--- a/ext/tokenizer/tests/token_get_all_variation5.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with assignment operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation6.phpt b/ext/tokenizer/tests/token_get_all_variation6.phpt
index 6213dab9d0522..d3c360699c082 100644
--- a/ext/tokenizer/tests/token_get_all_variation6.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with bitwise operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation7.phpt b/ext/tokenizer/tests/token_get_all_variation7.phpt
index 36fda3298c282..ebeeea7168c80 100644
--- a/ext/tokenizer/tests/token_get_all_variation7.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with increment/decrement operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation8.phpt b/ext/tokenizer/tests/token_get_all_variation8.phpt
index c80a5d0f04d5a..c16be3ccdfe10 100644
--- a/ext/tokenizer/tests/token_get_all_variation8.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with type casting operators
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/tokenizer/tests/token_get_all_variation9.phpt b/ext/tokenizer/tests/token_get_all_variation9.phpt
index 1662fb27f382a..d1f49b04021c8 100644
--- a/ext/tokenizer/tests/token_get_all_variation9.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test token_get_all() function : usage variations - with different types of comments
 --SKIPIF--
-<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
+<?php if(!extension_loaded("tokenizer")) die("skip tokenizer extension not loaded"); ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
diff --git a/ext/wddx/tests/001-64bit.phpt b/ext/wddx/tests/001-64bit.phpt
index 78b1dc9994b67..296f116ed920c 100644
--- a/ext/wddx/tests/001-64bit.phpt
+++ b/ext/wddx/tests/001-64bit.phpt
@@ -1,7 +1,7 @@
 --TEST--
 wddx deserialization test (64-bit)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 <?php echo PHP_INT_SIZE != 8 ? "skip 64-bit only" : "OK" ?>
 --INI--
 precision=14
diff --git a/ext/wddx/tests/001.phpt b/ext/wddx/tests/001.phpt
index e1aafd0ab0543..4452e00d08b82 100644
--- a/ext/wddx/tests/001.phpt
+++ b/ext/wddx/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 wddx deserialization test (32-bit)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 <?php echo PHP_INT_SIZE == 8 ? "skip 32-bit only" : "OK" ?>
 --INI--
 precision=14
diff --git a/ext/wddx/tests/002.phpt b/ext/wddx/tests/002.phpt
index 692bfa85c6078..f95ebe9d7830e 100644
--- a/ext/wddx/tests/002.phpt
+++ b/ext/wddx/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 wddx packet construction using wddx ressource
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/wddx/tests/003.phpt b/ext/wddx/tests/003.phpt
index 3240e43e92ce2..c209b44098978 100644
--- a/ext/wddx/tests/003.phpt
+++ b/ext/wddx/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 wddx deserialize from ressource
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --INI--
 precision=14
 --FILE--
diff --git a/ext/wddx/tests/bug27287.phpt b/ext/wddx/tests/bug27287.phpt
index 72ac317aa07e2..58aa4a8f6a17f 100644
--- a/ext/wddx/tests/bug27287.phpt
+++ b/ext/wddx/tests/bug27287.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27287 (segfault with deserializing object data)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 	
diff --git a/ext/wddx/tests/bug34306.phpt b/ext/wddx/tests/bug34306.phpt
index 5f1a0df72f14a..9c215217fd6a5 100644
--- a/ext/wddx/tests/bug34306.phpt
+++ b/ext/wddx/tests/bug34306.phpt
@@ -1,7 +1,7 @@
 --TEST--
 #34306 (wddx_serialize_value() crashes with long array keys)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug35410.phpt b/ext/wddx/tests/bug35410.phpt
index 3b4b9b62cf611..05cd2440b80fa 100644
--- a/ext/wddx/tests/bug35410.phpt
+++ b/ext/wddx/tests/bug35410.phpt
@@ -2,7 +2,7 @@
 #35410 (wddx_deserialize() doesn't handle large ints as keys properly)
 --SKIPIF--
 <?php 
-	if (!extension_loaded("wddx")) print "skip"; 
+	if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); 
     if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug35410_64bit.phpt b/ext/wddx/tests/bug35410_64bit.phpt
index 15377b175ea2c..f33dcf5c75d40 100644
--- a/ext/wddx/tests/bug35410_64bit.phpt
+++ b/ext/wddx/tests/bug35410_64bit.phpt
@@ -2,7 +2,7 @@
 #35410 (wddx_deserialize() doesn't handle large ints as keys properly)
 --SKIPIF--
 <?php 
-	if (!extension_loaded("wddx")) print "skip"; 
+	if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); 
 	if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug37569.phpt b/ext/wddx/tests/bug37569.phpt
index 45cd68a80ba0a..f9c5632c3e07f 100644
--- a/ext/wddx/tests/bug37569.phpt
+++ b/ext/wddx/tests/bug37569.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37569 (WDDX incorrectly encodes high-ascii characters)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 for ($i = 65; $i < 256; $i++) {
diff --git a/ext/wddx/tests/bug37587.phpt b/ext/wddx/tests/bug37587.phpt
index 7780355b8e4aa..016e1754ca6fd 100644
--- a/ext/wddx/tests/bug37587.phpt
+++ b/ext/wddx/tests/bug37587.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37587 (var without attribute causes segfault)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug41283.phpt b/ext/wddx/tests/bug41283.phpt
index af716d1893f34..02d8d843acbd0 100644
--- a/ext/wddx/tests/bug41283.phpt
+++ b/ext/wddx/tests/bug41283.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41283 (Bug with serializing array key that are doubles or floats)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 $data = array(
diff --git a/ext/wddx/tests/bug41527.phpt b/ext/wddx/tests/bug41527.phpt
index 447bfc34d1c1b..5bedf653b0139 100644
--- a/ext/wddx/tests/bug41527.phpt
+++ b/ext/wddx/tests/bug41527.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41527 (WDDX deserialize numeric string array keys)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 $data = array('01' => 'Zero', '+1' => 'Plus sign', ' 1' => 'Space');
diff --git a/ext/wddx/tests/bug45901.phpt b/ext/wddx/tests/bug45901.phpt
index e76e47eab7253..281e11814ee97 100644
--- a/ext/wddx/tests/bug45901.phpt
+++ b/ext/wddx/tests/bug45901.phpt
@@ -2,7 +2,7 @@
 Bug #45901 (wddx_serialize_value crash with SimpleXMLElement object)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt
index b5629c85d632d..8b65182dda71f 100644
--- a/ext/wddx/tests/bug70661.phpt
+++ b/ext/wddx/tests/bug70661.phpt
@@ -2,7 +2,7 @@
 Bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/wddx/tests/bug70741.phpt b/ext/wddx/tests/bug70741.phpt
index ac890f9b9532e..298a605d85db4 100644
--- a/ext/wddx/tests/bug70741.phpt
+++ b/ext/wddx/tests/bug70741.phpt
@@ -2,7 +2,7 @@
 Bug #70741 (Session WDDX Packet Deserialization Type Confusion Vulnerability)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 if (!extension_loaded("session")) print "skip session extension not available";
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug71335.phpt b/ext/wddx/tests/bug71335.phpt
index 57a7f14f810f6..561b747d69f4c 100644
--- a/ext/wddx/tests/bug71335.phpt
+++ b/ext/wddx/tests/bug71335.phpt
@@ -2,7 +2,7 @@
 Bug #71335 (Type Confusion in WDDX Packet Deserialization)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/wddx/tests/bug71587.phpt b/ext/wddx/tests/bug71587.phpt
index ce46d5ec7e60f..f76bcf2e97e56 100644
--- a/ext/wddx/tests/bug71587.phpt
+++ b/ext/wddx/tests/bug71587.phpt
@@ -2,7 +2,7 @@
 Bug #71587 (Use-After-Free / Double-Free in WDDX Deserialize)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/wddx/tests/bug72142.phpt b/ext/wddx/tests/bug72142.phpt
index 0c93ecc970540..6df64440be3c0 100644
--- a/ext/wddx/tests/bug72142.phpt
+++ b/ext/wddx/tests/bug72142.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72142: WDDX Packet Injection Vulnerability in wddx_serialize_value()
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug72340.phpt b/ext/wddx/tests/bug72340.phpt
index 8d694ca52e761..502762556adc2 100644
--- a/ext/wddx/tests/bug72340.phpt
+++ b/ext/wddx/tests/bug72340.phpt
@@ -2,7 +2,7 @@
 Bug #72340: Double Free Courruption in wddx_deserialize
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/wddx/tests/bug72564.phpt b/ext/wddx/tests/bug72564.phpt
index 4711ef8b40a4c..fb05485943dad 100644
--- a/ext/wddx/tests/bug72564.phpt
+++ b/ext/wddx/tests/bug72564.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72564: wddx deserialization of boolean
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 	foreach([true, false, NULL] as $v) {
diff --git a/ext/wddx/tests/bug73173.phpt b/ext/wddx/tests/bug73173.phpt
index 00fe56e4b0d46..a281ea4303889 100644
--- a/ext/wddx/tests/bug73173.phpt
+++ b/ext/wddx/tests/bug73173.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73173: huge memleak when wddx_unserialize
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug73631.phpt b/ext/wddx/tests/bug73631.phpt
index b3604b7349406..26e545c82fb6a 100644
--- a/ext/wddx/tests/bug73631.phpt
+++ b/ext/wddx/tests/bug73631.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73631 (Memory leak due to invalid wddx stack processing)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 $xml = <<<EOF
diff --git a/ext/wddx/tests/bug73831.phpt b/ext/wddx/tests/bug73831.phpt
index 0f8b8b1264962..7f7e1575010b0 100644
--- a/ext/wddx/tests/bug73831.phpt
+++ b/ext/wddx/tests/bug73831.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73831 (NULL Pointer Dereference while unserialize php object)
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 $xml = <<<EOF
diff --git a/ext/wddx/tests/bug74145.phpt b/ext/wddx/tests/bug74145.phpt
index 16e49d4eb825c..8ff72c076bbfe 100644
--- a/ext/wddx/tests/bug74145.phpt
+++ b/ext/wddx/tests/bug74145.phpt
@@ -2,7 +2,7 @@
 Bug #74145 (wddx parsing empty boolean tag leads to SIGSEGV)
 --SKIPIF--
 <?php
-if (!extension_loaded("wddx")) print "skip";
+if(!extension_loaded("wddx")) die("skip wddx extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/wddx/tests/bug75055.phpt b/ext/wddx/tests/bug75055.phpt
index 2956284d221cc..778f27c856bc8 100644
--- a/ext/wddx/tests/bug75055.phpt
+++ b/ext/wddx/tests/bug75055.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75055 Out-Of-Bounds Read in timelib_meridian()
 --SKIPIF--
-<?php if (!extension_loaded("wddx")) print "skip"; ?>
+<?php if(!extension_loaded("wddx")) die("skip wddx extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt
index ce9ade9618993..66b278320cde1 100644
--- a/ext/xmlreader/tests/001.phpt
+++ b/ext/xmlreader/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, string data 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index 7abd3e216c342..8bd6ceb3828fc 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, file data 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt
index af76382779d9c..f05a720c79bcb 100644
--- a/ext/xmlreader/tests/003-mb.phpt
+++ b/ext/xmlreader/tests/003-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, attributes test 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 85353a8242c30..7168dae560966 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, attributes test 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index b2d7254fe4f86..fe30aa7d9acb2 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, attributes test 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt
index e6fd02c9aaa1c..d3ed36b4175f3 100644
--- a/ext/xmlreader/tests/005.phpt
+++ b/ext/xmlreader/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, parser property set/get 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt
index ce9bb451aff44..35436bb9f54a9 100644
--- a/ext/xmlreader/tests/006.phpt
+++ b/ext/xmlreader/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, moveToElement 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index aacd059b6e454..6ca93407076de 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, setRelaxNGSchema
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index 967cbbd389071..2ea244afc927e 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, DTD 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt
index 684d6143f8da7..fb288f5f39537 100644
--- a/ext/xmlreader/tests/009.phpt
+++ b/ext/xmlreader/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, next 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt
index 7a10096b83163..5d8a646f93978 100644
--- a/ext/xmlreader/tests/010.phpt
+++ b/ext/xmlreader/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, next 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt
index 89599232fce04..d5950f359b32c 100644
--- a/ext/xmlreader/tests/011.phpt
+++ b/ext/xmlreader/tests/011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: libxml2 XML Reader, string data 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip";
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded");
 $reader = new XMLReader();
 if (!method_exists($reader, 'readInnerXml')) print "skip";
 ?>
diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index e0edeef2dd514..85bd4c760716f 100644
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: accessing empty and non existing attributes 
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlreader/tests/bug36743.phpt b/ext/xmlreader/tests/bug36743.phpt
index 374941b0c712f..e215169127a2c 100644
--- a/ext/xmlreader/tests/bug36743.phpt
+++ b/ext/xmlreader/tests/bug36743.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36743 (In a class extending XMLReader array properties are not writable)
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlreader/tests/bug70309.phpt b/ext/xmlreader/tests/bug70309.phpt
index aa49051593211..4069c3d790522 100644
--- a/ext/xmlreader/tests/bug70309.phpt
+++ b/ext/xmlreader/tests/bug70309.phpt
@@ -2,7 +2,7 @@
 XMLReader: Bug #70309 XmlReader read generates extra output
 --SKIPIF--
 <?php if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. only for Windows'); ?>
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?>
 --FILE--
 <?php
diff --git a/ext/xmlreader/tests/bug71805.phpt b/ext/xmlreader/tests/bug71805.phpt
index 3d1713ace5ab2..f5fc27678622e 100644
--- a/ext/xmlreader/tests/bug71805.phpt
+++ b/ext/xmlreader/tests/bug71805.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: Bug #71805 XML files can generate UTF-8 error even if they are UTF-8
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt
index c77e6c31b79c9..f657c6c884b41 100644
--- a/ext/xmlreader/tests/expand.phpt
+++ b/ext/xmlreader/tests/expand.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: Expand into existing DOM documet
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip";
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded");
 if (!extension_loaded("dom")) print "skip DOM extension required";
 $reader = new XMLReader();
 if (!method_exists($reader, 'expand')) print "skip";
diff --git a/ext/xmlreader/tests/expand_error.phpt b/ext/xmlreader/tests/expand_error.phpt
index 4b2799336b6ab..9f69ea9426891 100644
--- a/ext/xmlreader/tests/expand_error.phpt
+++ b/ext/xmlreader/tests/expand_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLReader: Expand Error
 --SKIPIF--
-<?php if (!extension_loaded("xmlreader")) print "skip";
+<?php if(!extension_loaded("xmlreader")) die("skip xmlreader extension not loaded");
 if (!extension_loaded("dom")) print "skip DOM extension required";
 $reader = new XMLReader();
 if (!method_exists($reader, 'expand')) print "skip";
diff --git a/ext/xmlrpc/tests/001.phpt b/ext/xmlrpc/tests/001.phpt
index 262509671409a..01f2dffbab64f 100644
--- a/ext/xmlrpc/tests/001.phpt
+++ b/ext/xmlrpc/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlrpc_encode_request() with wrong arguments
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/002.phpt b/ext/xmlrpc/tests/002.phpt
index 83586464bc25d..156f1c7bf4165 100644
--- a/ext/xmlrpc/tests/002.phpt
+++ b/ext/xmlrpc/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlrpc_encode_request() and various arguments
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/003.phpt b/ext/xmlrpc/tests/003.phpt
index 3d6796dbaba9e..a85b943b5fcca 100644
--- a/ext/xmlrpc/tests/003.phpt
+++ b/ext/xmlrpc/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlrpc_encode() Simple test encode array
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/004.phpt b/ext/xmlrpc/tests/004.phpt
index 04f3ef315e632..e6f8ae9ea4059 100644
--- a/ext/xmlrpc/tests/004.phpt
+++ b/ext/xmlrpc/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlrpc_encode() Simple test encode int
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/005.phpt b/ext/xmlrpc/tests/005.phpt
index 613dfde249910..91998fb15d7e8 100644
--- a/ext/xmlrpc/tests/005.phpt
+++ b/ext/xmlrpc/tests/005.phpt
@@ -6,7 +6,7 @@ Michel Araujo <araujo_michel@yahoo.com.br>
 #PHPSP 2013-08-22
 
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/006.phpt b/ext/xmlrpc/tests/006.phpt
index f33932d5a210f..4b419661a509e 100644
--- a/ext/xmlrpc/tests/006.phpt
+++ b/ext/xmlrpc/tests/006.phpt
@@ -6,7 +6,7 @@ Michel Araujo <araujo_michel@yahoo.com.br>
 #PHPSP 2013-08-22
 
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/007.phpt b/ext/xmlrpc/tests/007.phpt
index 84c15a7d8a36c..8fab8b77d0a04 100644
--- a/ext/xmlrpc/tests/007.phpt
+++ b/ext/xmlrpc/tests/007.phpt
@@ -6,7 +6,7 @@ Michel Araujo <araujo_michel@yahoo.com.br>
 #PHPSP 2013-08-22
 
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug18916.phpt b/ext/xmlrpc/tests/bug18916.phpt
index 487838b600978..76158f1de9a8f 100644
--- a/ext/xmlrpc/tests/bug18916.phpt
+++ b/ext/xmlrpc/tests/bug18916.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #18916 (xmlrpc_set_type() not working)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --INI--
 date.timezone="America/Sao_Paulo"
 --FILE--
diff --git a/ext/xmlrpc/tests/bug37057.phpt b/ext/xmlrpc/tests/bug37057.phpt
index 013cc9192ce49..99c9ba524e46c 100644
--- a/ext/xmlrpc/tests/bug37057.phpt
+++ b/ext/xmlrpc/tests/bug37057.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37057 (xmlrpc_decode() may produce arrays with numeric string keys which are unaccessible)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $response='<?xml version="1.0"?>
diff --git a/ext/xmlrpc/tests/bug38431.phpt b/ext/xmlrpc/tests/bug38431.phpt
index 8cc9eeaf97da2..ced215826661f 100644
--- a/ext/xmlrpc/tests/bug38431.phpt
+++ b/ext/xmlrpc/tests/bug38431.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38431 (xmlrpc_get_type() crashes PHP on objects)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug40576.phpt b/ext/xmlrpc/tests/bug40576.phpt
index fedf53ee84c66..af11b2df76092 100644
--- a/ext/xmlrpc/tests/bug40576.phpt
+++ b/ext/xmlrpc/tests/bug40576.phpt
@@ -2,7 +2,7 @@
 Bug #40576 (double values are truncated to 6 decimal digits when encoding)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --INI--
diff --git a/ext/xmlrpc/tests/bug40576_64bit.phpt b/ext/xmlrpc/tests/bug40576_64bit.phpt
index 74f8f0cbea92c..9027fa74f53fd 100644
--- a/ext/xmlrpc/tests/bug40576_64bit.phpt
+++ b/ext/xmlrpc/tests/bug40576_64bit.phpt
@@ -2,7 +2,7 @@
 Bug #40576 (double values are truncated to 6 decimal digits when encoding)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --INI--
diff --git a/ext/xmlrpc/tests/bug42189.phpt b/ext/xmlrpc/tests/bug42189.phpt
index 55e726cf68707..edb4563f11141 100644
--- a/ext/xmlrpc/tests/bug42189.phpt
+++ b/ext/xmlrpc/tests/bug42189.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42189 (xmlrpc_get_type() crashes PHP on invalid dates)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $a = '~~~~~~~~~~~~~~~~~~';
@@ -10,6 +10,6 @@ var_dump($ok);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 Done
diff --git a/ext/xmlrpc/tests/bug42736.phpt b/ext/xmlrpc/tests/bug42736.phpt
index 1dfe1c65f1d6e..93999a974d868 100644
--- a/ext/xmlrpc/tests/bug42736.phpt
+++ b/ext/xmlrpc/tests/bug42736.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42736 (xmlrpc_server_call_method() crashes)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug44996.phpt b/ext/xmlrpc/tests/bug44996.phpt
index 0f4d016e5a749..81f5f48b16c6b 100644
--- a/ext/xmlrpc/tests/bug44996.phpt
+++ b/ext/xmlrpc/tests/bug44996.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug45226.phpt b/ext/xmlrpc/tests/bug45226.phpt
index e05385030400a..79e3689c77c56 100644
--- a/ext/xmlrpc/tests/bug45226.phpt
+++ b/ext/xmlrpc/tests/bug45226.phpt
@@ -3,7 +3,7 @@ Bug #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)
 --INI--
 date.timezone="America/Sao_Paulo"
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug45555.phpt b/ext/xmlrpc/tests/bug45555.phpt
index 6b3da24c0d632..39e716d03edfb 100644
--- a/ext/xmlrpc/tests/bug45555.phpt
+++ b/ext/xmlrpc/tests/bug45555.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45555 (Segfault with invalid non-string as register_introspection_callback)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug45556.phpt b/ext/xmlrpc/tests/bug45556.phpt
index 34897d8c9be75..04e95404195c4 100644
--- a/ext/xmlrpc/tests/bug45556.phpt
+++ b/ext/xmlrpc/tests/bug45556.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45556 (Return value from callback isn't freed)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug47818.phpt b/ext/xmlrpc/tests/bug47818.phpt
index a074cd831e3f7..972c8911cd273 100644
--- a/ext/xmlrpc/tests/bug47818.phpt
+++ b/ext/xmlrpc/tests/bug47818.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47818 (Segfault due to bound callback param)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug50282.phpt b/ext/xmlrpc/tests/bug50282.phpt
index eb35fe3f2d469..b49d117a1398a 100644
--- a/ext/xmlrpc/tests/bug50282.phpt
+++ b/ext/xmlrpc/tests/bug50282.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50282 (xmlrpc_encode_request() changes object into array in calling function)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug50285.phpt b/ext/xmlrpc/tests/bug50285.phpt
index 0a5fb962b4ec2..18df32082825b 100644
--- a/ext/xmlrpc/tests/bug50285.phpt
+++ b/ext/xmlrpc/tests/bug50285.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlrpc/tests/bug50761.phpt b/ext/xmlrpc/tests/bug50761.phpt
index ada19409c3715..7a10f0abaa9a1 100644
--- a/ext/xmlrpc/tests/bug50761.phpt
+++ b/ext/xmlrpc/tests/bug50761.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50761 (system.multiCall crashes)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $req = '<?xml version="1.0"?>
diff --git a/ext/xmlrpc/tests/bug51288.phpt b/ext/xmlrpc/tests/bug51288.phpt
index ba341369bc8a7..291a2bbb160c8 100644
--- a/ext/xmlrpc/tests/bug51288.phpt
+++ b/ext/xmlrpc/tests/bug51288.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #51288 (CVE-2010-0397, NULL pointer deref when no <methodName> in request)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $method = NULL;
diff --git a/ext/xmlrpc/tests/bug61097.phpt b/ext/xmlrpc/tests/bug61097.phpt
index 1b752472256c9..a0e99b1ecbbd9 100644
--- a/ext/xmlrpc/tests/bug61097.phpt
+++ b/ext/xmlrpc/tests/bug61097.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61097 (Memory leak in xmlrpc functions copying zvals)
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $server = xmlrpc_server_create();
diff --git a/ext/xmlrpc/tests/bug61264.phpt b/ext/xmlrpc/tests/bug61264.phpt
index 24e4b2749c89b..3ef621e29419f 100644
--- a/ext/xmlrpc/tests/bug61264.phpt
+++ b/ext/xmlrpc/tests/bug61264.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable
 --SKIPIF--
-<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+<?php if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded"); ?>
 --FILE--
 <?php
 $xml = <<<XML
diff --git a/ext/xmlrpc/tests/bug68027.phpt b/ext/xmlrpc/tests/bug68027.phpt
index a5c96f1cf29e0..497faa0f531bb 100644
--- a/ext/xmlrpc/tests/bug68027.phpt
+++ b/ext/xmlrpc/tests/bug68027.phpt
@@ -2,7 +2,7 @@
 Bug #68027 (buffer overflow in mkgmtime() function)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug70526.phpt b/ext/xmlrpc/tests/bug70526.phpt
index 6ed3e1b997972..f0ca1169cfa4b 100644
--- a/ext/xmlrpc/tests/bug70526.phpt
+++ b/ext/xmlrpc/tests/bug70526.phpt
@@ -2,7 +2,7 @@
 Bug #70526 (xmlrpc_set_type returns false on success)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug70728.phpt b/ext/xmlrpc/tests/bug70728.phpt
index 52e1aa9843c27..55b54a2c416d2 100644
--- a/ext/xmlrpc/tests/bug70728.phpt
+++ b/ext/xmlrpc/tests/bug70728.phpt
@@ -2,7 +2,7 @@
 Bug #70728 (Type Confusion Vulnerability in PHP_to_XMLRPC_worker)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
diff --git a/ext/xmlrpc/tests/bug70728_64bit.phpt b/ext/xmlrpc/tests/bug70728_64bit.phpt
index b5e96a9d888eb..061a412bb857f 100644
--- a/ext/xmlrpc/tests/bug70728_64bit.phpt
+++ b/ext/xmlrpc/tests/bug70728_64bit.phpt
@@ -2,7 +2,7 @@
 Bug #70728 (Type Confusion Vulnerability in PHP_to_XMLRPC_worker)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/xmlrpc/tests/bug71501.phpt b/ext/xmlrpc/tests/bug71501.phpt
index 5f54186f76c80..cd58d9fa18ff3 100644
--- a/ext/xmlrpc/tests/bug71501.phpt
+++ b/ext/xmlrpc/tests/bug71501.phpt
@@ -2,7 +2,7 @@
 Bug #71501 (xmlrpc_encode_request ignores encoding option)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug72155.phpt b/ext/xmlrpc/tests/bug72155.phpt
index 40c6c56237f7e..9e1ca5925d9cd 100644
--- a/ext/xmlrpc/tests/bug72155.phpt
+++ b/ext/xmlrpc/tests/bug72155.phpt
@@ -2,7 +2,7 @@
 Bug #72155 (use-after-free caused by get_zval_xmlrpc_type)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug72647.phpt b/ext/xmlrpc/tests/bug72647.phpt
index 6e80b23cf92ff..a75305e4fd2b2 100644
--- a/ext/xmlrpc/tests/bug72647.phpt
+++ b/ext/xmlrpc/tests/bug72647.phpt
@@ -2,7 +2,7 @@
 Bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlrpc/tests/bug74975.phpt b/ext/xmlrpc/tests/bug74975.phpt
index 46a5af28e2e4c..2a1a5a54a17c4 100644
--- a/ext/xmlrpc/tests/bug74975.phpt
+++ b/ext/xmlrpc/tests/bug74975.phpt
@@ -2,7 +2,7 @@
 Bug #74975	Different serialization for classes
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlrpc")) print "skip";
+if(!extension_loaded("xmlrpc")) die("skip xmlrpc extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index a9349d2d16c65..7f4ea22c04c82 100644
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index f2537a47ff7dd..d2ee78b88832c 100644
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, membuffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 5415797864e70..6b55792883858 100644
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index 2d3e8587256a3..cb9c79ff046ac 100644
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt
index 63e77dc6bd5ed..000dd867b1ced 100644
--- a/ext/xmlwriter/tests/005-mb.phpt
+++ b/ext/xmlwriter/tests/005-mb.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, comments 
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index ab933c6f564b9..e4fd57c218689 100644
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, comments 
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt
index 48eb299418f85..f7677b0dbc852 100644
--- a/ext/xmlwriter/tests/006.phpt
+++ b/ext/xmlwriter/tests/006.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, startDTD/writeElementNS 
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/xmlwriter/tests/007.phpt b/ext/xmlwriter/tests/007.phpt
index 47965c73c41ce..16fe542c616f5 100644
--- a/ext/xmlwriter/tests/007.phpt
+++ b/ext/xmlwriter/tests/007.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, Elements & Attributes 
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (LIBXML_VERSION < 20629) die("skip: libxml2 2.6.29+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt
index 88768b1130764..b7c842466c6aa 100644
--- a/ext/xmlwriter/tests/008.phpt
+++ b/ext/xmlwriter/tests/008.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer DTD Element & Attlist
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/xmlwriter/tests/009.phpt b/ext/xmlwriter/tests/009.phpt
index 002916ff10aa0..5c5adf44d1375 100644
--- a/ext/xmlwriter/tests/009.phpt
+++ b/ext/xmlwriter/tests/009.phpt
@@ -2,7 +2,7 @@
 XMLWriter: PI, Comment, CDATA
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/010.phpt b/ext/xmlwriter/tests/010.phpt
index 9f066a7c3e190..74ce25f49b557 100644
--- a/ext/xmlwriter/tests/010.phpt
+++ b/ext/xmlwriter/tests/010.phpt
@@ -2,7 +2,7 @@
 xmlwriter_start/end_attribute()
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/011.phpt b/ext/xmlwriter/tests/011.phpt
index 5a479af8f6f69..98010c571a4e8 100644
--- a/ext/xmlwriter/tests/011.phpt
+++ b/ext/xmlwriter/tests/011.phpt
@@ -5,7 +5,7 @@ Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/012.phpt b/ext/xmlwriter/tests/012.phpt
index 72d0040377478..48c0c01e74e35 100644
--- a/ext/xmlwriter/tests/012.phpt
+++ b/ext/xmlwriter/tests/012.phpt
@@ -5,7 +5,7 @@ Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip");
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded");
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index be448b9c65bb3..b38613712fe19 100644
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/OO_002.phpt b/ext/xmlwriter/tests/OO_002.phpt
index ec605f50a4ab9..ce331f08cb4f8 100644
--- a/ext/xmlwriter/tests/OO_002.phpt
+++ b/ext/xmlwriter/tests/OO_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, membuffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/OO_003.phpt b/ext/xmlwriter/tests/OO_003.phpt
index 7fb47910f0f92..8999a3c085b6f 100644
--- a/ext/xmlwriter/tests/OO_003.phpt
+++ b/ext/xmlwriter/tests/OO_003.phpt
@@ -1,9 +1,9 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, membuffer, flush, text, attribute
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index 08b423ccef29d..c648b14954549 100644
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 /* $Id$ */
diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index 2c6d2f43339ec..77534a5a6a021 100644
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, comments 
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt
index 465a725debffc..eaa9d4ab5a386 100644
--- a/ext/xmlwriter/tests/OO_006.phpt
+++ b/ext/xmlwriter/tests/OO_006.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, startDTD/writeElementNS 
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/xmlwriter/tests/OO_007.phpt b/ext/xmlwriter/tests/OO_007.phpt
index 257a5cd90cd97..b1b5ced631bc7 100644
--- a/ext/xmlwriter/tests/OO_007.phpt
+++ b/ext/xmlwriter/tests/OO_007.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer, Elements & Attributes 
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (LIBXML_VERSION < 20629) die("skip: libxml2 2.6.29+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/OO_008.phpt b/ext/xmlwriter/tests/OO_008.phpt
index fe127ced2fc05..13c8f688d0077 100644
--- a/ext/xmlwriter/tests/OO_008.phpt
+++ b/ext/xmlwriter/tests/OO_008.phpt
@@ -2,7 +2,7 @@
 XMLWriter: libxml2 XML Writer DTD Element & Attlist
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/xmlwriter/tests/OO_009.phpt b/ext/xmlwriter/tests/OO_009.phpt
index c874f3e4ef834..3ade1fecaca81 100644
--- a/ext/xmlwriter/tests/OO_009.phpt
+++ b/ext/xmlwriter/tests/OO_009.phpt
@@ -2,7 +2,7 @@
 XMLWriter: PI, Comment, CDATA
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php 
diff --git a/ext/xmlwriter/tests/OO_010.phpt b/ext/xmlwriter/tests/OO_010.phpt
index 38357eca1822a..740a72cc330ed 100644
--- a/ext/xmlwriter/tests/OO_010.phpt
+++ b/ext/xmlwriter/tests/OO_010.phpt
@@ -5,7 +5,7 @@ Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/OO_011.phpt b/ext/xmlwriter/tests/OO_011.phpt
index 33f2d19cdc2f8..c7fec2e79f218 100644
--- a/ext/xmlwriter/tests/OO_011.phpt
+++ b/ext/xmlwriter/tests/OO_011.phpt
@@ -5,7 +5,7 @@ Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip");
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded");
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt
index 4b6ceda4fde46..00302faa23802 100644
--- a/ext/xmlwriter/tests/bug39504.phpt
+++ b/ext/xmlwriter/tests/bug39504.phpt
@@ -2,7 +2,7 @@
 Bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity)
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt
index 3bdc63cd93a39..9e40c79864b6a 100644
--- a/ext/xmlwriter/tests/bug41287.phpt
+++ b/ext/xmlwriter/tests/bug41287.phpt
@@ -2,7 +2,7 @@
 Bug #41287 (Namespace functions don't allow xmlns definition to be optional)
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt
index c69cab179574c..c0c778a07d339 100644
--- a/ext/xmlwriter/tests/bug41326.phpt
+++ b/ext/xmlwriter/tests/bug41326.phpt
@@ -2,7 +2,7 @@
 Bug #41287 (Writing empty tags with Xmlwriter::WriteElement[ns])
 --SKIPIF--
 <?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); 
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug48204.phpt b/ext/xmlwriter/tests/bug48204.phpt
index 638512b274778..e2b9ca6fc6813 100644
--- a/ext/xmlwriter/tests/bug48204.phpt
+++ b/ext/xmlwriter/tests/bug48204.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri with PHP_MAXPATHLEN + 1
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 $path = str_repeat('a', PHP_MAXPATHLEN + 1);
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
index fb7602b539dfa..895281430a951 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri with empty string as parameter
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 var_dump(xmlwriter_open_uri(''));
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
index 9cd33f7313342..ade1fd2c7cacb 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri without parameter
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 var_dump(xmlwriter_open_uri());
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
index 0e56d891dce9a..b18a44e1e642a 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri with non existing file
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 var_dump(xmlwriter_open_uri('foo/bar.tmp'));
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
index 6970c0eda1585..e40513a8022a0 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri with file:///
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 var_dump(xmlwriter_open_uri('file:///'));
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
index 9d08716ccf967..1d12d5eaba02a 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_open_uri with file://localhost/
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 var_dump(xmlwriter_open_uri('file://localhost/'));
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
index 8c3e7d92571ff..e98f637cc5367 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_set_indent_string passing xmlwriter resource
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string.tmp";
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
index 5bb9ef8b659f7..75ba78fef6770 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_set_indent_string with missing param(s)
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php 
 $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string_error.tmp";
diff --git a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
index f248049646a4a..2557fc450388e 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_basic_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_write_attribute_ns basic function tests
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php
 $xw = xmlwriter_open_memory();
diff --git a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
index 7f1cd0c640e4a..08d9b99cf0f5d 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_attribute_ns_error_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_write_attribute_ns with missing param
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php
 $xw = xmlwriter_open_memory();
diff --git a/ext/xmlwriter/tests/xmlwriter_write_dtd_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_dtd_basic_001.phpt
index af3dce61ae866..78574c419c57a 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_dtd_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_dtd_basic_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_write_dtd basic function tests
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
index 69a6a7f6cb69f..b2b0087d6bee4 100644
--- a/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_write_dtd_error_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xmlwriter_write_dtd with missing param(s)
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php if(!extension_loaded("xmlwriter")) die("skip xmlwriter extension not loaded"); ?>
 --FILE--
 <?php
 $xmlwriter = xmlwriter_open_memory();
diff --git a/ext/zip/tests/001.phpt b/ext/zip/tests/001.phpt
index 3adaabbf329a5..603e1f0cc7faf 100644
--- a/ext/zip/tests/001.phpt
+++ b/ext/zip/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for zip presence
 --SKIPIF--
-<?php if (!extension_loaded("zip")) print "skip"; ?>
+<?php if(!extension_loaded("zip")) die("skip zip extension not loaded"); ?>
 --FILE--
 <?php
 echo "zip extension is available";
diff --git a/ext/zip/tests/bug11216.phpt b/ext/zip/tests/bug11216.phpt
index 7601e6af85a86..b242d1572f007 100644
--- a/ext/zip/tests/bug11216.phpt
+++ b/ext/zip/tests/bug11216.phpt
@@ -3,7 +3,7 @@ Bug #11216 (::addEmptyDir() crashes when the directory already exists)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
  ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug14962.phpt b/ext/zip/tests/bug14962.phpt
index 0006fd4b68303..5ad1f485a6bc2 100644
--- a/ext/zip/tests/bug14962.phpt
+++ b/ext/zip/tests/bug14962.phpt
@@ -3,7 +3,7 @@ Bug #14962 (::extractTo second argument is not really optional)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug38943.phpt b/ext/zip/tests/bug38943.phpt
index c5e22847192ff..171a54b3374a2 100644
--- a/ext/zip/tests/bug38943.phpt
+++ b/ext/zip/tests/bug38943.phpt
@@ -2,7 +2,7 @@
 #38943, properties in extended class cannot be set (5.3+)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug38943_2.phpt b/ext/zip/tests/bug38943_2.phpt
index 95722e3532988..cdc3d7da52be7 100644
--- a/ext/zip/tests/bug38943_2.phpt
+++ b/ext/zip/tests/bug38943_2.phpt
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 /* $Id: bug38943_2.phpt 271800 2008-12-24 11:28:25Z pajoye $ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug38944.phpt b/ext/zip/tests/bug38944.phpt
index ede6b67e77793..5a6e13f74dd76 100644
--- a/ext/zip/tests/bug38944.phpt
+++ b/ext/zip/tests/bug38944.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38944 (newly created ZipArchive segfaults when accessing comment property)
 --SKIPIF--
-<?php if (!extension_loaded("zip")) print "skip"; ?>
+<?php if(!extension_loaded("zip")) die("skip zip extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zip/tests/bug40228-mb.phpt b/ext/zip/tests/bug40228-mb.phpt
index db9e2e90d57eb..0c76457afafa5 100644
--- a/ext/zip/tests/bug40228-mb.phpt
+++ b/ext/zip/tests/bug40228-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
-<?php if (!extension_loaded("zip")) print "skip"; ?>
+<?php if(!extension_loaded("zip")) die("skip zip extension not loaded"); ?>
 --FILE--
 <?php
 $dest = dirname(__FILE__);
diff --git a/ext/zip/tests/bug40228.phpt b/ext/zip/tests/bug40228.phpt
index 2691b3b22fa81..6e0a3e7713d1d 100644
--- a/ext/zip/tests/bug40228.phpt
+++ b/ext/zip/tests/bug40228.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40228 (extractTo does not create recursive empty path)
 --SKIPIF--
-<?php if (!extension_loaded("zip")) print "skip"; ?>
+<?php if(!extension_loaded("zip")) die("skip zip extension not loaded"); ?>
 --FILE--
 <?php
 $dest = dirname(__FILE__);
diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt
index 9c17de6f9b3f4..a72dccb1463f9 100644
--- a/ext/zip/tests/bug47667.phpt
+++ b/ext/zip/tests/bug47667.phpt
@@ -3,7 +3,7 @@ Bug #47667 (ZipArchive::OVERWRITE seems to have no effect)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug49072.phpt b/ext/zip/tests/bug49072.phpt
index 04bd06e4add65..3bfbdbf9b390d 100644
--- a/ext/zip/tests/bug49072.phpt
+++ b/ext/zip/tests/bug49072.phpt
@@ -3,7 +3,7 @@ Bug #49072 (feof never returns true for damaged file in zip)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug51353.phpt b/ext/zip/tests/bug51353.phpt
index 560945f9dd8a7..83c26f9a43fdd 100644
--- a/ext/zip/tests/bug51353.phpt
+++ b/ext/zip/tests/bug51353.phpt
@@ -2,7 +2,7 @@
 Bug #51353 ZIP64 problem, archive with 100000 items
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 die('skip the test might get very long, activate it manually');
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug53579.phpt b/ext/zip/tests/bug53579.phpt
index 1d533303b58ce..206245d292108 100644
--- a/ext/zip/tests/bug53579.phpt
+++ b/ext/zip/tests/bug53579.phpt
@@ -3,7 +3,7 @@ Bug #53579 (stream_get_contents() segfaults on ziparchive streams)
 --SKIPIF--
 <?php
 /* $Id: oo_stream.phpt 260091 2008-05-21 09:27:41Z pajoye $ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt
index f8ff1b4d44024..9a8fe05d2b456 100644
--- a/ext/zip/tests/bug53603.phpt
+++ b/ext/zip/tests/bug53603.phpt
@@ -2,7 +2,7 @@
 Bug #53603 (ZipArchive should quiet stat errors)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug53854.phpt b/ext/zip/tests/bug53854.phpt
index cd8ae7e5f3327..890bae162a9b8 100644
--- a/ext/zip/tests/bug53854.phpt
+++ b/ext/zip/tests/bug53854.phpt
@@ -2,7 +2,7 @@
 Bug #53854 (Missing constants for compression type)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug53885.phpt b/ext/zip/tests/bug53885.phpt
index 5db2367c30c57..e05c55eb35a86 100644
--- a/ext/zip/tests/bug53885.phpt
+++ b/ext/zip/tests/bug53885.phpt
@@ -2,7 +2,7 @@
 Bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt
index ea7afa8e0a7d2..1f61a42faa0e9 100644
--- a/ext/zip/tests/bug64342_0.phpt
+++ b/ext/zip/tests/bug64342_0.phpt
@@ -2,7 +2,7 @@
 Bug #64342 ZipArchive::addFile() has to check file existence (variation 1)
 --SKIPIF--
 <?php
-	if(!extension_loaded('zip')) die('skip');
+	if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug64342_1-mb.phpt b/ext/zip/tests/bug64342_1-mb.phpt
index 4ba564ee1e74a..76ff1126e4bda 100644
--- a/ext/zip/tests/bug64342_1-mb.phpt
+++ b/ext/zip/tests/bug64342_1-mb.phpt
@@ -3,7 +3,7 @@ Bug #64342 ZipArchive::addFile() has to check file existence (variation 2)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt
index 1463170e7ef14..da75acaa3b6ca 100644
--- a/ext/zip/tests/bug64342_1.phpt
+++ b/ext/zip/tests/bug64342_1.phpt
@@ -3,7 +3,7 @@ Bug #64342 ZipArchive::addFile() has to check file existence (variation 2)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug70350.phpt b/ext/zip/tests/bug70350.phpt
index d81de65a32ccc..f12f803cedf4d 100644
--- a/ext/zip/tests/bug70350.phpt
+++ b/ext/zip/tests/bug70350.phpt
@@ -2,7 +2,7 @@
 Bug #70350 (ZipArchive::extractTo allows for directory traversal when creating directories)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug7214.phpt b/ext/zip/tests/bug7214.phpt
index f791b7940dda7..6b9a185101031 100644
--- a/ext/zip/tests/bug7214.phpt
+++ b/ext/zip/tests/bug7214.phpt
@@ -3,7 +3,7 @@ Bug #7214 (zip_entry_read() binary safe)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
  ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug72660.phpt b/ext/zip/tests/bug72660.phpt
index af02b9b5a3141..c029811fdc220 100644
--- a/ext/zip/tests/bug72660.phpt
+++ b/ext/zip/tests/bug72660.phpt
@@ -2,7 +2,7 @@
 Bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 if(PHP_ZTS == 0) { die('skip ZTS required'); }
 ?>
 --FILE--
diff --git a/ext/zip/tests/bug7658.phpt b/ext/zip/tests/bug7658.phpt
index 6a873c2043f3f..048ecd6d8e810 100644
--- a/ext/zip/tests/bug7658.phpt
+++ b/ext/zip/tests/bug7658.phpt
@@ -3,7 +3,7 @@ Bug #7658 (modify archive with general bit flag 3 set)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug8009.phpt b/ext/zip/tests/bug8009.phpt
index 5dd363d2da0ba..660a8b80853c7 100644
--- a/ext/zip/tests/bug8009.phpt
+++ b/ext/zip/tests/bug8009.phpt
@@ -3,7 +3,7 @@ Bug #8009 (cannot add again same entry to an archive)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/bug8700.phpt b/ext/zip/tests/bug8700.phpt
index c394cf0bec188..6c89a122c2f7a 100644
--- a/ext/zip/tests/bug8700.phpt
+++ b/ext/zip/tests/bug8700.phpt
@@ -3,7 +3,7 @@ Bug #8700 (getFromIndex(0) fails)
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/doubleclose.phpt b/ext/zip/tests/doubleclose.phpt
index 0eccc40bad084..a31d5269d4385 100644
--- a/ext/zip/tests/doubleclose.phpt
+++ b/ext/zip/tests/doubleclose.phpt
@@ -2,7 +2,7 @@
 close() called twice
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_addemptydir.phpt b/ext/zip/tests/oo_addemptydir.phpt
index 7e739008ccbcf..0590cc4d8ee1c 100644
--- a/ext/zip/tests/oo_addemptydir.phpt
+++ b/ext/zip/tests/oo_addemptydir.phpt
@@ -3,7 +3,7 @@ ziparchive::addEmptyDir
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_addfile.phpt b/ext/zip/tests/oo_addfile.phpt
index 2c85255068741..0d2015ca2f29d 100644
--- a/ext/zip/tests/oo_addfile.phpt
+++ b/ext/zip/tests/oo_addfile.phpt
@@ -3,7 +3,7 @@ ziparchive::addFile() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_addglob.phpt b/ext/zip/tests/oo_addglob.phpt
index d9fab950605a6..64b48979bad16 100644
--- a/ext/zip/tests/oo_addglob.phpt
+++ b/ext/zip/tests/oo_addglob.phpt
@@ -7,7 +7,7 @@ w/Kenzo over the shoulder
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 if(!defined("GLOB_BRACE")) die ('skip');
 ?>
 --FILE--
diff --git a/ext/zip/tests/oo_addpattern.phpt b/ext/zip/tests/oo_addpattern.phpt
index ce31dd26d6d80..6685a35e54f00 100644
--- a/ext/zip/tests/oo_addpattern.phpt
+++ b/ext/zip/tests/oo_addpattern.phpt
@@ -7,7 +7,7 @@ w/Kenzo over the shoulder
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_close.phpt b/ext/zip/tests/oo_close.phpt
index d2b743db9cb38..3da68b648a06f 100644
--- a/ext/zip/tests/oo_close.phpt
+++ b/ext/zip/tests/oo_close.phpt
@@ -3,7 +3,7 @@ zip::close() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_count.phpt b/ext/zip/tests/oo_count.phpt
index 7d646ceacfd56..dd229932f4b8d 100644
--- a/ext/zip/tests/oo_count.phpt
+++ b/ext/zip/tests/oo_count.phpt
@@ -3,7 +3,7 @@ ziparchive::count()
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_delete.phpt b/ext/zip/tests/oo_delete.phpt
index ccc75b48675a3..13311fe4246b5 100644
--- a/ext/zip/tests/oo_delete.phpt
+++ b/ext/zip/tests/oo_delete.phpt
@@ -3,7 +3,7 @@ Delete entries
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt
index b703611667fba..ced1c44dc841c 100644
--- a/ext/zip/tests/oo_encryption.phpt
+++ b/ext/zip/tests/oo_encryption.phpt
@@ -3,7 +3,7 @@ ZipArchive::setEncryption*() functions
 --SKIPIF--
 <?php
 /* $Id$ */
-if (!extension_loaded('zip')) die('skip');
+if (!extension_loaded('zip')) die('skip zip extension not loaded');
 if (!method_exists('ZipArchive', 'setEncryptionName')) die('skip encrytion not supported');
 ?>
 --FILE--
diff --git a/ext/zip/tests/oo_ext_zip.phpt b/ext/zip/tests/oo_ext_zip.phpt
index bebce8cf16c53..43fb6a147361a 100644
--- a/ext/zip/tests/oo_ext_zip.phpt
+++ b/ext/zip/tests/oo_ext_zip.phpt
@@ -3,7 +3,7 @@ Extending Zip class and array property
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_externalattributes.phpt b/ext/zip/tests/oo_externalattributes.phpt
index 8f53e99a61c0c..8da3cc886d538 100644
--- a/ext/zip/tests/oo_externalattributes.phpt
+++ b/ext/zip/tests/oo_externalattributes.phpt
@@ -3,7 +3,7 @@ ZipArchive::*ExternalAttributes*() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if (!extension_loaded('zip')) die('skip');
+if (!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_extract.phpt b/ext/zip/tests/oo_extract.phpt
index 755d7ae906144..a1d80b527047b 100644
--- a/ext/zip/tests/oo_extract.phpt
+++ b/ext/zip/tests/oo_extract.phpt
@@ -3,7 +3,7 @@ extractTo
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_getcomment.phpt b/ext/zip/tests/oo_getcomment.phpt
index d05385c7dffce..addc35b55ca5c 100644
--- a/ext/zip/tests/oo_getcomment.phpt
+++ b/ext/zip/tests/oo_getcomment.phpt
@@ -3,7 +3,7 @@ getComment
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_getnameindex.phpt b/ext/zip/tests/oo_getnameindex.phpt
index 9f501204fa982..3df5fd4299296 100644
--- a/ext/zip/tests/oo_getnameindex.phpt
+++ b/ext/zip/tests/oo_getnameindex.phpt
@@ -3,7 +3,7 @@ getNameIndex
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_namelocate.phpt b/ext/zip/tests/oo_namelocate.phpt
index ea800130a8815..14f195c851c3c 100644
--- a/ext/zip/tests/oo_namelocate.phpt
+++ b/ext/zip/tests/oo_namelocate.phpt
@@ -3,7 +3,7 @@ Locate entries by name
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_open.phpt b/ext/zip/tests/oo_open.phpt
index 0760db34c44cf..b7211824dc7c2 100644
--- a/ext/zip/tests/oo_open.phpt
+++ b/ext/zip/tests/oo_open.phpt
@@ -3,7 +3,7 @@ zip::open() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt
index 886317b57bbe9..1bee3d5b31252 100644
--- a/ext/zip/tests/oo_properties.phpt
+++ b/ext/zip/tests/oo_properties.phpt
@@ -3,7 +3,7 @@ ziparchive::properties isset()/empty() checks
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_rename.phpt b/ext/zip/tests/oo_rename.phpt
index dbb80fa1e28d2..2fefd5aa1cf58 100644
--- a/ext/zip/tests/oo_rename.phpt
+++ b/ext/zip/tests/oo_rename.phpt
@@ -3,7 +3,7 @@ Rename entries
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_setcomment.phpt b/ext/zip/tests/oo_setcomment.phpt
index f6469c9524b5e..1e90698256f53 100644
--- a/ext/zip/tests/oo_setcomment.phpt
+++ b/ext/zip/tests/oo_setcomment.phpt
@@ -3,7 +3,7 @@ setComment
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt
index 8a746a83d73d4..13b0554000683 100644
--- a/ext/zip/tests/oo_setcompression.phpt
+++ b/ext/zip/tests/oo_setcompression.phpt
@@ -3,7 +3,7 @@ setCompressionName and setCompressionIndex methods
 --SKIPIF--
 <?php
 /* $Id$ */
-if (!extension_loaded('zip')) die('skip');
+if (!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_stream.phpt b/ext/zip/tests/oo_stream.phpt
index 126e78f6f7f53..52f4c17565208 100644
--- a/ext/zip/tests/oo_stream.phpt
+++ b/ext/zip/tests/oo_stream.phpt
@@ -3,7 +3,7 @@ getStream
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/pecl12414.phpt b/ext/zip/tests/pecl12414.phpt
index fed9bf9d6bbe4..35d77a79ae243 100644
--- a/ext/zip/tests/pecl12414.phpt
+++ b/ext/zip/tests/pecl12414.phpt
@@ -3,7 +3,7 @@ Bug #12414 ( extracting files from damaged archives)
 --SKIPIF--
 <?php
 /*$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
  ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/stream_meta_data.phpt b/ext/zip/tests/stream_meta_data.phpt
index 63f720ad85849..79309d1d2c537 100644
--- a/ext/zip/tests/stream_meta_data.phpt
+++ b/ext/zip/tests/stream_meta_data.phpt
@@ -3,7 +3,7 @@ stream_get_meta_data() on zip stream
 --SKIPIF--
 <?php
 /* $Id: oo_stream.phpt 260091 2008-05-21 09:27:41Z pajoye $ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_close.phpt b/ext/zip/tests/zip_close.phpt
index 7f9d09ae368de..dce019f543f79 100644
--- a/ext/zip/tests/zip_close.phpt
+++ b/ext/zip/tests/zip_close.phpt
@@ -3,7 +3,7 @@ zip_close() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_close.phpt b/ext/zip/tests/zip_entry_close.phpt
index 20e2123401fd4..dd8d769592331 100644
--- a/ext/zip/tests/zip_entry_close.phpt
+++ b/ext/zip/tests/zip_entry_close.phpt
@@ -3,7 +3,7 @@ zip_entry_close() function: simple and double call
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_compressedsize.phpt b/ext/zip/tests/zip_entry_compressedsize.phpt
index fefa6e59770f1..7bada24067d19 100644
--- a/ext/zip/tests/zip_entry_compressedsize.phpt
+++ b/ext/zip/tests/zip_entry_compressedsize.phpt
@@ -3,7 +3,7 @@ zip_entry_compressedsize() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_compressionmethod.phpt b/ext/zip/tests/zip_entry_compressionmethod.phpt
index cabdbb797f807..8412f9245bbaa 100644
--- a/ext/zip/tests/zip_entry_compressionmethod.phpt
+++ b/ext/zip/tests/zip_entry_compressionmethod.phpt
@@ -3,7 +3,7 @@ zip_entry_compressionmethod() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_filesize.phpt b/ext/zip/tests/zip_entry_filesize.phpt
index b8d8820b642af..abe49f9605cac 100644
--- a/ext/zip/tests/zip_entry_filesize.phpt
+++ b/ext/zip/tests/zip_entry_filesize.phpt
@@ -3,7 +3,7 @@ zip_entry_filesize() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_name.phpt b/ext/zip/tests/zip_entry_name.phpt
index 1916e25dac8b1..9f5515b9d935f 100644
--- a/ext/zip/tests/zip_entry_name.phpt
+++ b/ext/zip/tests/zip_entry_name.phpt
@@ -3,7 +3,7 @@ zip_entry_name() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_open.phpt b/ext/zip/tests/zip_entry_open.phpt
index c32fe57407e21..9df89dd260923 100644
--- a/ext/zip/tests/zip_entry_open.phpt
+++ b/ext/zip/tests/zip_entry_open.phpt
@@ -3,7 +3,7 @@ zip_entry_open() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_entry_read.phpt b/ext/zip/tests/zip_entry_read.phpt
index d876f03fb51ca..56c32f6ab2a0d 100644
--- a/ext/zip/tests/zip_entry_read.phpt
+++ b/ext/zip/tests/zip_entry_read.phpt
@@ -3,7 +3,7 @@ zip_entry_read() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_open.phpt b/ext/zip/tests/zip_open.phpt
index 91474bc6fd265..bd70f93e8fc1a 100644
--- a/ext/zip/tests/zip_open.phpt
+++ b/ext/zip/tests/zip_open.phpt
@@ -3,7 +3,7 @@ zip_open() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_open_error.phpt b/ext/zip/tests/zip_open_error.phpt
index eaa1d9731e372..8b420b1fd1f1e 100644
--- a/ext/zip/tests/zip_open_error.phpt
+++ b/ext/zip/tests/zip_open_error.phpt
@@ -5,7 +5,7 @@ Birgitte Kvarme <bitta@redpill-linpro.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
 --SKIPIF--
 <?php
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zip/tests/zip_read.phpt b/ext/zip/tests/zip_read.phpt
index 5cadb2d1efeeb..b419dd414a7cc 100644
--- a/ext/zip/tests/zip_read.phpt
+++ b/ext/zip/tests/zip_read.phpt
@@ -3,7 +3,7 @@ zip_read() function
 --SKIPIF--
 <?php
 /* $Id$ */
-if(!extension_loaded('zip')) die('skip');
+if(!extension_loaded('zip')) die('skip zip extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/001.phpt b/ext/zlib/tests/001.phpt
index 4850a65a5a03b..b669986d9e93f 100644
--- a/ext/zlib/tests/001.phpt
+++ b/ext/zlib/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzdeflate()/gzinflate()
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $original = str_repeat("hallo php",4096);
diff --git a/ext/zlib/tests/002.phpt b/ext/zlib/tests/002.phpt
index 9844a1b93d82b..b1257cfdb8baa 100644
--- a/ext/zlib/tests/002.phpt
+++ b/ext/zlib/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzcompress()/gzuncompress()
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $original = str_repeat("hallo php",4096);
diff --git a/ext/zlib/tests/003.phpt b/ext/zlib/tests/003.phpt
index d9275d9f1f227..2666cb854e855 100644
--- a/ext/zlib/tests/003.phpt
+++ b/ext/zlib/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzencode()
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $original = str_repeat("hallo php",4096);
diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt
index a9371f414f046..1848addb09eed 100644
--- a/ext/zlib/tests/004-mb.phpt
+++ b/ext/zlib/tests/004-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzfile() with various invalid params
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt
index ebc7d82b9513d..545b2c93d42a1 100644
--- a/ext/zlib/tests/004.phpt
+++ b/ext/zlib/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzfile() with various invalid params
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 84fc3b5f10f65..f42034a5520b0 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzcompress()/gzuncompress() and invalid params 
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index 8c03ea068d99a..5b9a200b20ffe 100644
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzdeflate()/gzinflate() and invalid params 
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index c55d78d126c87..cfae88d40315a 100644
--- a/ext/zlib/tests/007.phpt
+++ b/ext/zlib/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzencode() and invalid params
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/bug60761.phpt b/ext/zlib/tests/bug60761.phpt
index 1e9fe69a012e5..027219e519115 100644
--- a/ext/zlib/tests/bug60761.phpt
+++ b/ext/zlib/tests/bug60761.phpt
@@ -1,7 +1,7 @@
 --TEST--
 checks zlib compression output size is always the same
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --CGI--
 1
 --FILE--
diff --git a/ext/zlib/tests/bug61443.phpt b/ext/zlib/tests/bug61443.phpt
index 6d562fe995aea..eafd01f157e93 100644
--- a/ext/zlib/tests/bug61443.phpt
+++ b/ext/zlib/tests/bug61443.phpt
@@ -2,7 +2,7 @@
 bug #61443
 --SKIPIF--
 <?php
-extension_loaded("zlib") or die("skip");
+extension_loaded("zlib") or die("skip zlib extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/bug61820.phpt b/ext/zlib/tests/bug61820.phpt
index 6f33b5455310b..596e39997ada2 100644
--- a/ext/zlib/tests/bug61820.phpt
+++ b/ext/zlib/tests/bug61820.phpt
@@ -2,7 +2,7 @@
 bug #61820 using ob_gzhandler will complain about headers already sent when no compression
 --SKIPIF--
 <?php
-extension_loaded("zlib") or die("skip");
+extension_loaded("zlib") or die("skip zlib extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/bug75299.phpt b/ext/zlib/tests/bug75299.phpt
index b9a9439f2e18b..afd317d1d5e4a 100644
--- a/ext/zlib/tests/bug75299.phpt
+++ b/ext/zlib/tests/bug75299.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75299 Wrong reflection on inflate_init and inflate_add
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $r = new ReflectionFunction('inflate_init');
diff --git a/ext/zlib/tests/bug_34821.phpt b/ext/zlib/tests/bug_34821.phpt
index b378ec4097c90..0a11e8e83e93e 100644
--- a/ext/zlib/tests/bug_34821.phpt
+++ b/ext/zlib/tests/bug_34821.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34821 (zlib encoders fail on widely varying binary data)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/bug_40189.phpt b/ext/zlib/tests/bug_40189.phpt
index aedf0619a1662..0c6a404f7ffde 100644
--- a/ext/zlib/tests/bug_40189.phpt
+++ b/ext/zlib/tests/bug_40189.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40189 (endless loop in zlib.inflate stream filter)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 allow_url_fopen=1
 --FILE--
diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt
index 68bd53791d559..07964e9e21ae0 100644
--- a/ext/zlib/tests/bug_52944.phpt
+++ b/ext/zlib/tests/bug_52944.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52944 (segfault with zlib filter and corrupted data)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --INI--
 allow_url_fopen=1
 --FILE--
diff --git a/ext/zlib/tests/compress_zlib_wrapper.phpt b/ext/zlib/tests/compress_zlib_wrapper.phpt
index 4bf6c08317fee..416400db0a996 100644
--- a/ext/zlib/tests/compress_zlib_wrapper.phpt
+++ b/ext/zlib/tests/compress_zlib_wrapper.phpt
@@ -1,7 +1,7 @@
 --TEST--
 compress.zlib:// wrapper
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 chdir(dirname(__FILE__). "/../../..");
diff --git a/ext/zlib/tests/gzfilegzreadfile.phpt b/ext/zlib/tests/gzfilegzreadfile.phpt
index ef6378de25787..f35a79492ddde 100644
--- a/ext/zlib/tests/gzfilegzreadfile.phpt
+++ b/ext/zlib/tests/gzfilegzreadfile.phpt
@@ -2,7 +2,7 @@
 gzfile(), gzreadfile()
 --SKIPIF--
 <?php /* $Id$ */
-if (!extension_loaded("zlib")) print "skip"; ?>
+if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $original = <<<EOD
diff --git a/ext/zlib/tests/gzinflate-bug42663.phpt b/ext/zlib/tests/gzinflate-bug42663.phpt
index 4f0ca9fa7fa9a..b5476753894f1 100644
--- a/ext/zlib/tests/gzinflate-bug42663.phpt
+++ b/ext/zlib/tests/gzinflate-bug42663.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42663 (gzinflate() try to allocate all memory with truncated $data)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 // build a predictable string
diff --git a/ext/zlib/tests/gzinflate_length.phpt b/ext/zlib/tests/gzinflate_length.phpt
index 6e86d865ee79c..ff002bce1116c 100644
--- a/ext/zlib/tests/gzinflate_length.phpt
+++ b/ext/zlib/tests/gzinflate_length.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gzinflate() and $length argument
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $original = 'aaaaaaaaaaaaaaa';
diff --git a/ext/zlib/tests/gzreadgzwrite.phpt b/ext/zlib/tests/gzreadgzwrite.phpt
index 817002807f159..4b515acec41fd 100644
--- a/ext/zlib/tests/gzreadgzwrite.phpt
+++ b/ext/zlib/tests/gzreadgzwrite.phpt
@@ -2,7 +2,7 @@
 gzopen(), gzread(), gzwrite()
 --SKIPIF--
 <?php # vim600:syn=php:
-if (!extension_loaded("zlib")) print "skip"; ?>
+if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $original = str_repeat("hallo php",4096);
diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt
index 58901ac08fc08..6aafaacf559bd 100644
--- a/ext/zlib/tests/gzreadgzwriteplain.phpt
+++ b/ext/zlib/tests/gzreadgzwriteplain.phpt
@@ -2,7 +2,7 @@
 gzopen(), gzread(), gzwrite() for non-compressed data
 --SKIPIF--
 <?php # vim600:syn=php:
-if (!extension_loaded("zlib")) print "skip"; ?>
+if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 $original = str_repeat("hallo php",4096);
diff --git a/ext/zlib/tests/inflate_get_read_len.phpt b/ext/zlib/tests/inflate_get_read_len.phpt
index 54555fa7ba4df..46dc6063a551f 100644
--- a/ext/zlib/tests/inflate_get_read_len.phpt
+++ b/ext/zlib/tests/inflate_get_read_len.phpt
@@ -1,7 +1,7 @@
 --TEST--
 inflate_get_read_len()
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/inflate_get_status.phpt b/ext/zlib/tests/inflate_get_status.phpt
index 01387b8122cf5..ebd8e537387c6 100644
--- a/ext/zlib/tests/inflate_get_status.phpt
+++ b/ext/zlib/tests/inflate_get_status.phpt
@@ -1,7 +1,7 @@
 --TEST--
 inflate_get_status()
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/zlib_filter_deflate.phpt b/ext/zlib/tests/zlib_filter_deflate.phpt
index 1811779f04f64..1284caf987386 100644
--- a/ext/zlib/tests/zlib_filter_deflate.phpt
+++ b/ext/zlib/tests/zlib_filter_deflate.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zlib.deflate (with convert.base64-encode)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $text = 'I am the very model of a modern major general, I\'ve information vegetable, animal, and mineral.';
diff --git a/ext/zlib/tests/zlib_filter_inflate.phpt b/ext/zlib/tests/zlib_filter_inflate.phpt
index 026f192a6ecdb..ac9dc716ba63c 100644
--- a/ext/zlib/tests/zlib_filter_inflate.phpt
+++ b/ext/zlib/tests/zlib_filter_inflate.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zlib.inflate (with convert.base64-decode)
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 $text = 'HctBDoAgDETRq8zOjfEeHKOGATG0TRpC4u1Vdn/xX4IoxkVMxgP1zA4vkJVhULk9UGkM6TvSNolmxUNlNLePVQ45O3eINf0fsQxtCxwv';
diff --git a/ext/zlib/tests/zlib_filter_inflate2.phpt b/ext/zlib/tests/zlib_filter_inflate2.phpt
index de3d968959dac..484cf9d7dd4ff 100644
--- a/ext/zlib/tests/zlib_filter_inflate2.phpt
+++ b/ext/zlib/tests/zlib_filter_inflate2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 zlib.inflate of gzip-encoded stream
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php /* $Id$ */
 
diff --git a/ext/zlib/tests/zlib_get_coding_type_basic.phpt b/ext/zlib/tests/zlib_get_coding_type_basic.phpt
index 48fa7457453f1..d5f80a1654754 100644
--- a/ext/zlib/tests/zlib_get_coding_type_basic.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_basic.phpt
@@ -3,7 +3,7 @@ zlib_get_coding_type() basic call without env
 --CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --FILE--
 <?php
 ini_set('zlib.output_compression', 'Off');
diff --git a/ext/zlib/tests/zlib_get_coding_type_br.phpt b/ext/zlib/tests/zlib_get_coding_type_br.phpt
index 2c4d46ddd70ac..473646777047e 100644
--- a/ext/zlib/tests/zlib_get_coding_type_br.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_br.phpt
@@ -3,7 +3,7 @@ zlib_get_coding_type() with unsupported encoding
 --CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --ENV--
 HTTP_ACCEPT_ENCODING=br
 --FILE--
diff --git a/ext/zlib/tests/zlib_get_coding_type_deflate.phpt b/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
index f6f999b978383..97f477072e3c3 100644
--- a/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
@@ -3,7 +3,7 @@ zlib_get_coding_type() with deflate encoding
 --CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --ENV--
 HTTP_ACCEPT_ENCODING=deflate
 --FILE--
diff --git a/ext/zlib/tests/zlib_get_coding_type_gzip.phpt b/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
index b5afb0c02a5e2..4ed117c36632b 100644
--- a/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
@@ -3,7 +3,7 @@ zlib_get_coding_type() with gzip encoding
 --CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib extension not loaded"); ?>
 --ENV--
 HTTP_ACCEPT_ENCODING=gzip
 --FILE--