From: Max Semenik <maxsem.wiki@gmail.com>
Date: Mon, 22 Mar 2021 13:10:15 +0000 (+0300)
Subject: Migrate skip checks to --EXTENSIONS--, p1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56f90492d68cf01a35fb0ce0290a50c09660b86f;p=php

Migrate skip checks to --EXTENSIONS--, p1

For rationale, see https://github.com/php/php-src/pull/6787

Extensions migrated in this part:
* bcmath
* bz2
* calendar
* com_dotnet
* ctype

Closes GH-6797.
---

diff --git a/ext/bcmath/tests/bcadd.phpt b/ext/bcmath/tests/bcadd.phpt
index 61552eecde..b24ce8dbd7 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcadd_error.phpt b/ext/bcmath/tests/bcadd_error.phpt
index adb6c3cdc3..320bf39068 100644
--- a/ext/bcmath/tests/bcadd_error.phpt
+++ b/ext/bcmath/tests/bcadd_error.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcadd() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcadd_variation001.phpt b/ext/bcmath/tests/bcadd_variation001.phpt
index 4bd828cda3..447958b4a2 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=5
 --FILE--
diff --git a/ext/bcmath/tests/bccomp.phpt b/ext/bcmath/tests/bccomp.phpt
index b2bf9f4ac2..ba2fc79532 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bccomp_error.phpt b/ext/bcmath/tests/bccomp_error.phpt
index 364658dc7d..90645c52f7 100644
--- a/ext/bcmath/tests/bccomp_error.phpt
+++ b/ext/bcmath/tests/bccomp_error.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bccomp() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bccomp_variation001.phpt b/ext/bcmath/tests/bccomp_variation001.phpt
index 9eff0dd33a..1aa2387c7f 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bccomp_variation002.phpt b/ext/bcmath/tests/bccomp_variation002.phpt
index cb65712f06..ae7ba7fafe 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcdiv.phpt b/ext/bcmath/tests/bcdiv.phpt
index cda19496d5..0ae0069ce5 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcdiv_error1.phpt b/ext/bcmath/tests/bcdiv_error1.phpt
index a89ae98cfb..7b5908f555 100644
--- a/ext/bcmath/tests/bcdiv_error1.phpt
+++ b/ext/bcmath/tests/bcdiv_error1.phpt
@@ -4,8 +4,8 @@ bcdiv — Divide two arbitrary precision numbers
 TestFest2009
 Antoni Torrents
 antoni@solucionsinternet.com
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcdiv_error2.phpt b/ext/bcmath/tests/bcdiv_error2.phpt
index d7ed546772..a4e1cae353 100644
--- a/ext/bcmath/tests/bcdiv_error2.phpt
+++ b/ext/bcmath/tests/bcdiv_error2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcdiv() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcmod.phpt b/ext/bcmath/tests/bcmod.phpt
index 3e9ab25cb8..1cfc835456 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmod_error2.phpt b/ext/bcmath/tests/bcmod_error2.phpt
index c4d49486b3..59939b3f08 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmod_error3.phpt b/ext/bcmath/tests/bcmod_error3.phpt
index 71718d3be8..8df986fe76 100644
--- a/ext/bcmath/tests/bcmod_error3.phpt
+++ b/ext/bcmath/tests/bcmod_error3.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcmod() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcmul.phpt b/ext/bcmath/tests/bcmul.phpt
index 20893552da..2e2a8a7a11 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcmul_error.phpt b/ext/bcmath/tests/bcmul_error.phpt
index 301ef11812..361b46163e 100644
--- a/ext/bcmath/tests/bcmul_error.phpt
+++ b/ext/bcmath/tests/bcmul_error.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcmul() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcpow.phpt b/ext/bcmath/tests/bcpow.phpt
index ad642a57be..1850e34279 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpow_error1.phpt b/ext/bcmath/tests/bcpow_error1.phpt
index 38d9bda181..d2b1a10704 100644
--- a/ext/bcmath/tests/bcpow_error1.phpt
+++ b/ext/bcmath/tests/bcpow_error1.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcpow() does not support non-integral exponents
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcpow_error2.phpt b/ext/bcmath/tests/bcpow_error2.phpt
index d6271b18eb..733d628b41 100644
--- a/ext/bcmath/tests/bcpow_error2.phpt
+++ b/ext/bcmath/tests/bcpow_error2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcpow() does not support exponents >= 2**63
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcpow_error3.phpt b/ext/bcmath/tests/bcpow_error3.phpt
index fb71e631e6..f47c85d4da 100644
--- a/ext/bcmath/tests/bcpow_error3.phpt
+++ b/ext/bcmath/tests/bcpow_error3.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcpow() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcpow_variation001.phpt b/ext/bcmath/tests/bcpow_variation001.phpt
index df55f15ae5..9bcea231fb 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpowmod.phpt b/ext/bcmath/tests/bcpowmod.phpt
index c171e2d4a1..285648024f 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcpowmod_error.phpt b/ext/bcmath/tests/bcpowmod_error.phpt
index 9056f9e755..ff2862310c 100644
--- a/ext/bcmath/tests/bcpowmod_error.phpt
+++ b/ext/bcmath/tests/bcpowmod_error.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcpowmod() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
index 518f9eb0a9..7814e2bd41 100644
--- a/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
+++ b/ext/bcmath/tests/bcpowmod_negative_exponent.phpt
@@ -2,8 +2,8 @@
 bc_raisemod's expo can't be negative
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php if(!extension_loaded('bcmath')) die('skip bcmath extension not loaded'); ?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcpowmod_zero_modulus.phpt b/ext/bcmath/tests/bcpowmod_zero_modulus.phpt
index bc30dc0afd..8540a0d6df 100644
--- a/ext/bcmath/tests/bcpowmod_zero_modulus.phpt
+++ b/ext/bcmath/tests/bcpowmod_zero_modulus.phpt
@@ -2,8 +2,8 @@
 bc_raisemod's mod can't be zero
 --CREDITS--
 Gabriel Caruso (carusogabriel34@gmail.com)
---SKIPIF--
-<?php if(!extension_loaded('bcmath')) die('skip bcmath extension not loaded'); ?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcscale.phpt b/ext/bcmath/tests/bcscale.phpt
index 4fc2f85eb9..e402c48367 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation001.phpt b/ext/bcmath/tests/bcscale_variation001.phpt
index 0718d724c2..8d9d32e064 100644
--- a/ext/bcmath/tests/bcscale_variation001.phpt
+++ b/ext/bcmath/tests/bcscale_variation001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bcscale() fails with negative argument
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation002.phpt b/ext/bcmath/tests/bcscale_variation002.phpt
index 11df405bea..205f39d4c8 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=-2
 --FILE--
