From a06d015e6163f345375fb0ffedbfce41b442b821 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 14 Jun 2021 15:22:00 +0200
Subject: [PATCH] Remove unnecessary mbstring skipifs

These functions are always available (if the extension is available
at all).
---
 ext/mbstring/tests/bug43840.phpt                             | 4 ----
 ext/mbstring/tests/bug43841.phpt                             | 4 ----
 ext/mbstring/tests/bug43998.phpt                             | 4 ----
 ext/mbstring/tests/casefold.phpt                             | 5 -----
 ext/mbstring/tests/mb_convert_encoding_array.phpt            | 4 ----
 ext/mbstring/tests/mb_convert_encoding_array2.phpt           | 4 ----
 ext/mbstring/tests/mb_convert_encoding_basic.phpt            | 4 ----
 .../tests/mb_convert_encoding_empty_encoding_list.phpt       | 4 ----
 ext/mbstring/tests/mb_convert_kana.phpt                      | 4 ----
 ext/mbstring/tests/mb_decode_mimeheader_basic.phpt           | 4 ----
 ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt      | 4 ----
 ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt      | 4 ----
 ext/mbstring/tests/mb_decode_numericentity.phpt              | 4 ----
 ext/mbstring/tests/mb_encode_mimeheader_basic.phpt           | 4 ----
 ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt          | 4 ----
 ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt          | 4 ----
 ext/mbstring/tests/mb_encode_mimeheader_indent.phpt          | 4 ----
 ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt      | 4 ----
 ext/mbstring/tests/mb_encode_numericentity.phpt              | 4 ----
 ext/mbstring/tests/mb_internal_encoding_basic.phpt           | 4 ----
 ext/mbstring/tests/mb_internal_encoding_basic2.phpt          | 4 ----
 ext/mbstring/tests/mb_internal_encoding_error2.phpt          | 4 ----
 ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt      | 4 ----
 .../tests/mb_internal_encoding_ini_invalid_encoding.phpt     | 4 ----
 ext/mbstring/tests/mb_internal_encoding_variation2.phpt      | 4 ----
 ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt     | 4 ----
 ext/mbstring/tests/mb_stripos_basic.phpt                     | 4 ----
 ext/mbstring/tests/mb_stripos_basic2.phpt                    | 4 ----
 ext/mbstring/tests/mb_stripos_empty_needle.phpt              | 4 ----
 ext/mbstring/tests/mb_stripos_error2.phpt                    | 4 ----
 ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt       | 4 ----
 ext/mbstring/tests/mb_stristr_basic.phpt                     | 4 ----
 ext/mbstring/tests/mb_stristr_empty_needle.phpt              | 4 ----
 ext/mbstring/tests/mb_stristr_error2.phpt                    | 4 ----
 ext/mbstring/tests/mb_stristr_variation5.phpt                | 4 ----
 ext/mbstring/tests/mb_strlen_basic.phpt                      | 4 ----
 ext/mbstring/tests/mb_strlen_error2.phpt                     | 4 ----
 ext/mbstring/tests/mb_strlen_variation3.phpt                 | 4 ----
 ext/mbstring/tests/mb_strpos_basic.phpt                      | 4 ----
 ext/mbstring/tests/mb_strpos_empty_needle.phpt               | 4 ----
 ext/mbstring/tests/mb_strpos_error2.phpt                     | 4 ----
 ext/mbstring/tests/mb_strpos_variation5.phpt                 | 4 ----
 ext/mbstring/tests/mb_strrchr_basic.phpt                     | 4 ----
 ext/mbstring/tests/mb_strrchr_empty_needle.phpt              | 4 ----
 ext/mbstring/tests/mb_strrchr_error2.phpt                    | 4 ----
 ext/mbstring/tests/mb_strrchr_variation5.phpt                | 4 ----
 ext/mbstring/tests/mb_strrchr_variation6.phpt                | 4 ----
 ext/mbstring/tests/mb_strrichr_basic.phpt                    | 4 ----
 ext/mbstring/tests/mb_strrichr_error2.phpt                   | 4 ----
 ext/mbstring/tests/mb_strrichr_variation5.phpt               | 4 ----
 ext/mbstring/tests/mb_strripos_basic.phpt                    | 4 ----
 ext/mbstring/tests/mb_strripos_basic2.phpt                   | 4 ----
 ext/mbstring/tests/mb_strripos_empty_needle.phpt             | 4 ----
 ext/mbstring/tests/mb_strripos_error2.phpt                   | 4 ----
 ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt      | 4 ----
 ext/mbstring/tests/mb_strrpos_basic.phpt                     | 4 ----
 ext/mbstring/tests/mb_strrpos_empty_needle.phpt              | 4 ----
 ext/mbstring/tests/mb_strrpos_error2.phpt                    | 4 ----
 ext/mbstring/tests/mb_strstr_basic.phpt                      | 4 ----
 ext/mbstring/tests/mb_strstr_empty_needle.phpt               | 4 ----
 ext/mbstring/tests/mb_strstr_error2.phpt                     | 4 ----
 ext/mbstring/tests/mb_strstr_variation5.phpt                 | 4 ----
 ext/mbstring/tests/mb_strstr_variation6.phpt                 | 4 ----
 ext/mbstring/tests/mb_strtolower_basic.phpt                  | 4 ----
 ext/mbstring/tests/mb_strtolower_error2.phpt                 | 4 ----
 ext/mbstring/tests/mb_strtolower_variation3.phpt             | 4 ----
 ext/mbstring/tests/mb_strtolower_variation4.phpt             | 4 ----
 ext/mbstring/tests/mb_strtoupper_basic.phpt                  | 4 ----
 ext/mbstring/tests/mb_strtoupper_error2.phpt                 | 4 ----
 ext/mbstring/tests/mb_strtoupper_variation3.phpt             | 4 ----
 ext/mbstring/tests/mb_strtoupper_variation4.phpt             | 4 ----
 ext/mbstring/tests/mb_substr_basic.phpt                      | 4 ----
 ext/mbstring/tests/mb_substr_count_basic.phpt                | 4 ----
 ext/mbstring/tests/mb_substr_count_error2.phpt               | 4 ----
 ext/mbstring/tests/mb_substr_count_variation4.phpt           | 4 ----
 ext/mbstring/tests/mb_substr_error2.phpt                     | 4 ----
 ext/mbstring/tests/mb_substr_variation4.phpt                 | 4 ----
 ext/mbstring/tests/mb_substr_variation5.phpt                 | 4 ----
 ext/mbstring/tests/mb_substr_variation6.phpt                 | 4 ----
 ext/mbstring/tests/mb_substr_variation7.phpt                 | 4 ----
 80 files changed, 321 deletions(-)

diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt
index 76274f3475a..887ff96f97b 100644
--- a/ext/mbstring/tests/bug43840.phpt
+++ b/ext/mbstring/tests/bug43840.phpt
@@ -2,10 +2,6 @@
 Test mb_strpos() function : mb_strpos bounds check is byte count rather than a character count
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt
index 991eb70111d..62e8cdcefbe 100644
--- a/ext/mbstring/tests/bug43841.phpt
+++ b/ext/mbstring/tests/bug43841.phpt
@@ -2,10 +2,6 @@
 Test mb_strrpos() function : mb_strrpos offset is byte count for negative values
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/bug43998.phpt b/ext/mbstring/tests/bug43998.phpt
index 0be94dff828..112ab887283 100644
--- a/ext/mbstring/tests/bug43998.phpt
+++ b/ext/mbstring/tests/bug43998.phpt
@@ -2,10 +2,6 @@
 Test mb_strtolower() function : Two error messages returned for incorrect encoding for mb_strto[upper|lower]
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt
index 7c9fa1b7c9f..702eac24bb4 100644
--- a/ext/mbstring/tests/casefold.phpt
+++ b/ext/mbstring/tests/casefold.phpt
@@ -2,11 +2,6 @@
 mb_strtoupper() / mb_strtolower()
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') and
-function_exists('mb_convert_case' ) or die("skip mb_convert_case() is not available");
-?>
 --INI--
 output_handler=
 --FILE--
diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt
index ba5f0977d81..b2d6fb89b7f 100644
--- a/ext/mbstring/tests/mb_convert_encoding_array.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt
@@ -2,10 +2,6 @@
 Test mb_convert_encoding() function : array functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_convert_encoding_array2.phpt b/ext/mbstring/tests/mb_convert_encoding_array2.phpt