diff --git a/ext/bcmath/tests/bcscale_variation003.phpt b/ext/bcmath/tests/bcscale_variation003.phpt
index 0812aadab6..40d17db2c5 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsqrt.phpt b/ext/bcmath/tests/bcsqrt.phpt
index b2a8d8adbc..92512dd0d0 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsqrt_error1.phpt b/ext/bcmath/tests/bcsqrt_error1.phpt
index bdc850f979..78923f4a94 100644
--- a/ext/bcmath/tests/bcsqrt_error1.phpt
+++ b/ext/bcmath/tests/bcsqrt_error1.phpt
@@ -3,8 +3,8 @@ bcsqrt — Get the square root of an arbitrary precision number
 --CREDITS--
 Antoni Torrents
 antoni@solucionsinternet.com
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bcsqrt_error2.phpt b/ext/bcmath/tests/bcsqrt_error2.phpt
index 85cefa0762..1ef934d3bc 100644
--- a/ext/bcmath/tests/bcsqrt_error2.phpt
+++ b/ext/bcmath/tests/bcsqrt_error2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcsqrt() requires a well-formed value
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bcsqrt_variation001.phpt b/ext/bcmath/tests/bcsqrt_variation001.phpt
index 1f3d284c13..dfa1944ab8 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsub.phpt b/ext/bcmath/tests/bcsub.phpt
index 8d85d23233..3d0765bef3 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"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/bcsub_error.phpt b/ext/bcmath/tests/bcsub_error.phpt
index 0a890eff03..4e1abd3fa9 100644
--- a/ext/bcmath/tests/bcsub_error.phpt
+++ b/ext/bcmath/tests/bcsub_error.phpt
@@ -1,9 +1,7 @@
 --TEST--
 bcsub() requires well-formed values
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/bug.66364.phpt b/ext/bcmath/tests/bug.66364.phpt
index 08777c5f59..c138176fb6 100644
--- a/ext/bcmath/tests/bug.66364.phpt
+++ b/ext/bcmath/tests/bug.66364.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66364 (BCMath bcmul ignores scale parameter)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 var_dump(bcmul('0.3', '0.2', 4));
diff --git a/ext/bcmath/tests/bug44995.phpt b/ext/bcmath/tests/bug44995.phpt
index 9758022225..09b76722aa 100644
--- a/ext/bcmath/tests/bug44995.phpt
+++ b/ext/bcmath/tests/bug44995.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #44995 (bcpowmod() fails if scale != 0)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 var_dump(bcpowmod('4', '4', '3', 1));
diff --git a/ext/bcmath/tests/bug46781.phpt b/ext/bcmath/tests/bug46781.phpt
index d9e4fe5111..15e04e555a 100644
--- a/ext/bcmath/tests/bug46781.phpt
+++ b/ext/bcmath/tests/bug46781.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #46781 (BC math handles minus zero incorrectly)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 var_dump(bcadd('-0.0', '-0.0', 1));
diff --git a/ext/bcmath/tests/bug54598.phpt b/ext/bcmath/tests/bug54598.phpt
index 5f3337fadc..fa4d850c10 100644
--- a/ext/bcmath/tests/bug54598.phpt
+++ b/ext/bcmath/tests/bug54598.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #54598 (bcpowmod() may return 1 if modulus is 1)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 var_dump(bcpowmod(5, 0, 1));
diff --git a/ext/bcmath/tests/bug60377.phpt b/ext/bcmath/tests/bug60377.phpt
index 73d3b2ac1b..16d058441a 100644
--- a/ext/bcmath/tests/bug60377.phpt
+++ b/ext/bcmath/tests/bug60377.phpt
@@ -1,7 +1,9 @@
 --TEST--
 bcscale related problem on 64bits platforms
+--EXTENSIONS--
+bcmath
 --SKIPIF--
-<?php if(!extension_loaded("bcmath")) die("skip");
+<?php
 if (PHP_INT_SIZE != 8) die("skip: 64-bit only"); ?>
 --FILE--
 <?php
diff --git a/ext/bcmath/tests/bug72093.phpt b/ext/bcmath/tests/bug72093.phpt
index 3a6405d04a..a424a59e04 100644
--- a/ext/bcmath/tests/bug72093.phpt
+++ b/ext/bcmath/tests/bug72093.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug 72093: bcpowmod fails on negative scale and corrupts _one_ definition
---SKIPIF--
-<?php
-if(!extension_loaded("bcmath")) print "skip";
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bug75178.phpt b/ext/bcmath/tests/bug75178.phpt
index 9025e61c73..940a3567de 100644
--- a/ext/bcmath/tests/bug75178.phpt
+++ b/ext/bcmath/tests/bug75178.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt
index 7edc666f75..9d9d0db48c 100644
--- a/ext/bcmath/tests/bug78878.phpt
+++ b/ext/bcmath/tests/bug78878.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #78878 (Buffer underflow in bc_shift_addsub)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 try {
diff --git a/ext/bcmath/tests/bug80545.phpt b/ext/bcmath/tests/bug80545.phpt
index 680c4c0631..f1e256776d 100644
--- a/ext/bcmath/tests/bug80545.phpt
+++ b/ext/bcmath/tests/bug80545.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #80545 (bcadd('a', 'a') and bcadd('1', 'a') doesn't throw an exception)
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 
diff --git a/ext/bcmath/tests/negative_scale.phpt b/ext/bcmath/tests/negative_scale.phpt
index 96d1e1b600..3b93775590 100644
--- a/ext/bcmath/tests/negative_scale.phpt
+++ b/ext/bcmath/tests/negative_scale.phpt
@@ -1,7 +1,7 @@
 --TEST--
 all errors on negative scale
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale=0
 --FILE--
diff --git a/ext/bcmath/tests/scale.phpt b/ext/bcmath/tests/scale.phpt
index e2e65cab22..ad3cb45ea7 100644
--- a/ext/bcmath/tests/scale.phpt
+++ b/ext/bcmath/tests/scale.phpt
@@ -1,9 +1,7 @@
 --TEST--
 BCMath functions return result with requested scale
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 echo
diff --git a/ext/bcmath/tests/scale_ini.phpt b/ext/bcmath/tests/scale_ini.phpt
index c75cf8edda..f5e5fe4526 100644
--- a/ext/bcmath/tests/scale_ini.phpt
+++ b/ext/bcmath/tests/scale_ini.phpt
@@ -1,9 +1,7 @@
 --TEST--
 BCMath functions return result with default scale
---SKIPIF--
-<?php
-if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
-?>
+--EXTENSIONS--
+bcmath
 --INI--
 bcmath.scale = 5
 --FILE--