index 514d7a8d66f..11bb7511d38 100644
--- a/ext/mbstring/tests/mb_convert_encoding_array2.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_array2.phpt
@@ -2,10 +2,6 @@
 Test mb_convert_encoding() function : Circular references
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
index 4288a5ae65e..6aea4f4c3f1 100644
--- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_convert_encoding() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_convert_encoding_empty_encoding_list.phpt b/ext/mbstring/tests/mb_convert_encoding_empty_encoding_list.phpt
index d79049b6967..52068180935 100644
--- a/ext/mbstring/tests/mb_convert_encoding_empty_encoding_list.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_empty_encoding_list.phpt
@@ -2,10 +2,6 @@
 Test mb_convert_encoding() function : empty encoding list
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_convert_kana.phpt b/ext/mbstring/tests/mb_convert_kana.phpt
index 0768163a0c7..a9f9ef333d4 100644
--- a/ext/mbstring/tests/mb_convert_kana.phpt
+++ b/ext/mbstring/tests/mb_convert_kana.phpt
@@ -2,10 +2,6 @@
 Testing mb_convert_kana() function
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-if (!function_exists("mb_convert_kana")) print "skip mb_convert_kana() not available";
-?>
 --FILE--
 <?php
 $zenKakuA    =	'ァアィイゥウェエォオカガキギク';
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
index df2075d23ca..cf50a57e810 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_decode_mimeheader() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
index 211e6d13432..f869f777c3c 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
@@ -2,10 +2,6 @@
 Test mb_decode_mimeheader() function : variation
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_decode_mimeheader() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
index e4693ef1ca1..6366131266a 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
@@ -2,10 +2,6 @@
 Test mb_decode_mimeheader() function : variation
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_decode_mimeheader() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_decode_numericentity.phpt b/ext/mbstring/tests/mb_decode_numericentity.phpt
index b0247e286fe..82220db3168 100644
--- a/ext/mbstring/tests/mb_decode_numericentity.phpt
+++ b/ext/mbstring/tests/mb_decode_numericentity.phpt
@@ -2,10 +2,6 @@
 Test mb_decode_numericentity() function : Convert HTML-Entities to UTF-8
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 $str1 = '&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;';
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
index 4b7da6fc5b8..fcc18b71074 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_mimeheader() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
index fee9bc5c568..695dd07b3ef 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_mimeheader() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
index 88770611b94..6817d25dc5c 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_mimeheader() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
index e4ee3f37658..afaab29c874 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_mimeheader() function : basic functionality, indent
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 /* (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
index 619f45fca1b..cc3e3d0c213 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_mimeheader() function : usage variations - Pass different strings to $linefeed arg
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 /* (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
diff --git a/ext/mbstring/tests/mb_encode_numericentity.phpt b/ext/mbstring/tests/mb_encode_numericentity.phpt
index b06a2c6b1a0..78788fc900d 100644
--- a/ext/mbstring/tests/mb_encode_numericentity.phpt
+++ b/ext/mbstring/tests/mb_encode_numericentity.phpt
@@ -2,10 +2,6 @@
 Test mb_encode_numericentity() function : Convert UTF-8 to HTML-Entities
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is not available in this build");
-?>
 --FILE--
 <?php
 $str1 = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ';
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
index 92322b985f2..86a6e7cb745 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_internal_encoding() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
index c4964884366..52342622a6e 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
@@ -7,10 +7,6 @@ output_encoding="ISO-8859-1"
 internal_encoding="ISO-8859-1"
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
index 07321467a88..300525a1c2a 100644
--- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_internal_encoding() function : error conditions - pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
index a09db12d2a8..aecee5e91c9 100644
--- a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
@@ -2,10 +2,6 @@
 Test INI mbstring.internal_encoding basic - encoding when valid specified
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --INI--
 mbstring.internal_encoding=ISO-8859-7
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt
index 00980fbca82..7670ffc6b9d 100644
--- a/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_ini_invalid_encoding.phpt
@@ -2,10 +2,6 @@
 Test INI mbstring.internal_encoding basic - invalid encoding specified in INI
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --INI--
 mbstring.internal_encoding=BAD
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
index ee6c236866f..dab306b12a2 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
@@ -2,10 +2,6 @@
 Test mb_internal_encoding() function : usage variations - Test different encodings
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
index a7302520efa..7806ac057aa 100644
--- a/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
+++ b/ext/mbstring/tests/mb_strcut_missing_boundary_check.phpt
@@ -2,10 +2,6 @@
 mb_strcut() missing boundary check.
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not available in this build");
-?>
 --FILE--
 <?php
 mb_internal_encoding("UCS-4LE");
diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt
index 01aa701f0de..864a98cd830 100644
--- a/ext/mbstring/tests/mb_stripos_basic.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_stripos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt
index c4ffc2b952f..97a9a706874 100644
--- a/ext/mbstring/tests/mb_stripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic2.phpt
@@ -2,10 +2,6 @@
 Test mb_stripos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_stripos_empty_needle.phpt b/ext/mbstring/tests/mb_stripos_empty_needle.phpt
index 4d57efb370b..3c1ad64d420 100644
--- a/ext/mbstring/tests/mb_stripos_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_stripos_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_stripos() function :  with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt
index a2e5fff5f97..27c516df35d 100644
--- a/ext/mbstring/tests/mb_stripos_error2.phpt
+++ b/ext/mbstring/tests/mb_stripos_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_stripos() function : error conditions - Pass unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
index f344c4ea875..f4d0a091f6a 100644
--- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
@@ -2,10 +2,6 @@
 Test mb_stripos() function : usage variations - Pass different integers as $offset argument
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stripos') or die("skip mb_stripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt
index f7f8d8de8a0..c8c7ea89d6a 100644
--- a/ext/mbstring/tests/mb_stristr_basic.phpt
+++ b/ext/mbstring/tests/mb_stristr_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_stristr() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_stristr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_stristr_empty_needle.phpt b/ext/mbstring/tests/mb_stristr_empty_needle.phpt
index 14a21b9f0a5..b9a532217f9 100644
--- a/ext/mbstring/tests/mb_stristr_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_stristr_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_stristr() function : with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt
index 73418645dbe..3efbe221852 100644
--- a/ext/mbstring/tests/mb_stristr_error2.phpt
+++ b/ext/mbstring/tests/mb_stristr_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_stristr() function : error conditions
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_stristr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt
index dd1d3f898fe..feda43051b9 100644
--- a/ext/mbstring/tests/mb_stristr_variation5.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_stristr() function : usage variation - multiple needles
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_stristr') or die("skip mb_stristr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_stristr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt
index 06c03544ce8..2a15dbce759 100644
--- a/ext/mbstring/tests/mb_strlen_basic.phpt
+++ b/ext/mbstring/tests/mb_strlen_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strlen() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt
index d217bfeb31d..fc680a4d46b 100644
--- a/ext/mbstring/tests/mb_strlen_error2.phpt
+++ b/ext/mbstring/tests/mb_strlen_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strlen() function : error conditions - pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt
index 069c7574537..c0fd3972e09 100644
--- a/ext/mbstring/tests/mb_strlen_variation3.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation3.phpt
@@ -2,10 +2,6 @@
 Test mb_strlen() function : usage variations - Pass list of encodings
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strlen') or die("skip mb_strlen() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt
index 2d530f1b2a0..8b1dab34c3b 100644
--- a/ext/mbstring/tests/mb_strpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strpos_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strpos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strpos_empty_needle.phpt b/ext/mbstring/tests/mb_strpos_empty_needle.phpt
index 5b3551c6cc3..a77a01e8276 100644
--- a/ext/mbstring/tests/mb_strpos_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_strpos_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_strpos() function : with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt
index 255d5ad0919..ceabe285acf 100644
--- a/ext/mbstring/tests/mb_strpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strpos_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strpos() function : error conditions - Pass unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt
index a2e7ab8dcfa..4b2315772c6 100644
--- a/ext/mbstring/tests/mb_strpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_strpos() function : usage variations - Pass different integers as $offset argument
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strpos') or die("skip mb_strpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt
index 5b32e69b1cc..c9a9c724f63 100644
--- a/ext/mbstring/tests/mb_strrchr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrchr_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strrchr() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrchr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_empty_needle.phpt b/ext/mbstring/tests/mb_strrchr_empty_needle.phpt
index bba47d1c150..754bbebe0ca 100644
--- a/ext/mbstring/tests/mb_strrchr_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_strrchr_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_strrchr() function : with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt
index 9823ce2d4e9..453b319a204 100644
--- a/ext/mbstring/tests/mb_strrchr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrchr_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strrchr() function : error conditions
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrchr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt
index 659d90b2e1d..0a1950fdaa8 100644
--- a/ext/mbstring/tests/mb_strrchr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_strrchr() function : variation - multiple needles
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrchr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt
index bb60098b623..f46f1fb89aa 100644
--- a/ext/mbstring/tests/mb_strrchr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt
@@ -2,10 +2,6 @@
 Test mb_strrchr() function : variation - case sensitivity
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrchr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt
index da414561925..946a2f94018 100644
--- a/ext/mbstring/tests/mb_strrichr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrichr_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strrichr() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrichr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt
index 2903c15fecb..a0caa222bb9 100644
--- a/ext/mbstring/tests/mb_strrichr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrichr_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strrichr() function : error conditions
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrichr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt
index 278e61042de..2340c6d5f81 100644
--- a/ext/mbstring/tests/mb_strrichr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_strrichr() function : usage variation - multiple needles
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strrichr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt
index 78cfd1acd72..73bbe57f57a 100644
--- a/ext/mbstring/tests/mb_strripos_basic.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strripos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt
index 9cf37ba4d69..45a7f2380ca 100644
--- a/ext/mbstring/tests/mb_strripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic2.phpt
@@ -2,10 +2,6 @@
 Test mb_strripos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strripos_empty_needle.phpt b/ext/mbstring/tests/mb_strripos_empty_needle.phpt
index a788eca4e85..7f2ca9ee1ee 100644
--- a/ext/mbstring/tests/mb_strripos_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_strripos_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_strripos() function : with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt
index af7cfa4b41e..8525a1b90bf 100644
--- a/ext/mbstring/tests/mb_strripos_error2.phpt
+++ b/ext/mbstring/tests/mb_strripos_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strripos() function : error conditions - Pass unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
index d621e6dba35..f0466598aad 100644
--- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
@@ -2,10 +2,6 @@
 Test mb_strripos() function : usage variations - Pass different integers as $offset argument
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strripos') or die("skip mb_strripos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt
index 811c625556a..28e038da406 100644
--- a/ext/mbstring/tests/mb_strrpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strrpos_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strrpos() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strrpos_empty_needle.phpt b/ext/mbstring/tests/mb_strrpos_empty_needle.phpt
index be604245356..cffb58314c1 100644
--- a/ext/mbstring/tests/mb_strrpos_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_strrpos_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_strrpos() function :  with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt
index 34bd4b374d4..17d2927987c 100644
--- a/ext/mbstring/tests/mb_strrpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strrpos() function : error conditions - pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt
index fd88b61ba1e..21a29aa6acc 100644
--- a/ext/mbstring/tests/mb_strstr_basic.phpt
+++ b/ext/mbstring/tests/mb_strstr_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strstr() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strstr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_empty_needle.phpt b/ext/mbstring/tests/mb_strstr_empty_needle.phpt
index 531ed528a78..df31dc2c6cc 100644
--- a/ext/mbstring/tests/mb_strstr_empty_needle.phpt
+++ b/ext/mbstring/tests/mb_strstr_empty_needle.phpt
@@ -2,10 +2,6 @@
 Test mb_strstr() function : with empty needle
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
-?>
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt
index 38a7812158e..f798a35592a 100644
--- a/ext/mbstring/tests/mb_strstr_error2.phpt
+++ b/ext/mbstring/tests/mb_strstr_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strstr() function : error conditions
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strstr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt
index a2e2a3cd5c2..f1d04633b07 100644
--- a/ext/mbstring/tests/mb_strstr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_strstr() function : variation - multiple needles
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strstr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt
index aa011f0a7de..ee4109bfabd 100644
--- a/ext/mbstring/tests/mb_strstr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation6.phpt
@@ -2,10 +2,6 @@
 Test mb_strstr() function : variation - case sensitivity
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strstr') or die("skip mb_strstr() is not available in this build");
-?>
 --FILE--
 <?php
 echo "*** Testing mb_strstr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strtolower_basic.phpt b/ext/mbstring/tests/mb_strtolower_basic.phpt
index 9226fe6a21c..debb42cd9ed 100644
--- a/ext/mbstring/tests/mb_strtolower_basic.phpt
+++ b/ext/mbstring/tests/mb_strtolower_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strtolower() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt
index c9ac2660631..cbe4df5ca62 100644
--- a/ext/mbstring/tests/mb_strtolower_error2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strtolower() function : error conditions - pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtolower_variation3.phpt b/ext/mbstring/tests/mb_strtolower_variation3.phpt
index a50b7906688..8df72184260 100644
--- a/ext/mbstring/tests/mb_strtolower_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation3.phpt
@@ -2,10 +2,6 @@
 Test mb_strtolower() function : usage variations - pass mixed ASCII and non-ASCII strings
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt
index da798ea3900..875819532b1 100644
--- a/ext/mbstring/tests/mb_strtolower_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt
@@ -2,10 +2,6 @@
 Test mb_strtolower() function : usage variations - pass different characters to check conversion is correct
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtolower') or die("skip mb_strtolower() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtoupper_basic.phpt b/ext/mbstring/tests/mb_strtoupper_basic.phpt
index 142e259d6d7..5a8524c1681 100644
--- a/ext/mbstring/tests/mb_strtoupper_basic.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_strtoupper() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtoupper_error2.phpt b/ext/mbstring/tests/mb_strtoupper_error2.phpt
index 19987c0e10a..75de762e4be 100644
--- a/ext/mbstring/tests/mb_strtoupper_error2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_strtoupper() function : error conditions - pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtoupper_variation3.phpt b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
index de6242bd8ae..b00e63a99c4 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation3.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation3.phpt
@@ -2,10 +2,6 @@
 Test mb_strtoupper() function : usage varitations - pass mixed ASCII and non-ASCII strings
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
index 13cd6d6acc6..58535798f24 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
@@ -2,10 +2,6 @@
 Test mb_strtoupper() function : usage varitations - Pass different character types to check conversion is correct
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt
index e52f3b75455..31de868fb93 100644
--- a/ext/mbstring/tests/mb_substr_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --INI--
 internal_encoding=ISO-8859-1
 --FILE--
diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt
index 44977f6b798..31588592f77 100644
--- a/ext/mbstring/tests/mb_substr_count_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_count_basic.phpt
@@ -2,10 +2,6 @@
 Test mb_substr_count() function : basic functionality
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt
index e93c8da3c01..b1a8241cae6 100644
--- a/ext/mbstring/tests/mb_substr_count_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_substr_count() function : error conditions - pass unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt
index 3d5196df882..24938fbde64 100644
--- a/ext/mbstring/tests/mb_substr_count_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt
@@ -2,10 +2,6 @@
 Test mb_substr_count() function : variation - pass a $needle that overlaps in $haystack
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr_count') or die("skip mb_substr_count() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt
index 983a3c0d96c..c0849a32b44 100644
--- a/ext/mbstring/tests/mb_substr_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_error2.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : error conditions - Pass an unknown encoding
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt
index 6e171d5a02c..49109b03ce0 100644
--- a/ext/mbstring/tests/mb_substr_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_variation4.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : usage variations - pass different integers to $start arg
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt
index da7f35ceaa2..ebcf6df49fc 100644
--- a/ext/mbstring/tests/mb_substr_variation5.phpt
+++ b/ext/mbstring/tests/mb_substr_variation5.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : usage variations - pass different integers to $length arg
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt
index 51644bb42af..589cd4ee3e2 100644
--- a/ext/mbstring/tests/mb_substr_variation6.phpt
+++ b/ext/mbstring/tests/mb_substr_variation6.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : usage variations - pass different integers to $start arg
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --FILE--
 <?php
 /*
diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt
index bc197b1aa56..0738cd52f7a 100644
--- a/ext/mbstring/tests/mb_substr_variation7.phpt
+++ b/ext/mbstring/tests/mb_substr_variation7.phpt
@@ -2,10 +2,6 @@
 Test mb_substr() function : usage variations - pass different integers to $length arg
 --EXTENSIONS--
 mbstring
---SKIPIF--
-<?php
-function_exists('mb_substr') or die("skip mb_substr() is not available in this build");
-?>
 --FILE--
 <?php
 /*