diff --git a/ext/bcmath/tests/str2num_formatting.phpt b/ext/bcmath/tests/str2num_formatting.phpt
index dd3499804e..ee3f0ae4a8 100644
--- a/ext/bcmath/tests/str2num_formatting.phpt
+++ b/ext/bcmath/tests/str2num_formatting.phpt
@@ -4,8 +4,8 @@ bcmath lib arguments formatting
 1 and 2 argument of bcadd/bcsub/bcmul/bcdiv/bcmod/bcpowmod/bcpow/bccomp (last one works different then others internally);
 1 argument of bcsqrt
 All of the name above must be well-formed
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
+--EXTENSIONS--
+bcmath
 --FILE--
 <?php
 echo bcadd("1", "2"),"\n";
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
index 9561d5ac0f..6b86bd6b0b 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index 3ff0aedeb5..00254776f7 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt
index 75ec54ae4d..3189b473a4 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt
index 229dd87058..4b6ee820dd 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt
index 15eb90f89a..e644bfa6ce 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt
index 5fc7ef0b7c..769cace33f 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index 303e0b3b67..249c72a3f5 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/bug71263.phpt b/ext/bz2/tests/bug71263.phpt
index b20bbd8ef1..594f1aeee1 100644
--- a/ext/bz2/tests/bug71263.phpt
+++ b/ext/bz2/tests/bug71263.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71263: fread() does not report bzip2.decompress errors
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip bz2 extension not loaded"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/bug72447.phpt b/ext/bz2/tests/bug72447.phpt
index 15321042df..7cbd43a443 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $input = "AAAAAAAA";
diff --git a/ext/bz2/tests/bug72613.phpt b/ext/bz2/tests/bug72613.phpt
index d9463e212a..2dfc8c65d3 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $fp = bzopen(__DIR__.'/72613.bz2', 'r');
diff --git a/ext/bz2/tests/bug75776.phpt b/ext/bz2/tests/bug75776.phpt
index 43cc6e07b5..e3cf299f25 100644
--- a/ext/bz2/tests/bug75776.phpt
+++ b/ext/bz2/tests/bug75776.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75776 (Flushing streams with compression filter is broken)
---SKIPIF--
-<?php
-if (!extension_loaded('bz2')) die('skip bz2 extension not available');
-?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $text = str_repeat('0123456789abcdef', 1000);
diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt
index e735d8876c..974f2599d5 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $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 ca92f55934..0e1839f42b 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 $text = 'QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA==';
diff --git a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
index 1261981c6b..b76515a178 100644
--- a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
+++ b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bzopen(): throw TypeError if filename contains null bytes
---SKIPIF--
-<?php if (!extension_loaded("bz2")) print "skip"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index e24e28211f..d06666e665 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/bz2/tests/with_strings.phpt b/ext/bz2/tests/with_strings.phpt
index 6815c1dae4..488a092c94 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"; ?>
+--EXTENSIONS--
+bz2
 --FILE--
 <?php
 
diff --git a/ext/calendar/tests/bug52744.phpt b/ext/calendar/tests/bug52744.phpt
index 886086a294..99fd65f61b 100644
--- a/ext/calendar/tests/bug52744.phpt
+++ b/ext/calendar/tests/bug52744.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52744 (cal_days_in_month incorrect for December 1 BCE)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 var_dump(cal_days_in_month(CAL_GREGORIAN, 12, -1));
diff --git a/ext/calendar/tests/bug53574_1.phpt b/ext/calendar/tests/bug53574_1.phpt
index 6aba600619..c4a265f8f0 100644
--- a/ext/calendar/tests/bug53574_1.phpt
+++ b/ext/calendar/tests/bug53574_1.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (PHP_INT_SIZE != 4) {
         die("skip this test is for 32bit platform only");
 }
diff --git a/ext/calendar/tests/bug53574_2.phpt b/ext/calendar/tests/bug53574_2.phpt
index 6e3154a916..cbd4b7ad2c 100644
--- a/ext/calendar/tests/bug53574_2.phpt
+++ b/ext/calendar/tests/bug53574_2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
 }
diff --git a/ext/calendar/tests/bug54254.phpt b/ext/calendar/tests/bug54254.phpt
index f623fad809..8dced655bb 100644
--- a/ext/calendar/tests/bug54254.phpt
+++ b/ext/calendar/tests/bug54254.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54254 (cal_days_in_month incompatible with jdtojewish in non-leap-years)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 var_dump(cal_days_in_month(CAL_JEWISH, 1, 5771));
diff --git a/ext/calendar/tests/bug55797_1.phpt b/ext/calendar/tests/bug55797_1.phpt
index c9374c9d38..05880803d2 100644
--- a/ext/calendar/tests/bug55797_1.phpt
+++ b/ext/calendar/tests/bug55797_1.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (PHP_INT_SIZE != 4) {
         die("skip this test is for 32bit platform only");
 }
diff --git a/ext/calendar/tests/bug55797_2.phpt b/ext/calendar/tests/bug55797_2.phpt
index b60fd0eba4..7cbe88a139 100644
--- a/ext/calendar/tests/bug55797_2.phpt
+++ b/ext/calendar/tests/bug55797_2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
 }
diff --git a/ext/calendar/tests/bug67976.phpt b/ext/calendar/tests/bug67976.phpt
index 74e0bc81b1..1c8e56ad64 100644
--- a/ext/calendar/tests/bug67976.phpt
+++ b/ext/calendar/tests/bug67976.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #67976 (cal_days_month() fails for final month of the French calendar)
---SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 var_dump(cal_days_in_month(CAL_FRENCH, 13, 14));
diff --git a/ext/calendar/tests/bug71894.phpt b/ext/calendar/tests/bug71894.phpt
index ea2d6004e7..c98c5a7808 100644
--- a/ext/calendar/tests/bug71894.phpt
+++ b/ext/calendar/tests/bug71894.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #71894 (AddressSanitizer: global-buffer-overflow in zif_cal_from_jd)
---SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 var_dump(cal_from_jd(347997, CAL_JEWISH));
diff --git a/ext/calendar/tests/bug80185.phpt b/ext/calendar/tests/bug80185.phpt
index eab5cf1c4b..dfc843270e 100644
--- a/ext/calendar/tests/bug80185.phpt
+++ b/ext/calendar/tests/bug80185.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80185 (jdtounix() fails after 2037)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
 if (PHP_INT_SIZE != 8) die("skip for 64bit platforms only");
 ?>
 --FILE--
diff --git a/ext/calendar/tests/bug80185_32bit.phpt b/ext/calendar/tests/bug80185_32bit.phpt
index 98a1bea2a3..a7fe96e0ff 100644
--- a/ext/calendar/tests/bug80185_32bit.phpt
+++ b/ext/calendar/tests/bug80185_32bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80185 (jdtounix() fails after 2037)
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
 if (PHP_INT_SIZE != 4) die("skip for 32bit platforms only");
 ?>
 --FILE--
diff --git a/ext/calendar/tests/cal_days_in_month.phpt b/ext/calendar/tests/cal_days_in_month.phpt
index fbd6362b0f..d94d39f2f6 100644
--- a/ext/calendar/tests/cal_days_in_month.phpt
+++ b/ext/calendar/tests/cal_days_in_month.phpt
@@ -1,7 +1,7 @@
 --TEST--
 cal_days_in_month()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 $num = cal_days_in_month(CAL_GREGORIAN, 8, 2003);
diff --git a/ext/calendar/tests/cal_days_in_month_error1.phpt b/ext/calendar/tests/cal_days_in_month_error1.phpt
index 2b7ee0ea88..f334888479 100644
--- a/ext/calendar/tests/cal_days_in_month_error1.phpt
+++ b/ext/calendar/tests/cal_days_in_month_error1.phpt
@@ -2,8 +2,8 @@
 Test cal_days_in_month() function : error conditions
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 try {
diff --git a/ext/calendar/tests/cal_from_jd.phpt b/ext/calendar/tests/cal_from_jd.phpt
index 9614522a05..4b2e27e9ab 100644
--- a/ext/calendar/tests/cal_from_jd.phpt
+++ b/ext/calendar/tests/cal_from_jd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 cal_from_jd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 print_r(cal_from_jd(1748326, CAL_GREGORIAN));
diff --git a/ext/calendar/tests/cal_from_jd_error1.phpt b/ext/calendar/tests/cal_from_jd_error1.phpt
index feafe240b5..3b4e11b835 100644
--- a/ext/calendar/tests/cal_from_jd_error1.phpt
+++ b/ext/calendar/tests/cal_from_jd_error1.phpt
@@ -2,8 +2,8 @@
 Test cal_from_jd() function : error conditions
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 try {
diff --git a/ext/calendar/tests/cal_info.phpt b/ext/calendar/tests/cal_info.phpt
index 0d4b823486..18884917e5 100644
--- a/ext/calendar/tests/cal_info.phpt
+++ b/ext/calendar/tests/cal_info.phpt
@@ -2,8 +2,8 @@
 cal_info()
 --INI--
 date.timezone=UTC
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
   print_r(cal_info());
diff --git a/ext/calendar/tests/cal_to_jd.phpt b/ext/calendar/tests/cal_to_jd.phpt
index fde1e0b455..cfcc5904b3 100644
--- a/ext/calendar/tests/cal_to_jd.phpt
+++ b/ext/calendar/tests/cal_to_jd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 cal_to_jd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo cal_to_jd(CAL_GREGORIAN, 8, 26, 74), "\n";
diff --git a/ext/calendar/tests/cal_to_jd_error1.phpt b/ext/calendar/tests/cal_to_jd_error1.phpt
index b8585c7f05..1cef36af69 100644
--- a/ext/calendar/tests/cal_to_jd_error1.phpt
+++ b/ext/calendar/tests/cal_to_jd_error1.phpt
@@ -2,8 +2,8 @@
 Test cal_to_jd() function : error conditions
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 try {
diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt
index c784f02ebd..a41c310de9 100644
--- a/ext/calendar/tests/easter_date.phpt
+++ b/ext/calendar/tests/easter_date.phpt
@@ -4,8 +4,8 @@ easter_date()
 date.timezone=UTC
 --ENV--
 TZ=UTC
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 putenv('TZ=UTC');
diff --git a/ext/calendar/tests/easter_days.phpt b/ext/calendar/tests/easter_days.phpt
index 04aa7ae11b..56ca7eaeb5 100644
--- a/ext/calendar/tests/easter_days.phpt
+++ b/ext/calendar/tests/easter_days.phpt
@@ -1,7 +1,7 @@
 --TEST--
 easter_days()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo easter_days(1999), "\n";
diff --git a/ext/calendar/tests/frenchtojd.phpt b/ext/calendar/tests/frenchtojd.phpt
index 73addb6b80..ca63789afe 100644
--- a/ext/calendar/tests/frenchtojd.phpt
+++ b/ext/calendar/tests/frenchtojd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 frenchtojd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo frenchtojd(-1,-1,-1), "\n";
diff --git a/ext/calendar/tests/gregoriantojd.phpt b/ext/calendar/tests/gregoriantojd.phpt
index aeecb3af51..9210aab036 100644
--- a/ext/calendar/tests/gregoriantojd.phpt
+++ b/ext/calendar/tests/gregoriantojd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gregoriantojd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo gregoriantojd( 0, 0,    0). "\n";
diff --git a/ext/calendar/tests/gregoriantojd_overflow.phpt b/ext/calendar/tests/gregoriantojd_overflow.phpt
index 8cb4796e5c..f75aec7222 100644
--- a/ext/calendar/tests/gregoriantojd_overflow.phpt
+++ b/ext/calendar/tests/gregoriantojd_overflow.phpt
@@ -1,8 +1,9 @@
 --TEST--
 gregoriantojd()
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
-<?php include 'skipif.inc'; ?>
 --FILE--
 <?php
 echo gregoriantojd(5, 5, 6000000) . "\n";
diff --git a/ext/calendar/tests/jddayofweek.phpt b/ext/calendar/tests/jddayofweek.phpt
index 0f3ca8a3f8..d3a5e90706 100644
--- a/ext/calendar/tests/jddayofweek.phpt
+++ b/ext/calendar/tests/jddayofweek.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jddayofweek()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 foreach (array(2440588, 2452162, 2453926, -1000) as $jd) {
diff --git a/ext/calendar/tests/jdmonthname.phpt b/ext/calendar/tests/jdmonthname.phpt
index 07ed1161b1..3405f4100a 100644
--- a/ext/calendar/tests/jdmonthname.phpt
+++ b/ext/calendar/tests/jdmonthname.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdmonthname()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 foreach (array(2440588, 2452162, 2453926) as $jd) {
diff --git a/ext/calendar/tests/jdtofrench.phpt b/ext/calendar/tests/jdtofrench.phpt
index 2601d14a07..232f4ee97e 100644
--- a/ext/calendar/tests/jdtofrench.phpt
+++ b/ext/calendar/tests/jdtofrench.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdtofrench()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo jdtofrench(0). "\n";
diff --git a/ext/calendar/tests/jdtogregorian.phpt b/ext/calendar/tests/jdtogregorian.phpt
index e8bf4a49aa..b04309219b 100644
--- a/ext/calendar/tests/jdtogregorian.phpt
+++ b/ext/calendar/tests/jdtogregorian.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdtogregorian()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo jdtogregorian(0). "\n";
diff --git a/ext/calendar/tests/jdtogregorian_overflow.phpt b/ext/calendar/tests/jdtogregorian_overflow.phpt
index 9d4a1d6b4d..782e32797b 100644
--- a/ext/calendar/tests/jdtogregorian_overflow.phpt
+++ b/ext/calendar/tests/jdtogregorian_overflow.phpt
@@ -2,9 +2,10 @@
 jdtogregorian(): test overflow
 --CREDITS--
 neweracracker@gmail.com
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
 if (PHP_INT_SIZE != 4) die('skip this test is for 32bit platforms only');
 ?>
 --FILE--
diff --git a/ext/calendar/tests/jdtojewish.phpt b/ext/calendar/tests/jdtojewish.phpt
index 4fd104c50c..6b1c2e3f77 100644
--- a/ext/calendar/tests/jdtojewish.phpt
+++ b/ext/calendar/tests/jdtojewish.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdtojewish() function
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 
diff --git a/ext/calendar/tests/jdtojewish64.phpt b/ext/calendar/tests/jdtojewish64.phpt
index da1e7f74c8..5f36558ee1 100644
--- a/ext/calendar/tests/jdtojewish64.phpt
+++ b/ext/calendar/tests/jdtojewish64.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #64895: Integer overflow in SndToJewish
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
 }
diff --git a/ext/calendar/tests/jdtojewish_hebrew.phpt b/ext/calendar/tests/jdtojewish_hebrew.phpt
index f7df0358f7..ceb53c219e 100644
--- a/ext/calendar/tests/jdtojewish_hebrew.phpt
+++ b/ext/calendar/tests/jdtojewish_hebrew.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test all hebrew month names
---SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip calendar extension not available');
-?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 for ($year = 5000; $year <= 5001; $year++) {
diff --git a/ext/calendar/tests/jdtojewish_overflow.phpt b/ext/calendar/tests/jdtojewish_overflow.phpt
index 17a47e06e1..a3d8ba46f5 100644
--- a/ext/calendar/tests/jdtojewish_overflow.phpt
+++ b/ext/calendar/tests/jdtojewish_overflow.phpt
@@ -2,10 +2,8 @@
 jdtojewish(): test overflow
 --CREDITS--
 neweracracker@gmail.com
---SKIPIF--
-<?php
-if (!extension_loaded('calendar')) die('skip ext/calendar required');
-?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 for ($i=324542840; $i<324542850; $i++) {
diff --git a/ext/calendar/tests/jdtojulian.phpt b/ext/calendar/tests/jdtojulian.phpt
index f4082e76ec..b13906b777 100644
--- a/ext/calendar/tests/jdtojulian.phpt
+++ b/ext/calendar/tests/jdtojulian.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdtojulian()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo jdtojulian(0). "\n";
diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index fb70067bbe..23c970cfa7 100644
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jdtomonthname() test
---SKIPIF--
-<?php if (!extension_loaded("calendar")) print "skip"; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 
diff --git a/ext/calendar/tests/jdtounix.phpt b/ext/calendar/tests/jdtounix.phpt
index 8d85543300..f9da430c54 100644
--- a/ext/calendar/tests/jdtounix.phpt
+++ b/ext/calendar/tests/jdtounix.phpt
@@ -2,8 +2,8 @@
 jdtounix()
 --INI--
 date.timezone=UTC
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo date("Y-m-d",jdtounix(2440588)). "\n";
diff --git a/ext/calendar/tests/jdtounix_error1.phpt b/ext/calendar/tests/jdtounix_error1.phpt
index ba85958ec8..0032e376db 100644
--- a/ext/calendar/tests/jdtounix_error1.phpt
+++ b/ext/calendar/tests/jdtounix_error1.phpt
@@ -4,8 +4,8 @@ Test jdtounix() function : error conditions
 edgarsandi - <edgar.r.sandi@gmail.com>
 --INI--
 date.timezone=UTC
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 try {
diff --git a/ext/calendar/tests/jewishtojd.phpt b/ext/calendar/tests/jewishtojd.phpt
index 2dd0381619..174a860729 100644
--- a/ext/calendar/tests/jewishtojd.phpt
+++ b/ext/calendar/tests/jewishtojd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 jewishtojd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo jewishtojd(-1,-1,-1). "\n";
diff --git a/ext/calendar/tests/juliantojd.phpt b/ext/calendar/tests/juliantojd.phpt
index 2f65d84f36..19a6b27048 100644
--- a/ext/calendar/tests/juliantojd.phpt
+++ b/ext/calendar/tests/juliantojd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 juliantojd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --FILE--
 <?php
 echo juliantojd( 0, 0,    0). "\n";
diff --git a/ext/calendar/tests/juliantojd_overflow.phpt b/ext/calendar/tests/juliantojd_overflow.phpt
index fb04c95495..cdf1b203d9 100644
--- a/ext/calendar/tests/juliantojd_overflow.phpt
+++ b/ext/calendar/tests/juliantojd_overflow.phpt
@@ -1,8 +1,9 @@
 --TEST--
 juliantojd()
+--EXTENSIONS--
+calendar
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
-<?php include 'skipif.inc'; ?>
 --FILE--
 <?php
 echo juliantojd(5, 5, 6000000000) . "\n";
diff --git a/ext/calendar/tests/skipif.inc b/ext/calendar/tests/skipif.inc
deleted file mode 100644
index e867fafd29..0000000000
--- a/ext/calendar/tests/skipif.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!extension_loaded("calendar"))
-    print "skip - CALENDAR extension not available";
-?>
diff --git a/ext/calendar/tests/unixtojd.phpt b/ext/calendar/tests/unixtojd.phpt
index 28a05c0c6f..3d0ffa3fea 100644
--- a/ext/calendar/tests/unixtojd.phpt
+++ b/ext/calendar/tests/unixtojd.phpt
@@ -1,7 +1,7 @@
 --TEST--
 unixtojd()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --ENV--
 TZ=UTC
 --FILE--
diff --git a/ext/calendar/tests/unixtojd_error1.phpt b/ext/calendar/tests/unixtojd_error1.phpt
index 000f047f0a..6b8fad05eb 100644
--- a/ext/calendar/tests/unixtojd_error1.phpt
+++ b/ext/calendar/tests/unixtojd_error1.phpt
@@ -2,8 +2,8 @@
 Test unixtojd() function : error conditions
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+calendar
 --INI--
 date.timezone=UTC
 --FILE--
diff --git a/ext/com_dotnet/tests/27974.phpt b/ext/com_dotnet/tests/27974.phpt
index c76dda9ed5..ca7735a829 100644
--- a/ext/com_dotnet/tests/27974.phpt
+++ b/ext/com_dotnet/tests/27974.phpt
@@ -1,8 +1,7 @@
 --TEST--
 COM: mapping a safearray
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt
index 7f305d2eb5..10e9021a0b 100644
--- a/ext/com_dotnet/tests/bug33386.phpt
+++ b/ext/com_dotnet/tests/bug33386.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #33386 (ScriptControl only sees last function of class)
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (4 != PHP_INT_SIZE)  print "skip MSScriptControl isn't available under x64";
 ?>
 --FILE--
diff --git a/ext/com_dotnet/tests/bug34272.phpt b/ext/com_dotnet/tests/bug34272.phpt
index ce8a552dfd..27dc5142d3 100644
--- a/ext/com_dotnet/tests/bug34272.phpt
+++ b/ext/com_dotnet/tests/bug34272.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #34272 (empty array onto COM object blows up)
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/com_dotnet/tests/bug39596.phpt b/ext/com_dotnet/tests/bug39596.phpt
index 1510db49cf..d6215f0596 100644
--- a/ext/com_dotnet/tests/bug39596.phpt
+++ b/ext/com_dotnet/tests/bug39596.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #39596 (Creating Variant of type VT_ARRAY)
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/com_dotnet/tests/bug39606.phpt b/ext/com_dotnet/tests/bug39606.phpt
index f646c6a7c3..6f01acd471 100644
--- a/ext/com_dotnet/tests/bug39606.phpt
+++ b/ext/com_dotnet/tests/bug39606.phpt
@@ -1,8 +1,7 @@
 --TEST--
 COM: Loading typelib corrupts memory
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/com_dotnet/tests/bug45280.phpt b/ext/com_dotnet/tests/bug45280.phpt
index 393799e374..a461871f2f 100644
--- a/ext/com_dotnet/tests/bug45280.phpt
+++ b/ext/com_dotnet/tests/bug45280.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #45280 (Reflection of instantiated COM classes causes PHP to crash)
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $dict = new COM("Scripting.Dictionary");
diff --git a/ext/com_dotnet/tests/bug49192.phpt b/ext/com_dotnet/tests/bug49192.phpt
index cd85a9a64c..519ac21180 100644
--- a/ext/com_dotnet/tests/bug49192.phpt
+++ b/ext/com_dotnet/tests/bug49192.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #49192 (PHP crashes when GC invoked on COM object)
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 
diff --git a/ext/com_dotnet/tests/bug62474.phpt b/ext/com_dotnet/tests/bug62474.phpt
index cc8e252224..531ba9a640 100644
--- a/ext/com_dotnet/tests/bug62474.phpt
+++ b/ext/com_dotnet/tests/bug62474.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #62474 (com_event_sink crashes on certain arguments)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 var_dump(com_event_sink(new variant, function() {}, array()));
diff --git a/ext/com_dotnet/tests/bug63208.phpt b/ext/com_dotnet/tests/bug63208.phpt
index ae62dbba98..67ea9f50f9 100644
--- a/ext/com_dotnet/tests/bug63208.phpt
+++ b/ext/com_dotnet/tests/bug63208.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #63208 (BSTR to PHP string conversion not binary safe)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $string = "\u{0905}b\0cd";
diff --git a/ext/com_dotnet/tests/bug64130.phpt b/ext/com_dotnet/tests/bug64130.phpt
index 0f8e083295..ba47c85322 100644
--- a/ext/com_dotnet/tests/bug64130.phpt
+++ b/ext/com_dotnet/tests/bug64130.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #64130 (COM obj parameters passed by reference are not updated)
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
 if (PHP_INT_SIZE != 4) die('skip for 32bit platforms only');
 try {
     $ie = new com('InternetExplorer.Application');
diff --git a/ext/com_dotnet/tests/bug66322.phpt b/ext/com_dotnet/tests/bug66322.phpt
index de37e4fa75..56988a82cc 100644
--- a/ext/com_dotnet/tests/bug66322.phpt
+++ b/ext/com_dotnet/tests/bug66322.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66322 (COMPersistHelper::SaveToFile can save to wrong location)
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
 try {
     new COM('Word.Application');
 } catch (com_exception $ex) {
diff --git a/ext/com_dotnet/tests/bug66431_0.phpt b/ext/com_dotnet/tests/bug66431_0.phpt
index 5f9bc5c0b0..ef4d63f441 100644
--- a/ext/com_dotnet/tests/bug66431_0.phpt
+++ b/ext/com_dotnet/tests/bug66431_0.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66431 Special Character via COM Interface (CP_UTF8), Scripting.FileSystemObject
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 
diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt
index 7ebf16a10d..7f783dbf64 100644
--- a/ext/com_dotnet/tests/bug66431_1.phpt
+++ b/ext/com_dotnet/tests/bug66431_1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #66431 Special Character via COM Interface (CP_UTF8), Application.Word
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
-
 try {
     new COM("word.application", NULL, CP_UTF8);
 } catch (Exception $e) {
diff --git a/ext/com_dotnet/tests/bug69939.phpt b/ext/com_dotnet/tests/bug69939.phpt
index 49ad20787a..d650382d93 100644
--- a/ext/com_dotnet/tests/bug69939.phpt
+++ b/ext/com_dotnet/tests/bug69939.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #69939 (Casting object to bool returns false)
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 var_dump((bool) new COM('WScript.Shell'));
diff --git a/ext/com_dotnet/tests/bug72498.phpt b/ext/com_dotnet/tests/bug72498.phpt
index b9bd498af3..67285e8523 100644
--- a/ext/com_dotnet/tests/bug72498.phpt
+++ b/ext/com_dotnet/tests/bug72498.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72498 variant_date_from_timestamp null dereference
---SKIPIF--
-<?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 
diff --git a/ext/com_dotnet/tests/bug73679.phpt b/ext/com_dotnet/tests/bug73679.phpt
index 235fd3e33e..9815cdcaac 100644
--- a/ext/com_dotnet/tests/bug73679.phpt
+++ b/ext/com_dotnet/tests/bug73679.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73679 DOTNET read access violation using invalid codepage
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
 --FILE--
diff --git a/ext/com_dotnet/tests/bug77177.phpt b/ext/com_dotnet/tests/bug77177.phpt
index 8fcfd5a378..19e4c11995 100644
--- a/ext/com_dotnet/tests/bug77177.phpt
+++ b/ext/com_dotnet/tests/bug77177.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77177 (Serializing or unserializing COM objects crashes)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $com = new COM("WScript.Shell");
diff --git a/ext/com_dotnet/tests/bug77578.phpt b/ext/com_dotnet/tests/bug77578.phpt
index 910f24909b..2bf2cbf2c0 100644
--- a/ext/com_dotnet/tests/bug77578.phpt
+++ b/ext/com_dotnet/tests/bug77578.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77578 (Crash when php unload)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 // To actually be able to verify the crash during shutdown on Windows, we have
diff --git a/ext/com_dotnet/tests/bug77621.phpt b/ext/com_dotnet/tests/bug77621.phpt
index 32e879dcd0..74972749e5 100644
--- a/ext/com_dotnet/tests/bug77621.phpt
+++ b/ext/com_dotnet/tests/bug77621.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77621 (Already defined constants are not properly reported)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --INI--
 com.autoregister_verbose=1
 --FILE--
diff --git a/ext/com_dotnet/tests/bug78650.phpt b/ext/com_dotnet/tests/bug78650.phpt
index c362de95bb..ca2a235af2 100644
--- a/ext/com_dotnet/tests/bug78650.phpt
+++ b/ext/com_dotnet/tests/bug78650.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #78650 (new COM Crash)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $fname = __DIR__ . '/bug78650/foo/bar';
diff --git a/ext/com_dotnet/tests/bug78694.phpt b/ext/com_dotnet/tests/bug78694.phpt
index adf0c828ca..f44b00a4f4 100644
--- a/ext/com_dotnet/tests/bug78694.phpt
+++ b/ext/com_dotnet/tests/bug78694.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #78694 (Appending to a variant array causes segfault)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 foreach ([new com('WScript.Shell'), new variant([])] as $var) {
diff --git a/ext/com_dotnet/tests/bug79242.phpt b/ext/com_dotnet/tests/bug79242.phpt
index 46c5d8af3b..cda4d58ff9 100644
--- a/ext/com_dotnet/tests/bug79242.phpt
+++ b/ext/com_dotnet/tests/bug79242.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79242 (COM error constants don't match com_exception codes)
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
 ?>
 --FILE--
diff --git a/ext/com_dotnet/tests/bug79247.phpt b/ext/com_dotnet/tests/bug79247.phpt
index 55e24b1796..2cda351d54 100644
--- a/ext/com_dotnet/tests/bug79247.phpt
+++ b/ext/com_dotnet/tests/bug79247.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79247 (Garbage collecting variant objects segfaults)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $keep = new variant(null);
diff --git a/ext/com_dotnet/tests/bug79248.phpt b/ext/com_dotnet/tests/bug79248.phpt
index fda67551a7..c43c1f5338 100644
--- a/ext/com_dotnet/tests/bug79248.phpt
+++ b/ext/com_dotnet/tests/bug79248.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79248 (Traversing empty VT_ARRAY throws com_exception)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $v = new variant([], VT_ARRAY);
diff --git a/ext/com_dotnet/tests/bug79299.phpt b/ext/com_dotnet/tests/bug79299.phpt
index 99c1a99742..ac4a94cd77 100644
--- a/ext/com_dotnet/tests/bug79299.phpt
+++ b/ext/com_dotnet/tests/bug79299.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79299 (com_print_typeinfo prints duplicate variables)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $dict = new COM("Scripting.Dictionary");
diff --git a/ext/com_dotnet/tests/bug79332.phpt b/ext/com_dotnet/tests/bug79332.phpt
index 93add95d15..28443478d9 100644
--- a/ext/com_dotnet/tests/bug79332.phpt
+++ b/ext/com_dotnet/tests/bug79332.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79332 (php_istreams are never freed)
---SKIPIF--
-<?php
-if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
-?>
+--EXTENSIONS--
+com_dotnet
 --FILE--
 <?php
 $ph = new COMPersistHelper(null);
diff --git a/ext/com_dotnet/tests/variants.phpt b/ext/com_dotnet/tests/variants.phpt
index e28823c3ad..8547e65efb 100644
--- a/ext/com_dotnet/tests/variants.phpt
+++ b/ext/com_dotnet/tests/variants.phpt
@@ -1,8 +1,9 @@
 --TEST--
 COM: General variant tests
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (4 != PHP_INT_SIZE) print "skip x86 only"; ?>
 --FILE--
 <?php
diff --git a/ext/com_dotnet/tests/variants_x64.phpt b/ext/com_dotnet/tests/variants_x64.phpt
index 1ca93c5709..0017ec64fd 100644
--- a/ext/com_dotnet/tests/variants_x64.phpt
+++ b/ext/com_dotnet/tests/variants_x64.phpt
@@ -1,8 +1,9 @@
 --TEST--
 COM: General variant tests
+--EXTENSIONS--
+com_dotnet
 --SKIPIF--
 <?php
-if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (8 != PHP_INT_SIZE) print "skip x64 only";
 if ((string) variant_cat(new VARIANT(false), new VARIANT(0.5)) != 'False0.5')
     print "skip English locale only";
diff --git a/ext/ctype/tests/001.phpt b/ext/ctype/tests/001.phpt
index 1351faed94..ba9fe48497 100644
--- a/ext/ctype/tests/001.phpt
+++ b/ext/ctype/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ctype on integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
   setlocale(LC_ALL,"C");
diff --git a/ext/ctype/tests/002.phpt b/ext/ctype/tests/002.phpt
index b1dd87f306..8ceea190a2 100644
--- a/ext/ctype/tests/002.phpt
+++ b/ext/ctype/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ctype on strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 
diff --git a/ext/ctype/tests/bug25745.phpt b/ext/ctype/tests/bug25745.phpt
index 3996dd8242..8c8da4eb42 100644
--- a/ext/ctype/tests/bug25745.phpt
+++ b/ext/ctype/tests/bug25745.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #25745 (ctype functions fail with non-ascii characters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 $funcs = array(
diff --git a/ext/ctype/tests/bug34645.phpt b/ext/ctype/tests/bug34645.phpt
index 7aa386235d..6d0ca825d1 100644
--- a/ext/ctype/tests/bug34645.phpt
+++ b/ext/ctype/tests/bug34645.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34645 (ctype corrupts memory when validating large numbers)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 $id = 394829384;
diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt
index 7cc71a27b2..bf8202d79f 100644
--- a/ext/ctype/tests/ctype_alnum_basic.phpt
+++ b/ext/ctype/tests/ctype_alnum_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alnum() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_alnum() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt
index 5af4f14e15..0f9f5090c3 100644
--- a/ext/ctype/tests/ctype_alnum_variation1.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alnum() function : usage variations - Different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt
index 1e6147c6e6..9651bedb14 100644
--- a/ext/ctype/tests/ctype_alnum_variation2.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alnum() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt
index f7de0707d2..82a862397d 100644
--- a/ext/ctype/tests/ctype_alnum_variation3.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alnum() function : usage variations - different string values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt
index d998190ac4..67382986a8 100644
--- a/ext/ctype/tests/ctype_alnum_variation4.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alnum() function : usage variations  - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt
index a17d4d92bf..641d29a1eb 100644
--- a/ext/ctype/tests/ctype_alpha_basic.phpt
+++ b/ext/ctype/tests/ctype_alpha_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alpha() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_alpha() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt
index a372e926b9..c49bc57043 100644
--- a/ext/ctype/tests/ctype_alpha_variation1.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alpha() function : usage variations - different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt
index f36dbf2da8..e8f55a8b97 100644
--- a/ext/ctype/tests/ctype_alpha_variation2.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alpha() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt
index 3f7402e52c..d7184d3a7a 100644
--- a/ext/ctype/tests/ctype_alpha_variation3.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alpha() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt
index f5e96a19ff..829300ea8b 100644
--- a/ext/ctype/tests/ctype_alpha_variation4.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_alpha() function : usage variations - Octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt
index 4052663c0d..3822386f29 100644
--- a/ext/ctype/tests/ctype_cntrl_basic.phpt
+++ b/ext/ctype/tests/ctype_cntrl_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_cntrl() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_cntrl() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt
index 7e8c6b19d7..336b1f068e 100644
--- a/ext/ctype/tests/ctype_cntrl_variation1.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_cntrl() function : usage variations - Different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt
index c5b3451828..c2d7e34f64 100644
--- a/ext/ctype/tests/ctype_cntrl_variation2.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_cntrl() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt
index f177c7bc27..3db325bb35 100644
--- a/ext/ctype/tests/ctype_cntrl_variation3.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_cntrl() function : usage variations - Different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt
index ee56823243..e9202c3325 100644
--- a/ext/ctype/tests/ctype_cntrl_variation4.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_cntrl() function : usage variations - Octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt
index 7959b7ff18..463a39a20b 100644
--- a/ext/ctype/tests/ctype_digit_basic.phpt
+++ b/ext/ctype/tests/ctype_digit_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_digit() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_digit() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt
index 65126ffc58..190c075a70 100644
--- a/ext/ctype/tests/ctype_digit_variation1.phpt
+++ b/ext/ctype/tests/ctype_digit_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_digit() function : usage variations - different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt
index e7b79263db..76300585cd 100644
--- a/ext/ctype/tests/ctype_digit_variation2.phpt
+++ b/ext/ctype/tests/ctype_digit_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_digit() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt
index bb42c2e0d8..47f2ca6528 100644
--- a/ext/ctype/tests/ctype_digit_variation3.phpt
+++ b/ext/ctype/tests/ctype_digit_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_digit() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt
index 2bf78b4df4..63fff0275a 100644
--- a/ext/ctype/tests/ctype_digit_variation4.phpt
+++ b/ext/ctype/tests/ctype_digit_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_digit() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt
index c38529bbea..6a5df1a3a6 100644
--- a/ext/ctype/tests/ctype_graph_basic.phpt
+++ b/ext/ctype/tests/ctype_graph_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_graph() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_graph() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt
index 1d7bc182e8..3a04e9c3f5 100644
--- a/ext/ctype/tests/ctype_graph_variation1.phpt
+++ b/ext/ctype/tests/ctype_graph_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_graph() function : usage variations - different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_graph_variation2.phpt b/ext/ctype/tests/ctype_graph_variation2.phpt
index 3304a16240..3361798a05 100644
--- a/ext/ctype/tests/ctype_graph_variation2.phpt
+++ b/ext/ctype/tests/ctype_graph_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_graph() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_graph_variation3.phpt b/ext/ctype/tests/ctype_graph_variation3.phpt
index 733825bfde..cbce657e37 100644
--- a/ext/ctype/tests/ctype_graph_variation3.phpt
+++ b/ext/ctype/tests/ctype_graph_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_graph() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_graph_variation4.phpt b/ext/ctype/tests/ctype_graph_variation4.phpt
index 8fbaab39d3..de49393d02 100644
--- a/ext/ctype/tests/ctype_graph_variation4.phpt
+++ b/ext/ctype/tests/ctype_graph_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_graph() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt
index 79560917f5..dce5e1813f 100644
--- a/ext/ctype/tests/ctype_lower_basic.phpt
+++ b/ext/ctype/tests/ctype_lower_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_lower() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_lower() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt
index b236eed2b9..4c606caad7 100644
--- a/ext/ctype/tests/ctype_lower_variation1.phpt
+++ b/ext/ctype/tests/ctype_lower_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_lower() function : usage variations - different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt
index b3ed8d03e5..86feadd15c 100644
--- a/ext/ctype/tests/ctype_lower_variation2.phpt
+++ b/ext/ctype/tests/ctype_lower_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_lower() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt
index bba8be038b..5bb9fa91e1 100644
--- a/ext/ctype/tests/ctype_lower_variation3.phpt
+++ b/ext/ctype/tests/ctype_lower_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_lower() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt
index f7cfc18b86..f1ad56580f 100644
--- a/ext/ctype/tests/ctype_lower_variation4.phpt
+++ b/ext/ctype/tests/ctype_lower_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_lower() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt
index aa354e869e..df3eeebaf1 100644
--- a/ext/ctype/tests/ctype_print_basic.phpt
+++ b/ext/ctype/tests/ctype_print_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_print() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_print() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt
index 06ba0d82e0..49f9e95cee 100644
--- a/ext/ctype/tests/ctype_print_variation1.phpt
+++ b/ext/ctype/tests/ctype_print_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_print() function : usage variations - different data types as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt
index 1178118020..12617de81d 100644
--- a/ext/ctype/tests/ctype_print_variation2.phpt
+++ b/ext/ctype/tests/ctype_print_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_print() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt
index f79cfa20ac..dc7ac0d9ca 100644
--- a/ext/ctype/tests/ctype_print_variation3.phpt
+++ b/ext/ctype/tests/ctype_print_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_print() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt
index be0d148019..94e76ecaf0 100644
--- a/ext/ctype/tests/ctype_print_variation4.phpt
+++ b/ext/ctype/tests/ctype_print_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_print() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt
index 2110385646..32c7bd0da3 100644
--- a/ext/ctype/tests/ctype_punct_basic.phpt
+++ b/ext/ctype/tests/ctype_punct_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_punct() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_punct() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt
index 52f05f76e9..4fcf9bc61b 100644
--- a/ext/ctype/tests/ctype_punct_variation1.phpt
+++ b/ext/ctype/tests/ctype_punct_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_punct() function : usage variations - different data types as $c argument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt
index a1dc709e44..1a39cb499c 100644
--- a/ext/ctype/tests/ctype_punct_variation2.phpt
+++ b/ext/ctype/tests/ctype_punct_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_punct() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt
index 18da4a117a..cd189eec38 100644
--- a/ext/ctype/tests/ctype_punct_variation3.phpt
+++ b/ext/ctype/tests/ctype_punct_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_punct() function : usage variations - different punctuation
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt
index ea581f520f..29b112b19a 100644
--- a/ext/ctype/tests/ctype_punct_variation4.phpt
+++ b/ext/ctype/tests/ctype_punct_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_punct() function : usage variations - Octal and Hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt
index 7aabb25cf0..7061d8f949 100644
--- a/ext/ctype/tests/ctype_space_basic.phpt
+++ b/ext/ctype/tests/ctype_space_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_space() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_space() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt
index 63cdd65f24..a2622fa503 100644
--- a/ext/ctype/tests/ctype_space_variation1.phpt
+++ b/ext/ctype/tests/ctype_space_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_space() function : usage variations - different data types as $c argument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_space_variation2.phpt b/ext/ctype/tests/ctype_space_variation2.phpt
index 146c7137f0..22d5b62688 100644
--- a/ext/ctype/tests/ctype_space_variation2.phpt
+++ b/ext/ctype/tests/ctype_space_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_space() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt
index cd32107863..2022f3860a 100644
--- a/ext/ctype/tests/ctype_space_variation3.phpt
+++ b/ext/ctype/tests/ctype_space_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_space() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_space_variation4.phpt b/ext/ctype/tests/ctype_space_variation4.phpt
index f1fa47cb1f..3ee6dbc1ef 100644
--- a/ext/ctype/tests/ctype_space_variation4.phpt
+++ b/ext/ctype/tests/ctype_space_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_space() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt
index 65e13892dc..2db702ed75 100644
--- a/ext/ctype/tests/ctype_upper_basic.phpt
+++ b/ext/ctype/tests/ctype_upper_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_upper() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_upper() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt
index 719edceb62..faca6a6eb4 100644
--- a/ext/ctype/tests/ctype_upper_variation1.phpt
+++ b/ext/ctype/tests/ctype_upper_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_upper() function : usage variations - different data types
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt
index e9da4fd45f..2b5b678012 100644
--- a/ext/ctype/tests/ctype_upper_variation2.phpt
+++ b/ext/ctype/tests/ctype_upper_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_upper() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt
index 7a1243f84f..c4d064edb0 100644
--- a/ext/ctype/tests/ctype_upper_variation3.phpt
+++ b/ext/ctype/tests/ctype_upper_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_upper() function : usage variations - different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt
index 4f8b777528..d8dda95883 100644
--- a/ext/ctype/tests/ctype_upper_variation4.phpt
+++ b/ext/ctype/tests/ctype_upper_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_upper() function : usage variations - octal and hexadecimal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt
index 8c1527d9dd..c3f8bac4f2 100644
--- a/ext/ctype/tests/ctype_xdigit_basic.phpt
+++ b/ext/ctype/tests/ctype_xdigit_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_xdigit() function : basic functionality
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 echo "*** Testing ctype_xdigit() : basic functionality ***\n";
diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt
index 42a26f4ced..f753ff681c 100644
--- a/ext/ctype/tests/ctype_xdigit_variation1.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_xdigit() function : usage variations - different data typse as $c arg
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt
index 106ce3370d..e343f3ab3e 100644
--- a/ext/ctype/tests/ctype_xdigit_variation2.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_xdigit() function : usage variations - different integers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt
index 5bad5edea0..205b8c71ad 100644
--- a/ext/ctype/tests/ctype_xdigit_variation3.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_xdigit() function : usage variations - Different strings
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt
index 4d15c8a395..def93e2250 100644
--- a/ext/ctype/tests/ctype_xdigit_variation4.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ctype_xdigit() function : usage variations - heaxadecimal and octal values
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+ctype
 --FILE--
 <?php
 /*
diff --git a/ext/ctype/tests/skipif.inc b/ext/ctype/tests/skipif.inc
deleted file mode 100644
index 55f6c11469..0000000000
--- a/ext/ctype/tests/skipif.inc
+++ /dev/null
@@ -1 +0,0 @@
-<?php	if (!extension_loaded('ctype')) die('skip ctype extension not available');?>