diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt
index a7a87c70c34..d101c44272e 100644
--- a/ext/dba/tests/bug36436.phpt
+++ b/ext/dba/tests/bug36436.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36436 (DBA problem with Berkeley DB4)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db4';
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index 364d54d0049..996ce447b08 100644
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't read valid db)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'cdb_make';
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
index bded251791c..1c8a9b3c42f 100644
--- a/ext/dba/tests/bug48240.phpt
+++ b/ext/dba/tests/bug48240.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #48240 (DBA Segmentation fault dba_nextkey)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db4';
diff --git a/ext/dba/tests/bug49125.phpt b/ext/dba/tests/bug49125.phpt
index 7e46ea9f1f0..3228da5b5d0 100644
--- a/ext/dba/tests/bug49125.phpt
+++ b/ext/dba/tests/bug49125.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #49125 (Error in dba_exists C code)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db4';
diff --git a/ext/dba/tests/bug62490.phpt b/ext/dba/tests/bug62490.phpt
index 3e5c1e82ca3..6646b27f97d 100644
--- a/ext/dba/tests/bug62490.phpt
+++ b/ext/dba/tests/bug62490.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #62490 (dba_delete returns true on missing item (inifile))
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "inifile";
diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt
index dff291a39d2..b821d2b8ad8 100644
--- a/ext/dba/tests/bug65708.phpt
+++ b/ext/dba/tests/bug65708.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt
index 490e9116d15..c493f57b0cb 100644
--- a/ext/dba/tests/bug72157.phpt
+++ b/ext/dba/tests/bug72157.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72157 (use-after-free caused by dba_open)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/bug72885.phpt b/ext/dba/tests/bug72885.phpt
index 367e54f18c4..9cfb244be86 100644
--- a/ext/dba/tests/bug72885.phpt
+++ b/ext/dba/tests/bug72885.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72885 flatfile: dba_fetch() fails to read replaced entry
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "flatfile";
diff --git a/ext/dba/tests/bug78808.phpt b/ext/dba/tests/bug78808.phpt
index 382bf891bce..329e0db5427 100644
--- a/ext/dba/tests/bug78808.phpt
+++ b/ext/dba/tests/bug78808.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78808 ([LMDB] MDB_MAP_FULL: Environment mapsize limit reached)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = 'lmdb';
diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index d5984c54c87..f0adebe0c06 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA File Creation Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index 2aba823af25..771dea122f0 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Insert/Fetch Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index dd08f86ed57..2f15eca2260 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Insert/Replace/Fetch Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index eebbc04ffb9..3e7247ae65a 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Multiple Insert/Fetch Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index bde23a495de..9871901c2da 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA FirstKey/NextKey Loop Test With 5 Items
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index dfe93f874db..2e70c984aec 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA FirstKey/NextKey with 2 deletes
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index b617c34e9b6..04a6b353640 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Multiple File Creation Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt
index 3f23c9748c2..71b9be3fcd0 100644
--- a/ext/dba/tests/dba009.phpt
+++ b/ext/dba/tests/dba009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA dba_popen Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba010.phpt b/ext/dba/tests/dba010.phpt
index 1b0d6172aa3..e61f310d4f9 100644
--- a/ext/dba/tests/dba010.phpt
+++ b/ext/dba/tests/dba010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA with array keys
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba011.phpt b/ext/dba/tests/dba011.phpt
index 1a4742c6182..2185edb93f4 100644
--- a/ext/dba/tests/dba011.phpt
+++ b/ext/dba/tests/dba011.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA argument tests
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba012.phpt b/ext/dba/tests/dba012.phpt
index 022ca03fc39..00f997dd534 100644
--- a/ext/dba/tests/dba012.phpt
+++ b/ext/dba/tests/dba012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA dba.default_handler tests
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "flatfile";
diff --git a/ext/dba/tests/dba013.phpt b/ext/dba/tests/dba013.phpt
index c493351de10..0d41341b040 100644
--- a/ext/dba/tests/dba013.phpt
+++ b/ext/dba/tests/dba013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA with array key with empty array
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba014.phpt b/ext/dba/tests/dba014.phpt
index ef59f9fedc2..1ed6d061118 100644
--- a/ext/dba/tests/dba014.phpt
+++ b/ext/dba/tests/dba014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA with array key with array containing too many elements
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 require_once(__DIR__ .'/skipif.inc');
diff --git a/ext/dba/tests/dba015.phpt b/ext/dba/tests/dba015.phpt
index 1da13070492..f20c4588633 100644
--- a/ext/dba/tests/dba015.phpt
+++ b/ext/dba/tests/dba015.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA with persistent connections
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "flatfile";
diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt
index e670ec86b96..4b0933a5f0b 100644
--- a/ext/dba/tests/dba016.phpt
+++ b/ext/dba/tests/dba016.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA lock modifier error message test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "flatfile";
diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index 7ed9a6487b9..0cdbea3f916 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA CDB handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'cdb';
diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt
index 3e72d54dab0..6a143106350 100644
--- a/ext/dba/tests/dba_cdb_001.phpt
+++ b/ext/dba/tests/dba_cdb_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA CDB handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = 'cdb';
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index c15f49a8054..8063d079455 100644
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA CDB_MAKE handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'cdb_make';
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 77afb95661d..40a7dc91872 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA CDB handler test (read only)
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'cdb_make';
diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt
index d87699bdaac..07f28e03ceb 100644
--- a/ext/dba/tests/dba_db1.phpt
+++ b/ext/dba/tests/dba_db1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB1 handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db1';
diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt
index 3683058d7df..792c745aa2e 100644
--- a/ext/dba/tests/dba_db2.phpt
+++ b/ext/dba/tests/dba_db2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB2 handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db2';
diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt
index 12a19fae7c1..4f3e54723e6 100644
--- a/ext/dba/tests/dba_db3.phpt
+++ b/ext/dba/tests/dba_db3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB3 handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'db3';
diff --git a/ext/dba/tests/dba_db4_000.phpt b/ext/dba/tests/dba_db4_000.phpt
index 4453e06284b..872a0fca718 100644
--- a/ext/dba/tests/dba_db4_000.phpt
+++ b/ext/dba/tests/dba_db4_000.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = 'db4';
diff --git a/ext/dba/tests/dba_db4_001.phpt b/ext/dba/tests/dba_db4_001.phpt
index c7a851f3ef7..f3cc54afb96 100644
--- a/ext/dba/tests/dba_db4_001.phpt
+++ b/ext/dba/tests/dba_db4_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("c") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_002.phpt b/ext/dba/tests/dba_db4_002.phpt
index d37e55b855a..feeb85f73b7 100644
--- a/ext/dba/tests/dba_db4_002.phpt
+++ b/ext/dba/tests/dba_db4_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("n") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_003.phpt b/ext/dba/tests/dba_db4_003.phpt
index 7bb664a9dc4..e1f750af03e 100644
--- a/ext/dba/tests/dba_db4_003.phpt
+++ b/ext/dba/tests/dba_db4_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File Creation open("c") with existing file
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_004.phpt b/ext/dba/tests/dba_db4_004.phpt
index 7e0445fb74a..70c9e7d2ad3 100644
--- a/ext/dba/tests/dba_db4_004.phpt
+++ b/ext/dba/tests/dba_db4_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Truncate Existing File open("n")
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_005.phpt b/ext/dba/tests/dba_db4_005.phpt
index 7240e6e56a9..ae6653d9321 100644
--- a/ext/dba/tests/dba_db4_005.phpt
+++ b/ext/dba/tests/dba_db4_005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 New File Creation popen("c") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_006.phpt b/ext/dba/tests/dba_db4_006.phpt
index 75694141d4f..4da1ac4acec 100644
--- a/ext/dba/tests/dba_db4_006.phpt
+++ b/ext/dba/tests/dba_db4_006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 New File Creation popen("n") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_007.phpt b/ext/dba/tests/dba_db4_007.phpt
index bfa67dd5d6b..daa995adf95 100644
--- a/ext/dba/tests/dba_db4_007.phpt
+++ b/ext/dba/tests/dba_db4_007.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File Creation popen("c") with existing invalid file
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_008.phpt b/ext/dba/tests/dba_db4_008.phpt
index 457818c929f..e10eb822a40 100644
--- a/ext/dba/tests/dba_db4_008.phpt
+++ b/ext/dba/tests/dba_db4_008.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Truncate Existing File popen("n")
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_009.phpt b/ext/dba/tests/dba_db4_009.phpt
index 48d7f3a30fb..e4dd2954071 100644
--- a/ext/dba/tests/dba_db4_009.phpt
+++ b/ext/dba/tests/dba_db4_009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Multiple File Creation Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_011.phpt b/ext/dba/tests/dba_db4_011.phpt
index 311bdf29f10..78252e97c6f 100644
--- a/ext/dba/tests/dba_db4_011.phpt
+++ b/ext/dba/tests/dba_db4_011.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 with repeated key
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_012.phpt b/ext/dba/tests/dba_db4_012.phpt
index 09a9b0da1c4..1ab5dab7370 100644
--- a/ext/dba/tests/dba_db4_012.phpt
+++ b/ext/dba/tests/dba_db4_012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("rl")
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_013.phpt b/ext/dba/tests/dba_db4_013.phpt
index f107dd85748..f0018339271 100644
--- a/ext/dba/tests/dba_db4_013.phpt
+++ b/ext/dba/tests/dba_db4_013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File open("rl") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_014.phpt b/ext/dba/tests/dba_db4_014.phpt
index 6b6b9b2ed38..31e2530474e 100644
--- a/ext/dba/tests/dba_db4_014.phpt
+++ b/ext/dba/tests/dba_db4_014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File open("wl") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_015.phpt b/ext/dba/tests/dba_db4_015.phpt
index a99b984cde4..e3a3332d83d 100644
--- a/ext/dba/tests/dba_db4_015.phpt
+++ b/ext/dba/tests/dba_db4_015.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File open("wl") & Insert Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_016.phpt b/ext/dba/tests/dba_db4_016.phpt
index 3e1eb87262a..f0550530d46 100644
--- a/ext/dba/tests/dba_db4_016.phpt
+++ b/ext/dba/tests/dba_db4_016.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 File Creation popen("c") with existing valid file
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_017.phpt b/ext/dba/tests/dba_db4_017.phpt
index 04ad544a781..74e6cb73c55 100644
--- a/ext/dba/tests/dba_db4_017.phpt
+++ b/ext/dba/tests/dba_db4_017.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 file creation dba_open("cd")
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt
index c85f133fabb..447c6b24cdd 100644
--- a/ext/dba/tests/dba_db4_018.phpt
+++ b/ext/dba/tests/dba_db4_018.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 with persistent connections
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_handlers.phpt b/ext/dba/tests/dba_db4_handlers.phpt
index 92f93ad4a66..b0056cf6e30 100644
--- a/ext/dba/tests/dba_db4_handlers.phpt
+++ b/ext/dba/tests/dba_db4_handlers.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Handler Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler="db4";
diff --git a/ext/dba/tests/dba_db4_optimize.phpt b/ext/dba/tests/dba_db4_optimize.phpt
index 1b09f943260..11895c889cd 100644
--- a/ext/dba/tests/dba_db4_optimize.phpt
+++ b/ext/dba/tests/dba_db4_optimize.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Optimize Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_db4_sync.phpt b/ext/dba/tests/dba_db4_sync.phpt
index 4bee99b67d3..50311547d15 100644
--- a/ext/dba/tests/dba_db4_sync.phpt
+++ b/ext/dba/tests/dba_db4_sync.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DB4 Sync Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";
diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
index 6fc649d29c4..17e3d7a9ffa 100644
--- a/ext/dba/tests/dba_dbm.phpt
+++ b/ext/dba/tests/dba_dbm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA DBM handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'dbm';
diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index c2022895ab7..955df6d1bf6 100644
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA FlatFile handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'flatfile';
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index f8174dde58e..4752b4bbc43 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA GDBM handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'gdbm';
diff --git a/ext/dba/tests/dba_handlers.phpt b/ext/dba/tests/dba_handlers.phpt
index 966b44a629d..61a2000c296 100644
--- a/ext/dba/tests/dba_handlers.phpt
+++ b/ext/dba/tests/dba_handlers.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Handler Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
 $handler="flatfile";
diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index d1db7beb6cd..c85732a02ea 100644
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA INIFILE handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'inifile';
diff --git a/ext/dba/tests/dba_lmdb.phpt b/ext/dba/tests/dba_lmdb.phpt
index b23a2686f87..d119d2d59b0 100644
--- a/ext/dba/tests/dba_lmdb.phpt
+++ b/ext/dba/tests/dba_lmdb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA LMDB handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'lmdb';
diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
index 0cd00bbab19..ec3df0dcd26 100644
--- a/ext/dba/tests/dba_ndbm.phpt
+++ b/ext/dba/tests/dba_ndbm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA NDBM handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'ndbm';
diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt
index e36643944f3..8798d20ae6f 100644
--- a/ext/dba/tests/dba_optimize.phpt
+++ b/ext/dba/tests/dba_optimize.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Optimize Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once __DIR__ .'/skipif.inc';
diff --git a/ext/dba/tests/dba_qdbm.phpt b/ext/dba/tests/dba_qdbm.phpt
index 940b929bdf2..300ca514bda 100644
--- a/ext/dba/tests/dba_qdbm.phpt
+++ b/ext/dba/tests/dba_qdbm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA QDBM handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'qdbm';
diff --git a/ext/dba/tests/dba_split.phpt b/ext/dba/tests/dba_split.phpt
index 7aafd938d8f..1f9f3125105 100644
--- a/ext/dba/tests/dba_split.phpt
+++ b/ext/dba/tests/dba_split.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Split Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once __DIR__ .'/skipif.inc';
diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt
index ffd5a13003e..0846b537b04 100644
--- a/ext/dba/tests/dba_sync.phpt
+++ b/ext/dba/tests/dba_sync.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA Sync Test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     require_once __DIR__ .'/skipif.inc';
diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt
index f8ff71cb9ea..ed27e079c3f 100644
--- a/ext/dba/tests/dba_tcadb.phpt
+++ b/ext/dba/tests/dba_tcadb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA TCADB handler test
+--EXTENSIONS--
+dba
 --SKIPIF--
 <?php
     $handler = 'tcadb';
diff --git a/ext/dba/tests/skipif.inc b/ext/dba/tests/skipif.inc
index b0530ca64f5..9bd2c868b5d 100644
--- a/ext/dba/tests/skipif.inc
+++ b/ext/dba/tests/skipif.inc
@@ -1,6 +1,4 @@
 <?php
-    if (!extension_loaded('dba')) die('skip dba extension not available');
-    if (!function_exists('dba_handlers')) die ('skip dba_handlers() not available');
     if (!sizeof(dba_handlers())) die('skip no handlers installed');
     if (!isset($handler)) {
         $handlers = dba_handlers();
diff --git a/ext/imap/tests/bug64076.phpt b/ext/imap/tests/bug64076.phpt
index 7e9ee6fd04d..1d245a793ea 100644
--- a/ext/imap/tests/bug64076.phpt
+++ b/ext/imap/tests/bug64076.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #64076 (imap_sort() does not return FALSE on failure)
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once __DIR__ . '/setup/skipif.inc';
diff --git a/ext/imap/tests/bug80226.phpt b/ext/imap/tests/bug80226.phpt
index 6cf4cc8a58d..cf22f89a8d1 100644
--- a/ext/imap/tests/bug80226.phpt
+++ b/ext/imap/tests/bug80226.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80226 (imap_sort() leaks sortpgm memory)
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/bug80438.phpt b/ext/imap/tests/bug80438.phpt
index 70f0270e4f9..4bcc2bb6488 100644
--- a/ext/imap/tests/bug80438.phpt
+++ b/ext/imap/tests/bug80438.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80438: imap_msgno() incorrectly warns and return false on valid UIDs in PHP 8.0.0
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/bug80800.phpt b/ext/imap/tests/bug80800.phpt
index d75c1fde80b..845db94d1cb 100644
--- a/ext/imap/tests/bug80800.phpt
+++ b/ext/imap/tests/bug80800.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80800: imap_open() fails when the flags parameter includes CL_EXPUNGE
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt
index ab2e46886e8..42764c181db 100644
--- a/ext/imap/tests/imap_append_basic.phpt
+++ b/ext/imap/tests/imap_append_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_append() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__. '/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
index b5cb0fcd330..bc9dc9accc8 100644
--- a/ext/imap/tests/imap_body_basic.phpt
+++ b/ext/imap/tests/imap_body_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_body() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_body_errors.phpt b/ext/imap/tests/imap_body_errors.phpt
index 8cc33b35c05..ccd6884d132 100644
--- a/ext/imap/tests/imap_body_errors.phpt
+++ b/ext/imap/tests/imap_body_errors.phpt
@@ -3,6 +3,8 @@ imap_body() errors: ValueError and Warnings
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_body_uid.phpt b/ext/imap/tests/imap_body_uid.phpt
index 1c0de85a61c..fea041ed09a 100644
--- a/ext/imap/tests/imap_body_uid.phpt
+++ b/ext/imap/tests/imap_body_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_body() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt
index f969e86764a..84a6edc7e37 100644
--- a/ext/imap/tests/imap_bodystruct_basic.phpt
+++ b/ext/imap/tests/imap_bodystruct_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_bodystruct() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt
index ee65d202ceb..f2f9c90ff51 100644
--- a/ext/imap/tests/imap_clearflag_full_basic.phpt
+++ b/ext/imap/tests/imap_clearflag_full_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_clearflag_full() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_clearflag_full_uid.phpt b/ext/imap/tests/imap_clearflag_full_uid.phpt
index 3a218656e37..1b11db04d85 100644
--- a/ext/imap/tests/imap_clearflag_full_uid.phpt
+++ b/ext/imap/tests/imap_clearflag_full_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_clearflag_full() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_close_basic.phpt b/ext/imap/tests/imap_close_basic.phpt
index c962b62f7f8..7d95b95432f 100644
--- a/ext/imap/tests/imap_close_basic.phpt
+++ b/ext/imap/tests/imap_close_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_close() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt
index ff78ac985c5..192d0267981 100644
--- a/ext/imap/tests/imap_close_variation4.phpt
+++ b/ext/imap/tests/imap_close_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_close() function : usage variations - different ints as $flags arg
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt
index 83dc3d0f6e9..b54e28aec4a 100644
--- a/ext/imap/tests/imap_createmailbox_basic.phpt
+++ b/ext/imap/tests/imap_createmailbox_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_createmailbox() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once __DIR__.'/setup/skipif.inc';
diff --git a/ext/imap/tests/imap_delete_uid.phpt b/ext/imap/tests/imap_delete_uid.phpt
index 433e015f851..31ff06a17c2 100644
--- a/ext/imap/tests/imap_delete_uid.phpt
+++ b/ext/imap/tests/imap_delete_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_delete() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt
index 9a92877007a..60062ed4389 100644
--- a/ext/imap/tests/imap_errors_basic.phpt
+++ b/ext/imap/tests/imap_errors_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_errors() function : anonymous user not supported
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once __DIR__.'/setup/skipif.inc';
diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt
index ea379b1e59f..6af363f5e6d 100644
--- a/ext/imap/tests/imap_fetch_overview_basic.phpt
+++ b/ext/imap/tests/imap_fetch_overview_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetch_overview() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetch_overview_uid.phpt b/ext/imap/tests/imap_fetch_overview_uid.phpt
index 4c460edae19..3de5b731dcf 100644
--- a/ext/imap/tests/imap_fetch_overview_uid.phpt
+++ b/ext/imap/tests/imap_fetch_overview_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetch_overview() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt
index 6a8b6abd518..1472d0f9088 100644
--- a/ext/imap/tests/imap_fetch_overview_variation5.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetch_overview() function : usage variations - $msg_no argument
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt
index 0535b3d5ac3..91f16baf575 100644
--- a/ext/imap/tests/imap_fetch_overview_variation6.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetch_overview() function : usage variations - multipart message
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt
index d0324383ea2..83e81469ffc 100644
--- a/ext/imap/tests/imap_fetchbody_basic.phpt
+++ b/ext/imap/tests/imap_fetchbody_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetchbody() function : basic functionality
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchbody_errors.phpt b/ext/imap/tests/imap_fetchbody_errors.phpt
index e4eb13b3aed..9ae53f0b850 100644
--- a/ext/imap/tests/imap_fetchbody_errors.phpt
+++ b/ext/imap/tests/imap_fetchbody_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchbody() errors: ValueError and Warnings
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchbody_uid.phpt b/ext/imap/tests/imap_fetchbody_uid.phpt
index 2415ddd04ca..ae973cdf1e9 100644
--- a/ext/imap/tests/imap_fetchbody_uid.phpt
+++ b/ext/imap/tests/imap_fetchbody_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchbody() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt
index 7889c401933..df8374286bf 100644
--- a/ext/imap/tests/imap_fetchbody_variation6.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation6.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetchbody() function : usage variations - $message_num arg
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt
index dc934e00cf2..b16c07e51e2 100644
--- a/ext/imap/tests/imap_fetchheader_basic.phpt
+++ b/ext/imap/tests/imap_fetchheader_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetchheader() function : basic function
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchheader_errors.phpt b/ext/imap/tests/imap_fetchheader_errors.phpt
index 72723a89c00..7a3d7533703 100644
--- a/ext/imap/tests/imap_fetchheader_errors.phpt
+++ b/ext/imap/tests/imap_fetchheader_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchheader() errors: ValueError and Warnings
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchheader_uid.phpt b/ext/imap/tests/imap_fetchheader_uid.phpt
index fa412c6c37d..2117edb6738 100644
--- a/ext/imap/tests/imap_fetchheader_uid.phpt
+++ b/ext/imap/tests/imap_fetchheader_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchheader() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt
index eb6493017b7..d4c5ec9757a 100644
--- a/ext/imap/tests/imap_fetchheader_variation5.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_fetchheader() function : usage variations - $message_num argument
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchmime_errors.phpt b/ext/imap/tests/imap_fetchmime_errors.phpt
index d99168a7082..e97504423c6 100644
--- a/ext/imap/tests/imap_fetchmime_errors.phpt
+++ b/ext/imap/tests/imap_fetchmime_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchmime() errors: ValueError and Warnings
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchmime_uid.phpt b/ext/imap/tests/imap_fetchmime_uid.phpt
index 8711e8e5d3a..42255e02e4b 100644
--- a/ext/imap/tests/imap_fetchmime_uid.phpt
+++ b/ext/imap/tests/imap_fetchmime_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchmime() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchstructure_basic.phpt b/ext/imap/tests/imap_fetchstructure_basic.phpt
index 2eb730c8902..f59479e58bd 100644
--- a/ext/imap/tests/imap_fetchstructure_basic.phpt
+++ b/ext/imap/tests/imap_fetchstructure_basic.phpt
@@ -2,6 +2,8 @@
 imap_fetchstructure() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchstructure_errors.phpt b/ext/imap/tests/imap_fetchstructure_errors.phpt
index 4e834fa2c4c..1b7676ff932 100644
--- a/ext/imap/tests/imap_fetchstructure_errors.phpt
+++ b/ext/imap/tests/imap_fetchstructure_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchstructure() errors: ValueError and Warnings
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_fetchstructure_uid.phpt b/ext/imap/tests/imap_fetchstructure_uid.phpt
index bcb25522185..eb948da935b 100644
--- a/ext/imap/tests/imap_fetchstructure_uid.phpt
+++ b/ext/imap/tests/imap_fetchstructure_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_fetchstructure() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index 7c6fa3da847..03a9f55c2e7 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -3,6 +3,8 @@ imap_gc() ValueError
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt
index a1519042f13..2c1e6a941eb 100644
--- a/ext/imap/tests/imap_getsubscribed_basic.phpt
+++ b/ext/imap/tests/imap_getsubscribed_basic.phpt
@@ -2,6 +2,8 @@
 imap_getsubscribed() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt
index 0d84aee44bd..2e9d1094016 100644
--- a/ext/imap/tests/imap_headerinfo_basic.phpt
+++ b/ext/imap/tests/imap_headerinfo_basic.phpt
@@ -2,6 +2,8 @@
 imap_headerinfo() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt
index e11c6c1bd09..e4e1170a50a 100644
--- a/ext/imap/tests/imap_list_basic.phpt
+++ b/ext/imap/tests/imap_list_basic.phpt
@@ -2,6 +2,8 @@
 imap_list() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt
index 2fff7eeac8f..e88aa6a8de4 100644
--- a/ext/imap/tests/imap_lsub_basic.phpt
+++ b/ext/imap/tests/imap_lsub_basic.phpt
@@ -2,6 +2,8 @@
 imap_lsub() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt
index 312c8198a61..a7ecb6a3111 100644
--- a/ext/imap/tests/imap_mail_copy_basic.phpt
+++ b/ext/imap/tests/imap_mail_copy_basic.phpt
@@ -2,6 +2,8 @@
 Test imap_mail_copy() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
index 3cd347b627d..17f2fe971f5 100644
--- a/ext/imap/tests/imap_mail_move_basic.phpt
+++ b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -2,6 +2,8 @@
 Test imap_mail_move() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_open_error.phpt b/ext/imap/tests/imap_open_error.phpt
index 5ef4a2918d8..8cd9c385cf7 100644
--- a/ext/imap/tests/imap_open_error.phpt
+++ b/ext/imap/tests/imap_open_error.phpt
@@ -3,6 +3,8 @@ imap_open() ValueErrors
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_open_with_cl_expunge.phpt b/ext/imap/tests/imap_open_with_cl_expunge.phpt
index 5d1721f8616..fa3da46350d 100644
--- a/ext/imap/tests/imap_open_with_cl_expunge.phpt
+++ b/ext/imap/tests/imap_open_with_cl_expunge.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_open() using the CL_EXPUNGE flag
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt
index 05f1e4a3099..3371600c36e 100644
--- a/ext/imap/tests/imap_renamemailbox_basic.phpt
+++ b/ext/imap/tests/imap_renamemailbox_basic.phpt
@@ -2,6 +2,8 @@
 imap_renamemailbox() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_reopen_with_cl_expunge.phpt b/ext/imap/tests/imap_reopen_with_cl_expunge.phpt
index 78d1eddaca9..49af334cb89 100644
--- a/ext/imap/tests/imap_reopen_with_cl_expunge.phpt
+++ b/ext/imap/tests/imap_reopen_with_cl_expunge.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test imap_reopen() using the CL_EXPUNGE flag
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
index fd2dfb939dc..23fbec2a0ed 100644
--- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
+++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
@@ -2,6 +2,8 @@
 imap_rfc822_parse_headers() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt
index 38be6ab4a05..ac94b83f51f 100644
--- a/ext/imap/tests/imap_savebody_basic.phpt
+++ b/ext/imap/tests/imap_savebody_basic.phpt
@@ -2,6 +2,8 @@
 imap_savebody() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_savebody_errors.phpt b/ext/imap/tests/imap_savebody_errors.phpt
index e7cff603f6c..8abb9bf24f1 100644
--- a/ext/imap/tests/imap_savebody_errors.phpt
+++ b/ext/imap/tests/imap_savebody_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_savebody() errors: ValueError and Warnings
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_savebody_uid.phpt b/ext/imap/tests/imap_savebody_uid.phpt
index 9d4c058c10a..5690c6a11d4 100644
--- a/ext/imap/tests/imap_savebody_uid.phpt
+++ b/ext/imap/tests/imap_savebody_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_savebody() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_search_basic.phpt b/ext/imap/tests/imap_search_basic.phpt
index 11078da1dbe..7993f8b84e5 100644
--- a/ext/imap/tests/imap_search_basic.phpt
+++ b/ext/imap/tests/imap_search_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_search() with unique ID (SE_UID) flag
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_setflag_full_basic.phpt b/ext/imap/tests/imap_setflag_full_basic.phpt
index 10ab481cea8..be8618bf0be 100644
--- a/ext/imap/tests/imap_setflag_full_basic.phpt
+++ b/ext/imap/tests/imap_setflag_full_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_setflag_full() basic test
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_setflag_full_uid.phpt b/ext/imap/tests/imap_setflag_full_uid.phpt
index 86654213908..1e42898eb3c 100644
--- a/ext/imap/tests/imap_setflag_full_uid.phpt
+++ b/ext/imap/tests/imap_setflag_full_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_setflag_full() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_sort_uid.phpt b/ext/imap/tests/imap_sort_uid.phpt
index dff1e7c30bc..713fbfa15b9 100644
--- a/ext/imap/tests/imap_sort_uid.phpt
+++ b/ext/imap/tests/imap_sort_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_sort() basics
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
index e449c3fdecf..fa09c334c6d 100644
--- a/ext/imap/tests/imap_timeout_basic.phpt
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -2,6 +2,8 @@
 imap_timeout() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt
index b792fd093eb..6fc95f6ee8b 100644
--- a/ext/imap/tests/imap_undelete_basic.phpt
+++ b/ext/imap/tests/imap_undelete_basic.phpt
@@ -2,6 +2,8 @@
 imap_undelete() function : basic functionality
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/imap_undelete_uid.phpt b/ext/imap/tests/imap_undelete_uid.phpt
index aff7e47bdb9..13efc555c5c 100644
--- a/ext/imap/tests/imap_undelete_uid.phpt
+++ b/ext/imap/tests/imap_undelete_uid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 imap_undelete() passing a unique ID
+--EXTENSIONS--
+imap
 --SKIPIF--
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
diff --git a/ext/imap/tests/setup/skipif.inc b/ext/imap/tests/setup/skipif.inc
index c7dc24efd7d..ccb8c1d39aa 100644
--- a/ext/imap/tests/setup/skipif.inc
+++ b/ext/imap/tests/setup/skipif.inc
@@ -1,6 +1,4 @@
 <?php
-extension_loaded('imap') or die('skip imap extension not available in this build');
-
 include __DIR__ . '/imap_include.inc';
 
 $options = OP_HALFOPEN; // this should be enough to verify server present
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt
index e9024105969..b3c93a5c1f1 100644
--- a/ext/mysqli/tests/001.phpt
+++ b/ext/mysqli/tests/001.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli connect
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 322cbb2ee3d..fbef25ba80b 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_result 1
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index 62f397587e8..8fd46241bd7 100644
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli connect
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 22a7712dbac..76817515de4 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch char/text
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index ce0a9a88607..95527f0efea 100644
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch char/text long
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index 534ef4261fc..23cdd9e6f1b 100644
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch long values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index 7e71476a3a9..5fac291b100 100644
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch short values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index 37b75bb5b98..2425ebbcad3 100644
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch tinyint values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index f245c71f5dc..daf2343d6ca 100644
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -1,12 +1,13 @@
 --TEST--
 mysqli fetch bigint values (ok to fail with 4.1.x)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
     if (PHP_INT_SIZE == 8) {
         echo 'skip test valid only for 32bit systems';
         exit;
     }
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index 9ddac0931fc..d36c1da2149 100644
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -2,9 +2,10 @@
 mysqli fetch float values
 --INI--
 precision=12
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index db327e2d327..ee547b4f09c 100644
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -2,9 +2,10 @@
 mysqli fetch mixed values
 --INI--
 precision=12
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index 89303e57891..32a361ed0bc 100644
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -2,9 +2,10 @@
 mysqli fetch mixed values 2
 --INI--
 precision=12
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index c8aaa73d842..342b3488549 100644
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x server)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index bc5d906d934..7da7765de91 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli autocommit/commit/rollback
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index a179e8ec5a4..f9adb2fe2b0 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli autocommit/commit/rollback with innodb
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     require_once('connect.inc');
diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index 14fa02df732..6d62b566a15 100644
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch user variable
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index cb825066cd2..0aee3d4e65f 100644
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch functions
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt
index 87a97469490..ca8b99b4939 100644
--- a/ext/mysqli/tests/018.phpt
+++ b/ext/mysqli/tests/018.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch system variables
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 6d64a176014..5e84b550a29 100644
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli fetch (bind_param + bind_result)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index d3bbd593324..ab564e5cd32 100644
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_result date
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index fd2d4f0e2b6..1276629a0e3 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param+bind_result char/text
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index d591e5bae13..190b818f11f 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_result char/text long
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index a23e6e15ecf..3071708bea8 100644
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_prepare fetch long values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index dec1e284be4..5fd7fad6503 100644
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_result short values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 62b1590d29b..8de3c67780c 100644
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_result tinyint values
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 7f9a9bd4b8c..462b3a58548 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_param/bind_result with send_long_data
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt
index 918a6c4483d..f38b788a3f6 100644
--- a/ext/mysqli/tests/027.phpt
+++ b/ext/mysqli/tests/027.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_stat
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index 9b71d4d3da7..04e4825fa66 100644
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_character_set_name
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 769f3753f40..163d5cc1728 100644
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_affected_rows
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt
index 5705a90f914..bc77ab50637 100644
--- a/ext/mysqli/tests/030.phpt
+++ b/ext/mysqli/tests/030.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_errno
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index e230e7974cb..6f0bc70b22c 100644
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_error
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index ea7d13bc9bf..b991c09cfcc 100644
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_info
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt
index 387faa6de2a..c684b6aea7c 100644
--- a/ext/mysqli/tests/033.phpt
+++ b/ext/mysqli/tests/033.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_get_host_info
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt
index 655871c96ff..7b80b5c01db 100644
--- a/ext/mysqli/tests/034.phpt
+++ b/ext/mysqli/tests/034.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_get_proto_info
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt
index 0f2421f6299..6727a0551e6 100644
--- a/ext/mysqli/tests/035.phpt
+++ b/ext/mysqli/tests/035.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_get_server_info
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index 04fa7023bef..0efc92e10ea 100644
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -1,12 +1,13 @@
 --TEST--
 function test: mysqli_insert_id()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
     if (PHP_INT_SIZE == 8) {
         echo 'skip test valid only for 32bit systems';
         exit;
     }
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index 93b2ceace61..02c472d67a3 100644
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_field_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt
index 9719d93049d..b4895ea6b42 100644
--- a/ext/mysqli/tests/038.phpt
+++ b/ext/mysqli/tests/038.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_num_fields()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt
index 186811660d9..45a4ab9f717 100644
--- a/ext/mysqli/tests/039.phpt
+++ b/ext/mysqli/tests/039.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_num_fields() 2
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index 04d839408e7..7d89ba3826f 100644
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_num_rows()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt
index d64739d79ed..d0eb3fbb552 100644
--- a/ext/mysqli/tests/041.phpt
+++ b/ext/mysqli/tests/041.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_warning_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 3545ed06c1a..301603632ba 100644
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index adcf502dc72..fe3fd4cb824 100644
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param (UPDATE)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt
index 91d93d74824..bbef306be5a 100644
--- a/ext/mysqli/tests/044.phpt
+++ b/ext/mysqli/tests/044.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_server_version
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index 8486f1003e6..7db4a2a1bbc 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_result (SHOW)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     require_once("connect.inc");
diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index 998136dee14..4bf2de005c2 100644
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_affected_rows (delete)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 376bcb59c50..9feae7f31ab 100644
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_result_metadata
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index be5f5a79f18..f3a9917b7ec 100644
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli bind_result (OO-Style)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt
index fff62da5f0f..b5e304d5a36 100644
--- a/ext/mysqli/tests/049.phpt
+++ b/ext/mysqli/tests/049.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysql_fetch_row (OO-Style)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt
index c51c7bc1d23..9084325b335 100644
--- a/ext/mysqli/tests/050.phpt
+++ b/ext/mysqli/tests/050.phpt
@@ -1,8 +1,9 @@
 --TEST--
 non freed statement test
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt
index 239f8cbcf03..0617186e554 100644
--- a/ext/mysqli/tests/051.phpt
+++ b/ext/mysqli/tests/051.phpt
@@ -1,8 +1,9 @@
 --TEST--
 free statement after close
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt
index e079bc508b3..0b8b4f4c4c8 100644
--- a/ext/mysqli/tests/052.phpt
+++ b/ext/mysqli/tests/052.phpt
@@ -1,8 +1,9 @@
 --TEST--
 call statement after close
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt
index 4aac61514ac..49747f74047 100644
--- a/ext/mysqli/tests/053.phpt
+++ b/ext/mysqli/tests/053.phpt
@@ -1,8 +1,9 @@
 --TEST--
 not freed resultset
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt
index b06d5edc3a9..f17204b1625 100644
--- a/ext/mysqli/tests/054.phpt
+++ b/ext/mysqli/tests/054.phpt
@@ -1,8 +1,9 @@
 --TEST--
 free resultset after close
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt
index 7b6339afafe..51b96759d23 100644
--- a/ext/mysqli/tests/055.phpt
+++ b/ext/mysqli/tests/055.phpt
@@ -1,8 +1,9 @@
 --TEST--
 free nothing
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/056.phpt b/ext/mysqli/tests/056.phpt
index 9bb3a0eba9f..bcb3eae8cb5 100644
--- a/ext/mysqli/tests/056.phpt
+++ b/ext/mysqli/tests/056.phpt
@@ -1,8 +1,9 @@
 --TEST--
 extend mysqli
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 7d968a18b2e..f8c1c0f9fce 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_result_metadata
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index 541be1ede40..11d35c82c76 100644
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -1,8 +1,9 @@
 --TEST--
 multiple binds
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index 7168f6f8faf..e5545ba7731 100644
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -1,8 +1,9 @@
 --TEST--
 sqlmode + bind
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index c5a77ec16d3..45ef6d5e2cb 100644
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object with classes
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt
index 60472eb16e7..5033bb47e9b 100644
--- a/ext/mysqli/tests/062.phpt
+++ b/ext/mysqli/tests/062.phpt
@@ -1,8 +1,9 @@
 --TEST--
 resultset constructor
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
index b76b2c99855..32166b287df 100644
--- a/ext/mysqli/tests/063.phpt
+++ b/ext/mysqli/tests/063.phpt
@@ -1,8 +1,9 @@
 --TEST--
 resultset constructor
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/064.phpt b/ext/mysqli/tests/064.phpt
index b2280ff426b..d193456df4a 100644
--- a/ext/mysqli/tests/064.phpt
+++ b/ext/mysqli/tests/064.phpt
@@ -1,8 +1,9 @@
 --TEST--
 NULL binding
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index 9b18d33459f..251546d8260 100644
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -1,8 +1,9 @@
 --TEST--
 set character set
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset')) {
diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt
index 535d01d2243..25bd890f31b 100644
--- a/ext/mysqli/tests/066.phpt
+++ b/ext/mysqli/tests/066.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: mysqli_warning object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt
index a8874ffef44..5bb8a9f37d1 100644
--- a/ext/mysqli/tests/067.phpt
+++ b/ext/mysqli/tests/067.phpt
@@ -1,8 +1,9 @@
 --TEST--
 function test: nested selects (cursors)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt
index 24a42554836..9975da92727 100644
--- a/ext/mysqli/tests/068.phpt
+++ b/ext/mysqli/tests/068.phpt
@@ -1,7 +1,7 @@
 --TEST--
 mysqli get_client_info
---SKIPIF--
-<?php	require_once('skipif.inc'); ?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     $s = mysqli_get_client_info();
diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt
index 9f1d0b447e0..9b3236bacc3 100644
--- a/ext/mysqli/tests/069.phpt
+++ b/ext/mysqli/tests/069.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli multi_query, next_result, more_results
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt
index a9832815da7..e849fe06f8c 100644
--- a/ext/mysqli/tests/070.phpt
+++ b/ext/mysqli/tests/070.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli ping
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt
index a31832b4211..8a5334d4609 100644
--- a/ext/mysqli/tests/071.phpt
+++ b/ext/mysqli/tests/071.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli thread_id & kill
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt
index cb4ff60a862..91f302335d9 100644
--- a/ext/mysqli/tests/072.phpt
+++ b/ext/mysqli/tests/072.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli warning_count, get_warnings
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt
index 3f1271130ff..d0a1954dccd 100644
--- a/ext/mysqli/tests/074.phpt
+++ b/ext/mysqli/tests/074.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_autocommit() tests
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug28817.phpt b/ext/mysqli/tests/bug28817.phpt
index 41c201c5892..a7ce89e6ce6 100644
--- a/ext/mysqli/tests/bug28817.phpt
+++ b/ext/mysqli/tests/bug28817.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #28817 (problems with properties declared in the class extending MySQLi)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt
index a5808418bfd..c6bc9c76f92 100644
--- a/ext/mysqli/tests/bug29311.phpt
+++ b/ext/mysqli/tests/bug29311.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #29311 (Cannot override mysqli constructor)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt
index 9e68a0caec9..e8cbd3cbc77 100644
--- a/ext/mysqli/tests/bug30967.phpt
+++ b/ext/mysqli/tests/bug30967.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #30967 (problems with properties declared in the class extending the class extending MySQLi)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug31141.phpt b/ext/mysqli/tests/bug31141.phpt
index 9894896dd51..74f8498e496 100644
--- a/ext/mysqli/tests/bug31141.phpt
+++ b/ext/mysqli/tests/bug31141.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #31141 (properties declared in the class extending MySQLi are not available)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 class Test extends mysqli
diff --git a/ext/mysqli/tests/bug31668.phpt b/ext/mysqli/tests/bug31668.phpt
index 1dad169cc8c..7fadfb37239 100644
--- a/ext/mysqli/tests/bug31668.phpt
+++ b/ext/mysqli/tests/bug31668.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #31668 (multi_query works exactly every other time (multi_query was global, now per connection))
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt
index af41924c373..51d3c19387f 100644
--- a/ext/mysqli/tests/bug32405.phpt
+++ b/ext/mysqli/tests/bug32405.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #32405 (mysqli->fetch() is returning bad data)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug33090.phpt b/ext/mysqli/tests/bug33090.phpt
index 6bddfa4290c..51b2d233189 100644
--- a/ext/mysqli/tests/bug33090.phpt
+++ b/ext/mysqli/tests/bug33090.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #33090 (mysql_prepare doesn't return an error)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt
index ccf619d09f3..5b33eaaa0be 100644
--- a/ext/mysqli/tests/bug33263.phpt
+++ b/ext/mysqli/tests/bug33263.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #33263 (mysqli_real_connect in __construct)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index 7b49774033f..89d6e67a21e 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -2,9 +2,10 @@
 Bug #33491 (extended mysqli class crashes when result is not object)
 --INI--
 error_reporting=1
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug34785.phpt b/ext/mysqli/tests/bug34785.phpt
index 17a18f4ca92..88817b65062 100644
--- a/ext/mysqli/tests/bug34785.phpt
+++ b/ext/mysqli/tests/bug34785.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #34785 (Can not properly subclass mysqli_stmt)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index e1568d30385..502a67dbd21 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #34810 (mysqli::init() and others use wrong $this pointer without checks)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug35103.phpt b/ext/mysqli/tests/bug35103.phpt
index 95f65320f9e..6a48c6b20ea 100644
--- a/ext/mysqli/tests/bug35103.phpt
+++ b/ext/mysqli/tests/bug35103.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #35103 (Bad handling of unsigned bigint)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt
index 578f905f352..abe0fc2d599 100644
--- a/ext/mysqli/tests/bug35517.phpt
+++ b/ext/mysqli/tests/bug35517.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #35517 (mysqli_stmt_fetch returns NULL)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt
index 5ae032eb83c..4566f65b86c 100644
--- a/ext/mysqli/tests/bug35759.phpt
+++ b/ext/mysqli/tests/bug35759.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt
index 18e5307a1dc..5d0b52fefeb 100644
--- a/ext/mysqli/tests/bug36420.phpt
+++ b/ext/mysqli/tests/bug36420.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #36420 (segfault when access result->num_rows after calling result->close())
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt
index 744985ab418..bbe11789b53 100644
--- a/ext/mysqli/tests/bug36745.phpt
+++ b/ext/mysqli/tests/bug36745.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #36745 (LOAD DATA LOCAL INFILE doesn't return correct error message)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug36802.phpt b/ext/mysqli/tests/bug36802.phpt
index c0bace8aaf6..21fabd470ad 100644
--- a/ext/mysqli/tests/bug36802.phpt
+++ b/ext/mysqli/tests/bug36802.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36802 (crashes with with mysqli_set_charset())
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     class really_my_mysqli extends mysqli {
diff --git a/ext/mysqli/tests/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt
index 7033eef23cc..d7a7028654e 100644
--- a/ext/mysqli/tests/bug36949.phpt
+++ b/ext/mysqli/tests/bug36949.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #36949 (invalid internal mysqli objects dtor)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt
index 8345b4b82f8..c6707610494 100644
--- a/ext/mysqli/tests/bug37090.phpt
+++ b/ext/mysqli/tests/bug37090.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #37090 (mysqli_set_charset return code)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_charset')) {
     die('skip mysqli_set_charset() not available');
diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt
index dc6496971a3..9c6c7c0fc44 100644
--- a/ext/mysqli/tests/bug38710.phpt
+++ b/ext/mysqli/tests/bug38710.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #38710 (data leakage because of nonexisting boundary checking in statements)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug39457.phpt b/ext/mysqli/tests/bug39457.phpt
index f518b143310..979a568ba07 100644
--- a/ext/mysqli/tests/bug39457.phpt
+++ b/ext/mysqli/tests/bug39457.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #39457 (Multiple invoked OO connections never close)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt
index 3019679e5dc..75661c60b5a 100644
--- a/ext/mysqli/tests/bug42378.phpt
+++ b/ext/mysqli/tests/bug42378.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #42378 (bind_result memory exhaustion, SELECT column, FORMAT(...) AS _format)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt
index e188d83666c..28d2ca05418 100644
--- a/ext/mysqli/tests/bug42548.phpt
+++ b/ext/mysqli/tests/bug42548.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #42548 PROCEDURE xxx can't return a result set in the given context (works in 5.2.3!!)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt
index 430a32856e1..48ad2ab70de 100644
--- a/ext/mysqli/tests/bug44897.phpt
+++ b/ext/mysqli/tests/bug44897.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #44879 (failed to prepare statement)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
-
 if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
     die("skip: only available in mysqlnd");
 
diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt
index c3316133f12..f5f2aa37140 100644
--- a/ext/mysqli/tests/bug45019.phpt
+++ b/ext/mysqli/tests/bug45019.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #45019 (Segmentation fault with SELECT ? and UNION)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug45289.phpt b/ext/mysqli/tests/bug45289.phpt
index 8604fc72609..8a72e3517e4 100644
--- a/ext/mysqli/tests/bug45289.phpt
+++ b/ext/mysqli/tests/bug45289.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #45289 (Bogus store_result on PS)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt
index 6b44275ed4b..0d5eaf4a2b7 100644
--- a/ext/mysqli/tests/bug46109.phpt
+++ b/ext/mysqli/tests/bug46109.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #46109 (MySQLi::init - Memory leaks)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt
index e451abda9ed..1d2a4610e01 100644
--- a/ext/mysqli/tests/bug46614.phpt
+++ b/ext/mysqli/tests/bug46614.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #46614 (Extended MySQLi class gives incorrect empty() result)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined("MYSQLI_ASYNC")) {
     die("skip mysqlnd only");
diff --git a/ext/mysqli/tests/bug47050.phpt b/ext/mysqli/tests/bug47050.phpt
index 1dd8f73a699..151cd750f2b 100644
--- a/ext/mysqli/tests/bug47050.phpt
+++ b/ext/mysqli/tests/bug47050.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #47050 (mysqli_poll() modifies improper variables)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined("MYSQLI_ASYNC")) {
     die("skip mysqlnd only");
diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt
index 2d994f559e5..3cdbee51146 100644
--- a/ext/mysqli/tests/bug48909.phpt
+++ b/ext/mysqli/tests/bug48909.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #48909 (Segmentation fault in mysqli_stmt_execute)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt
index 6a459ed4acb..7bef3004d80 100644
--- a/ext/mysqli/tests/bug49027.phpt
+++ b/ext/mysqli/tests/bug49027.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #49027 (mysqli_options() doesn't work when using mysqlnd)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index 13ddf7b7215..f8829ae31a2 100644
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #49422 (mysqlnd: mysqli_real_connect() and LOAD DATA INFILE crash)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 $link = mysqli_init();
diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt
index 8987d0ac48a..4351e2108c5 100644
--- a/ext/mysqli/tests/bug50772.phpt
+++ b/ext/mysqli/tests/bug50772.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #50772 (mysqli constructor without parameters does not return a working mysqli object)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug51605.phpt b/ext/mysqli/tests/bug51605.phpt
index c3238da289e..06b973a0f95 100644
--- a/ext/mysqli/tests/bug51605.phpt
+++ b/ext/mysqli/tests/bug51605.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #51605 Mysqli - zombie links
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index 8cc15e325e1..3e1e15a6e7a 100644
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #51647 (Certificate file without private key (pk in another file) doesn't work)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt
index 666804dac44..0ffc25e9100 100644
--- a/ext/mysqli/tests/bug52082.phpt
+++ b/ext/mysqli/tests/bug52082.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #52082 (character_set_client & character_set_connection reset after mysqli_change_user)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt
index 2c4e19ca4c2..1c287d79bfa 100644
--- a/ext/mysqli/tests/bug52891.phpt
+++ b/ext/mysqli/tests/bug52891.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #52891 (Wrong data inserted with mysqli/mysqlnd when using bind_param,value > LONG_MAX)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
     die("skip: test applies only to mysqlnd");
diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt
index 0b187102f75..9e78ed80cfc 100644
--- a/ext/mysqli/tests/bug53503.phpt
+++ b/ext/mysqli/tests/bug53503.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #53503 (mysqli::query returns false after successful LOAD DATA query)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/bug54221.phpt b/ext/mysqli/tests/bug54221.phpt
index 602ea68583a..246ff0c5b2f 100644
--- a/ext/mysqli/tests/bug54221.phpt
+++ b/ext/mysqli/tests/bug54221.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #54221 mysqli::get_warnings segfault when used in multi queries
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug54674.phpt b/ext/mysqli/tests/bug54674.phpt
index b3c44be290d..9b19d3e20da 100644
--- a/ext/mysqli/tests/bug54674.phpt
+++ b/ext/mysqli/tests/bug54674.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #54674 mysqlnd valid_sjis_(head|tail) is using invalid operator and range.
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index 379cab0db31..3d26f8f61f7 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/bug55582.phpt b/ext/mysqli/tests/bug55582.phpt
index e66b4f14cfb..2112cbdafbc 100644
--- a/ext/mysqli/tests/bug55582.phpt
+++ b/ext/mysqli/tests/bug55582.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is used
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 ?>
diff --git a/ext/mysqli/tests/bug55653.phpt b/ext/mysqli/tests/bug55653.phpt
index a51a7ddd22a..19e1cc25011 100644
--- a/ext/mysqli/tests/bug55653.phpt
+++ b/ext/mysqli/tests/bug55653.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #55653 	PS crash with libmysql when binding same variable as param and out
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug62046.phpt b/ext/mysqli/tests/bug62046.phpt
index 5913ef399e5..3ac55a11bb2 100644
--- a/ext/mysqli/tests/bug62046.phpt
+++ b/ext/mysqli/tests/bug62046.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #62046 	mysqli@mysqlnd can't iterate over stored sets after call to mysqli_stmt_reset()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug62885.phpt b/ext/mysqli/tests/bug62885.phpt
index c0815c7f047..a43c5903fe4 100644
--- a/ext/mysqli/tests/bug62885.phpt
+++ b/ext/mysqli/tests/bug62885.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #62885 (mysqli_poll - Segmentation fault)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
     die("skip mysqlnd only test");
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt
index 11a3b709095..93739c82ebf 100644
--- a/ext/mysqli/tests/bug63398.phpt
+++ b/ext/mysqli/tests/bug63398.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #63398 (Segfault when polling closed link)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
     die("skip mysqlnd only test");
diff --git a/ext/mysqli/tests/bug64726.phpt b/ext/mysqli/tests/bug64726.phpt
index 8f24ad09b70..8d4b3ee2640 100644
--- a/ext/mysqli/tests/bug64726.phpt
+++ b/ext/mysqli/tests/bug64726.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #63398 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
     die("skip mysqlnd only test");
diff --git a/ext/mysqli/tests/bug66043.phpt b/ext/mysqli/tests/bug66043.phpt
index 6b479a45ed0..6adf8e5e4b8 100644
--- a/ext/mysqli/tests/bug66043.phpt
+++ b/ext/mysqli/tests/bug66043.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66043 (Segfault calling bind_param() on mysqli)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt
index 8a2e5a5f731..39f5777977f 100644
--- a/ext/mysqli/tests/bug66124.phpt
+++ b/ext/mysqli/tests/bug66124.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 ?>
diff --git a/ext/mysqli/tests/bug66762.phpt b/ext/mysqli/tests/bug66762.phpt
index c1f749d8c4e..2864793805b 100644
--- a/ext/mysqli/tests/bug66762.phpt
+++ b/ext/mysqli/tests/bug66762.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66762 	mysqli@libmysql segfault in mysqli_stmt::bind_result() when link closed
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt
index 4391d74add2..d2827e16377 100644
--- a/ext/mysqli/tests/bug67839.phpt
+++ b/ext/mysqli/tests/bug67839.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_float_handling - ensure 4 byte float is handled correctly
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/bug67983.phpt b/ext/mysqli/tests/bug67983.phpt
index a72501c0768..a7c91ae629c 100644
--- a/ext/mysqli/tests/bug67983.phpt
+++ b/ext/mysqli/tests/bug67983.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #67983: mysqlnd with MYSQLI_OPT_INT_AND_FLOAT_NATIVE fails to interpret bit columns
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
     die("skip mysqlnd only test");
diff --git a/ext/mysqli/tests/bug68077.phpt b/ext/mysqli/tests/bug68077.phpt
index 2be4fe97aa8..058d13ebcde 100644
--- a/ext/mysqli/tests/bug68077.phpt
+++ b/ext/mysqli/tests/bug68077.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
     die("skip: test applies only to mysqlnd");
diff --git a/ext/mysqli/tests/bug69899.phpt b/ext/mysqli/tests/bug69899.phpt
index 13c0c953818..6585f104840 100644
--- a/ext/mysqli/tests/bug69899.phpt
+++ b/ext/mysqli/tests/bug69899.phpt
@@ -6,9 +6,10 @@ free_result is called on a prepared statement followed by closing that
 statement. This is due to mysqlnd_stmt::free_result (mysqlnd_ps.c) which
 unconditionally sets the connection of the statement to ready, despite the fact
 that it might already be closed.
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once __DIR__ . '/skipif.inc';
 require_once __DIR__ . '/skipifconnectfailure.inc';
 require_once __DIR__ . '/connect.inc';
 if (!$IS_MYSQLND) {
diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt
index 1bc0e7a97f7..3eeb3255ba8 100644
--- a/ext/mysqli/tests/bug70384.phpt
+++ b/ext/mysqli/tests/bug70384.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_float_handling - ensure 4 byte float is handled correctly
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
         if ($link->server_version < 50709) {
diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt
index 24c729c670a..567b1131efd 100644
--- a/ext/mysqli/tests/bug70949.phpt
+++ b/ext/mysqli/tests/bug70949.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt
index 1490f9fe969..c815287e602 100644
--- a/ext/mysqli/tests/bug71863.phpt
+++ b/ext/mysqli/tests/bug71863.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #71863 Segfault when EXPLAIN with "Unknown Column" Error
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt
index cd941b2881d..d6661f5b219 100644
--- a/ext/mysqli/tests/bug72489.phpt
+++ b/ext/mysqli/tests/bug72489.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72489 (PHP Crashes When Modifying Array Containing MySQLi Result Data)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug72701.phpt b/ext/mysqli/tests/bug72701.phpt
index b2944f02039..318125e4fa8 100644
--- a/ext/mysqli/tests/bug72701.phpt
+++ b/ext/mysqli/tests/bug72701.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #72701 mysqli_get_host_info() wrong output
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/bug73462.phpt b/ext/mysqli/tests/bug73462.phpt
index 224c981dfa9..aa54dbbe5d5 100644
--- a/ext/mysqli/tests/bug73462.phpt
+++ b/ext/mysqli/tests/bug73462.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73462 (Persistent connections don't set $connect_errno)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug73800.phpt b/ext/mysqli/tests/bug73800.phpt
index af3a5c8cfb4..1b9e58b17c5 100644
--- a/ext/mysqli/tests/bug73800.phpt
+++ b/ext/mysqli/tests/bug73800.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
 if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt
index d8b2f31d0b3..b706ab20e88 100644
--- a/ext/mysqli/tests/bug73949.phpt
+++ b/ext/mysqli/tests/bug73949.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73949 (leak in mysqli_fetch_object)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug74021.phpt b/ext/mysqli/tests/bug74021.phpt
index a6d83fe88d2..123d2a3bf09 100644
--- a/ext/mysqli/tests/bug74021.phpt
+++ b/ext/mysqli/tests/bug74021.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74021 (fetch_array broken data. Data more then MEDIUMBLOB)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug74547.phpt b/ext/mysqli/tests/bug74547.phpt
index 90d790dc9e2..49d2bc8d3e6 100644
--- a/ext/mysqli/tests/bug74547.phpt
+++ b/ext/mysqli/tests/bug74547.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-  require_once('skipif.inc');
   require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug74737.phpt b/ext/mysqli/tests/bug74737.phpt
index d270c198fd0..dce4080cfb4 100644
--- a/ext/mysqli/tests/bug74737.phpt
+++ b/ext/mysqli/tests/bug74737.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #74737: Incorrect ReflectionFunction information for mysqli_get_client_info
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 $client_info = mysqli_get_client_info();
diff --git a/ext/mysqli/tests/bug74779.phpt b/ext/mysqli/tests/bug74779.phpt
index 3b4ca8adcef..9137f615904 100644
--- a/ext/mysqli/tests/bug74779.phpt
+++ b/ext/mysqli/tests/bug74779.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74779 (x() and y() truncating floats to integers)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!setlocale(LC_NUMERIC, "de_DE", "de_DE.UTF-8", "de-DE")) die('skip locale not available');
 ?>
diff --git a/ext/mysqli/tests/bug74968.phpt b/ext/mysqli/tests/bug74968.phpt
index c563c2c56dc..ac29a564c5b 100644
--- a/ext/mysqli/tests/bug74968.phpt
+++ b/ext/mysqli/tests/bug74968.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug75018.phpt b/ext/mysqli/tests/bug75018.phpt
index ce522aab870..1bd19a834fb 100644
--- a/ext/mysqli/tests/bug75018.phpt
+++ b/ext/mysqli/tests/bug75018.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #75018 Data corruption when reading fields of bit type
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug75434.phpt b/ext/mysqli/tests/bug75434.phpt
index 3e295d83bf6..85cf0f0b71d 100644
--- a/ext/mysqli/tests/bug75434.phpt
+++ b/ext/mysqli/tests/bug75434.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75434 Wrong reflection for mysqli_fetch_all function
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 $rf = new ReflectionFunction('mysqli_fetch_all');
diff --git a/ext/mysqli/tests/bug75448.phpt b/ext/mysqli/tests/bug75448.phpt
index 2d6926df200..1ecb81b2003 100644
--- a/ext/mysqli/tests/bug75448.phpt
+++ b/ext/mysqli/tests/bug75448.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_prepare() called on a closed connection should return FALSE (bug #75448)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug76386.phpt b/ext/mysqli/tests/bug76386.phpt
index f6fe13c9171..a0bd61689c8 100644
--- a/ext/mysqli/tests/bug76386.phpt
+++ b/ext/mysqli/tests/bug76386.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Prepared Statement formatter truncates fractional seconds from date/time column (bug #76386)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/bug77597.phpt b/ext/mysqli/tests/bug77597.phpt
index cd9055deb78..ffc0ccf1897 100644
--- a/ext/mysqli/tests/bug77597.phpt
+++ b/ext/mysqli/tests/bug77597.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77597: mysqli_fetch_field hangs scripts
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
diff --git a/ext/mysqli/tests/bug77935.phpt b/ext/mysqli/tests/bug77935.phpt
index 9917488a25c..5ebf1e97e5f 100644
--- a/ext/mysqli/tests/bug77935.phpt
+++ b/ext/mysqli/tests/bug77935.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77935: Crash in mysqlnd_fetch_stmt_row_cursor when calling an SP with a cursor
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug77956.phpt b/ext/mysqli/tests/bug77956.phpt
index 19df063951c..bbebbe26c53 100644
--- a/ext/mysqli/tests/bug77956.phpt
+++ b/ext/mysqli/tests/bug77956.phpt
@@ -1,8 +1,9 @@
 --TEST--
 ensure an error is returned when mysqli.allow_local_infile is off
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 $link = mysqli_init();
diff --git a/ext/mysqli/tests/bug79084.phpt b/ext/mysqli/tests/bug79084.phpt
index b760c4abb76..e4d5cfbe587 100644
--- a/ext/mysqli/tests/bug79084.phpt
+++ b/ext/mysqli/tests/bug79084.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug79084_collision.phpt b/ext/mysqli/tests/bug79084_collision.phpt
index 9f0c72962d5..43f686df2c6 100644
--- a/ext/mysqli/tests/bug79084_collision.phpt
+++ b/ext/mysqli/tests/bug79084_collision.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79084 (mysqlnd may fetch wrong column indexes with MYSQLI_BOTH) - collision
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug79375.phpt b/ext/mysqli/tests/bug79375.phpt
index 75c9aeb7be6..205c6506515 100644
--- a/ext/mysqli/tests/bug79375.phpt
+++ b/ext/mysqli/tests/bug79375.phpt
@@ -1,9 +1,10 @@
 --TEST--
 Bug #79375: mysqli_store_result does not report error from lock wait timeout
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
diff --git a/ext/mysqli/tests/bug80837.phpt b/ext/mysqli/tests/bug80837.phpt
index 71e31aa31bb..64839d3fba5 100644
--- a/ext/mysqli/tests/bug80837.phpt
+++ b/ext/mysqli/tests/bug80837.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80837 Calling stmt_store_result after fetch doesn't throw an error
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
diff --git a/ext/mysqli/tests/bug_bits.phpt b/ext/mysqli/tests/bug_bits.phpt
index a4afa3e5443..97e6dbe39b2 100644
--- a/ext/mysqli/tests/bug_bits.phpt
+++ b/ext/mysqli/tests/bug_bits.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug (Incorrectly decoding bit values / Malformed server packet. Field length pointing)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug_mysql_49406.phpt b/ext/mysqli/tests/bug_mysql_49406.phpt
index 73ca0ad882d..f27bf6b48be 100644
--- a/ext/mysqli/tests/bug_mysql_49406.phpt
+++ b/ext/mysqli/tests/bug_mysql_49406.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL Bug #49406 (Binding params doesn't work when selecting a date inside a CASE-WHEN, http://bugs.mysql.com/bug.php?id=49406)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/deprecated_constants.phpt b/ext/mysqli/tests/deprecated_constants.phpt
index 2a218326e08..033b0f32fb7 100644
--- a/ext/mysqli/tests/deprecated_constants.phpt
+++ b/ext/mysqli/tests/deprecated_constants.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Deprecated constants
---SKIPIF--
-<?php
-require_once 'skipif.inc';
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 
diff --git a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
index d2894f2c0d4..d915f67949c 100644
--- a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
+++ b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
@@ -1,10 +1,11 @@
 --TEST--
 Fail gracefully on empty result set
---SKIPIF--
+--EXTENSIONS--
+mysqli
+--SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
-?>
+?>
 --FILE--
 <?php
     require_once("connect.inc");
diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt
index 3205e7cb2b8..ebd505cb0ed 100644
--- a/ext/mysqli/tests/mysqli_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_affected_rows()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
index 5e2e0bba8a0..8a82cb01a44 100644
--- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli->affected_rows
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt b/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt
index 187701ff8c2..eddf9fe8aeb 100644
--- a/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt
+++ b/ext/mysqli/tests/mysqli_allow_local_infile_overrides_local_infile_directory.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli.allow_local_infile overrides mysqli.local_infile_directory
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt
index 386024598d6..f3c6b0e0577 100644
--- a/ext/mysqli/tests/mysqli_auth_pam.phpt
+++ b/ext/mysqli/tests/mysqli_auth_pam.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PAM auth plugin
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt
index 9bfec89b270..0b410f1f052 100644
--- a/ext/mysqli/tests/mysqli_autocommit.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_autocommit()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('connect.inc');
     require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
index 1030bedbb37..6510c62ccbe 100644
--- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli->autocommit()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index fa8d88908cc..20eda35cb3d 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_begin_transaction()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt
index d3a7db930f6..2e3a772a7ed 100644
--- a/ext/mysqli/tests/mysqli_change_user.phpt
+++ b/ext/mysqli/tests/mysqli_change_user.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
index 605a408146f..5b951831f51 100644
--- a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - GET_LOCK()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 die("skip - is the server still buggy?");
 ?>
diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
index 383a7a1cf86..c82b2c7fa05 100644
--- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - LAST_INSERT_ID() - http://bugs.mysql.com/bug.php?id=45184?
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
index 70c119b554c..4c72190b9c7 100644
--- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - table locks, GET_LOCK(), temporary tables
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 die("skip - is the server still buggy?");
 ?>
diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt
index d36f667314f..acf86ab517d 100644
--- a/ext/mysqli/tests/mysqli_change_user_new.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_new.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user(), MySQL 5.6+
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt
index 045479037ce..db9e7ca1831 100644
--- a/ext/mysqli/tests/mysqli_change_user_old.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_old.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user(), MySQL < 5.6
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt
index c0b4cb93681..d2fab8876c2 100644
--- a/ext/mysqli/tests/mysqli_change_user_oo.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli->change_user()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('table.inc');
diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
index b92e5cef160..1e4ec750fa1 100644
--- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - Prepared Statement
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
index d420e060d9c..01fad81108c 100644
--- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - ROLLBACK
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
index f818dea7dab..e09c7801b90 100644
--- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_change_user() - SET NAMES
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 65be8a0408a..3398af2b2f2 100644
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Fetching results from tables of different charsets.
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset')) {
diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt
index 79d472d3343..364d9a0ea8a 100644
--- a/ext/mysqli/tests/mysqli_character_set_name.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_character_set_name(), mysql_client_encoding() [alias]
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
index 87531904556..0fd49057376 100644
--- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_character_set_name(), mysql_client_encoding() [alias]
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
index ebf9c7f2b74..1fef0273f99 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_interface.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Interface of the class mysqli_driver
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
index d0d858b9de0..793d5b11508 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Interface of the class mysqli
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
index b04fb93e9cf..cba05fd3a4c 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_properties_no_conn.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Interface of the class mysqli
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
index b3c73f1386b..abbb47ebb1d 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Interface of the class mysqli_result
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
index b10877a2856..626843c427d 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Interface of the class mysqli_stmt
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt
index 1f693a84d7d..7ed0931f4b5 100644
--- a/ext/mysqli/tests/mysqli_close.phpt
+++ b/ext/mysqli/tests/mysqli_close.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_close()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt
index 2c29b02d486..79d0c058fa0 100644
--- a/ext/mysqli/tests/mysqli_close_oo.phpt
+++ b/ext/mysqli/tests/mysqli_close_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_close()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt
index 273412de0bb..642b5d9b717 100644
--- a/ext/mysqli/tests/mysqli_commit.phpt
+++ b/ext/mysqli/tests/mysqli_commit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_commit()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt
index e4cfbe47943..56c90b866bf 100644
--- a/ext/mysqli/tests/mysqli_commit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_commit_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_commit()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index 3668ad8f9e9..8f648934308 100644
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_connect()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_attr.phpt b/ext/mysqli/tests/mysqli_connect_attr.phpt
index 7d586a694d9..eadf7b0fa0d 100644
--- a/ext/mysqli/tests/mysqli_connect_attr.phpt
+++ b/ext/mysqli/tests/mysqli_connect_attr.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli check the session_connect_attrs table for connection attributes
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt
index 7e786e3d87d..0bd5754b0f5 100644
--- a/ext/mysqli/tests/mysqli_connect_errno.phpt
+++ b/ext/mysqli/tests/mysqli_connect_errno.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_connect_errno()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt
index 801f18535ee..c353dc17877 100644
--- a/ext/mysqli/tests/mysqli_connect_error.phpt
+++ b/ext/mysqli/tests/mysqli_connect_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_connect_error()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt
index 8b0fcfbd2f5..2e47ca35568 100644
--- a/ext/mysqli/tests/mysqli_connect_oo.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 new mysqli()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index 4893b6d134c..d523cc843a8 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -1,8 +1,9 @@
 --TEST--
 new mysqli()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
index 9387dd2c489..b16547d81d6 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
@@ -1,8 +1,9 @@
 --TEST--
 new mysqli()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     if (!get_current_user())
         die('skip: get_current_user() not supported');
diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt
index c179d003335..94f18239706 100644
--- a/ext/mysqli/tests/mysqli_connect_twice.phpt
+++ b/ext/mysqli/tests/mysqli_connect_twice.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Calling connect() on an open connection to create a new connection
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 55862389b7c..4415f3250cc 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Constants exported by ext/mysqli
---SKIPIF--
-<?php
-require_once 'skipif.inc';
-?>
+--EXTENSIONS--
+mysqli
 --INI--
 mysqli.allow_local_infile=1
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt
index 29291fe203e..fa858499894 100644
--- a/ext/mysqli/tests/mysqli_constants_categories.phpt
+++ b/ext/mysqli/tests/mysqli_constants_categories.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Constants exported by ext/mysqli - checking category - PHP bug not mysqli bug (check from time to time)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     $constants = get_defined_constants(true);
diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt
index 5334999cac1..787b2807972 100644
--- a/ext/mysqli/tests/mysqli_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_data_seek()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
index d1939bafa28..8801b7394eb 100644
--- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_result->data_seek()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt
index 1646dd9f3aa..ec0eacced8c 100644
--- a/ext/mysqli/tests/mysqli_debug.phpt
+++ b/ext/mysqli/tests/mysqli_debug.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt
index 65496fdf6e9..b48e8470a47 100644
--- a/ext/mysqli/tests/mysqli_debug_append.phpt
+++ b/ext/mysqli/tests/mysqli_debug_append.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug() - append to trace file
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt
index bd17e138795..73b0b032ba8 100644
--- a/ext/mysqli/tests/mysqli_debug_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug() - invalid debug control strings
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt
index 6df6e0aef34..6827e6cc4e7 100644
--- a/ext/mysqli/tests/mysqli_debug_ini.phpt
+++ b/ext/mysqli/tests/mysqli_debug_ini.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug() - enabling trace with ini setting
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
index 54026193169..8dc6a385279 100644
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug() - all control string options supported by both mysqlnd and libmysql except oOaA
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
index 0d963d23701..c252e645dc9 100644
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_debug() - mysqlnd only control strings
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt
index a756766df6e..6bc68c8bb78 100644
--- a/ext/mysqli/tests/mysqli_driver.phpt
+++ b/ext/mysqli/tests/mysqli_driver.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_driver class
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
index c51d5d5245b..54b97ef36c9 100644
--- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Trying to clone mysqli_driver object
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     $driver = new mysqli_driver;
diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt
index 8b97304bc6e..f496b34bd6a 100644
--- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt
+++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_dump_debug_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
index 7fb7ba79635..c9e3a0bb71d 100644
--- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
+++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_dump_debug_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt
index fe2493a04ff..ededb8c0cde 100644
--- a/ext/mysqli/tests/mysqli_errno.phpt
+++ b/ext/mysqli/tests/mysqli_errno.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_errno()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt
index d2dab3cec0d..f9a7f34c600 100644
--- a/ext/mysqli/tests/mysqli_errno_oo.phpt
+++ b/ext/mysqli/tests/mysqli_errno_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 $mysqli->errno
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt
index 91b2f715a14..562dc43615f 100644
--- a/ext/mysqli/tests/mysqli_error.phpt
+++ b/ext/mysqli/tests/mysqli_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_error()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt
index d690a619951..1e2514f38de 100644
--- a/ext/mysqli/tests/mysqli_error_oo.phpt
+++ b/ext/mysqli/tests/mysqli_error_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 $mysqli->error
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index 1da3f5fd698..48710cee1ec 100644
--- a/ext/mysqli/tests/mysqli_error_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_error_unicode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_error()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt
index 12508494af0..50332d6cd69 100644
--- a/ext/mysqli/tests/mysqli_expire_password.phpt
+++ b/ext/mysqli/tests/mysqli_expire_password.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL 5.6 / MariaDB 10.4.3 EXPIRE PASSWORD protocol change
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt
index ade3e93fa7b..f651e573e30 100644
--- a/ext/mysqli/tests/mysqli_explain_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt
@@ -1,8 +1,9 @@
 --TEST--
 EXPLAIN - metadata
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND)
diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt
index 9fc772d3614..cfd28261c08 100644
--- a/ext/mysqli/tests/mysqli_fetch_all.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_all()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
index 02b8803016a..bd0cc17f2fe 100644
--- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 $mysqli->fetch_all() (introduced with mysqlnd)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt
index c5805552606..cf229f382b5 100644
--- a/ext/mysqli/tests/mysqli_fetch_array.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_array() - all datatypes but BIT
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
index cbb3367dd0a..9b3a211d2a9 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_array()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
index b51e70ad7cd..43cd0fab3fd 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_large.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
@@ -1,9 +1,10 @@
 --TEST--
 mysqli_fetch_array() - large packages (to test compression)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
index d3e8c138b0c..a96e4f5d32d 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_array()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
index dad5917888c..5fd0408c110 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli->fetch_array()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
index de19f9a878a..80546ca1985 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
index d59cd82128e..cc92737f81e 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc() - BIT
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
index 7083f54b4a0..7d48ff1193a 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index 225a5c03d82..a100057c869 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc() - utf8
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once("connect.inc");
 
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
index 11c1928545c..bc3cf54d16f 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
index 6d53211697d..147310ecc57 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_assoc() - ZEROFILL
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_column.phpt b/ext/mysqli/tests/mysqli_fetch_column.phpt
index 25c6066a7b5..fddb41687d8 100644
--- a/ext/mysqli/tests/mysqli_fetch_column.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_column.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_column()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt
index 48d30453a0a..512ae27b827 100644
--- a/ext/mysqli/tests/mysqli_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_field()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
index 6959090b786..1bd5538afba 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_field_direct()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
index e07ec40ad03..238eeb65e9c 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 $res->fetch_field_direct(s)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index 7dff325623d..031e5af6725 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_field() - flags/field->flags
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
index ed0ce107cff..6c43ea6bd5f 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_field()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
index dcfbbaaace4..99e64ca45b4 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_field() - data types/field->type
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt
index ae1d12847a2..47ed37e5889 100644
--- a/ext/mysqli/tests/mysqli_fetch_fields.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_fields()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
index a1e4f50dbdf..dae6588319d 100644
--- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_lengths()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
index 6c117afc593..26186053161 100644
--- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_result->lengths
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt
index 8076311112c..1f2dcdb6676 100644
--- a/ext/mysqli/tests/mysqli_fetch_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 5d823648c71..25d544ee398 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object() - calling constructor on class wo constructor
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
index 5a89d6d3f12..204cd932e89 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index c541ad2d044..86ddb9a04c7 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_object()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt
index 09ae78aba6b..a1f544dbbc3 100644
--- a/ext/mysqli/tests/mysqli_fetch_row.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_row.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_fetch_row()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt
index ca40616547a..bcc0c6e2116 100644
--- a/ext/mysqli/tests/mysqli_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_field_count.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_field_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index 8b0516a6a05..c4508fa5482 100644
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_field_seek()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt
index d489e4068e8..cb1dcc3b98e 100644
--- a/ext/mysqli/tests/mysqli_field_tell.phpt
+++ b/ext/mysqli/tests/mysqli_field_tell.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_field_tell()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt
index ca5eb6230fa..599376d0b9c 100644
--- a/ext/mysqli/tests/mysqli_fork.phpt
+++ b/ext/mysqli/tests/mysqli_fork.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Forking a child and using the same connection.
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('pcntl_fork'))
diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt
index 8f81fffab4d..21ae2851517 100644
--- a/ext/mysqli/tests/mysqli_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_free_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_free_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt
index 68ee608028e..f902b11746b 100644
--- a/ext/mysqli/tests/mysqli_get_charset.phpt
+++ b/ext/mysqli/tests/mysqli_get_charset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_charset()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_charset'))
     die("skip: function not available");
diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt
index 221ce149027..42b6229aa7b 100644
--- a/ext/mysqli/tests/mysqli_get_client_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_client_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 78f3d05b39c..aea4d3c0a0b 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_client_stats()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
index 92a779b31f4..17a99095ee6 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_client_stats() - implicit_free_result
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
index e648d6695d6..4faf1ffc204 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_client_stats() - php_ini setting
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
index ce7a5e3267a..a348c38290c 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_client_stats() - PS
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
index ef1ea86e50d..7bd92e88e6d 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
@@ -3,9 +3,10 @@ mysqli_get_client_stats() - skipped rows
 --INI--
 mysqlnd.collect_statistics="1"
 mysqlnd.collect_memory_statistics="1"
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt
index 28f4974ba18..695da0bb84f 100644
--- a/ext/mysqli/tests/mysqli_get_client_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_version.phpt
@@ -1,7 +1,7 @@
 --TEST--
 mysqli_get_client_version()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     if (!is_int($info = mysqli_get_client_version()) || ($info < 100))
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
index 8c14ff2f154..b59e266966f 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
@@ -3,9 +3,10 @@ mysqli_get_connection_stats()
 --INI--
 mysqlnd.collect_statistics="1"
 mysqlnd.collect_memory_statistics="1"
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_connection_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
index d2b087ce9aa..3cfa6400de6 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
@@ -3,9 +3,10 @@ mysqli_get_connection_stats() - disable via php.ini
 --INI--
 mysqlnd.collect_statistics="0"
 mysqlnd.collect_memory_statistics="0"
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?PHP
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_connection_stats')) {
     die("skip only available with mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt
index 4d9087860fb..924db1616ef 100644
--- a/ext/mysqli/tests/mysqli_get_host_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_host_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_host_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_info_deprecations.phpt b/ext/mysqli/tests/mysqli_get_info_deprecations.phpt
index 2dbbce0540c..21eb869f185 100644
--- a/ext/mysqli/tests/mysqli_get_info_deprecations.phpt
+++ b/ext/mysqli/tests/mysqli_get_info_deprecations.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Deprecated messages for mysqli::get_client_info() method
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt
index 0091993d21b..e0c41c09d7b 100644
--- a/ext/mysqli/tests/mysqli_get_proto_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_proto_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt
index 88cfd47ee19..7c29de4debb 100644
--- a/ext/mysqli/tests/mysqli_get_server_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_server_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt
index b28bd8f285c..1a895803546 100644
--- a/ext/mysqli/tests/mysqli_get_server_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_version.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_server_version()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt
index f81baa4177c..9cd13d27c7c 100644
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_get_warnings() - TODO
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$TEST_EXPERIMENTAL)
diff --git a/ext/mysqli/tests/mysqli_incomplete_initialization.phpt b/ext/mysqli/tests/mysqli_incomplete_initialization.phpt
index 399ad74274f..51a4d44c72b 100644
--- a/ext/mysqli/tests/mysqli_incomplete_initialization.phpt
+++ b/ext/mysqli/tests/mysqli_incomplete_initialization.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Incomplete initialization edge case where mysql->mysql is NULL
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
 
diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt
index 4fe156ba316..b10a521b2cb 100644
--- a/ext/mysqli/tests/mysqli_info.phpt
+++ b/ext/mysqli/tests/mysqli_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_info()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt
index 56a956900ab..5bed5e4be79 100644
--- a/ext/mysqli/tests/mysqli_init.phpt
+++ b/ext/mysqli/tests/mysqli_init.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_init()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt
index 0c45a4a6769..1f3dc94b363 100644
--- a/ext/mysqli/tests/mysqli_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_insert_id()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
index b3f36d4cb0c..d555ddedc20 100644
--- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Checking last_insert_id after different operations
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
index 1285fe1f505..cc3b15072ec 100644
--- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
+++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
@@ -1,8 +1,9 @@
 --TEST--
 INSERT and packet overflow
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index d2c0fc6df64..9d7d7a0f471 100644
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_kill()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_last_insert_id.phpt b/ext/mysqli/tests/mysqli_last_insert_id.phpt
index 0598f29b740..88a3702d2b2 100644
--- a/ext/mysqli/tests/mysqli_last_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_last_insert_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 API vs. SQL LAST_INSERT_ID()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-  require_once('skipif.inc');
   require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_local_infile_default_off.phpt b/ext/mysqli/tests/mysqli_local_infile_default_off.phpt
index 65f40129250..63784703acf 100644
--- a/ext/mysqli/tests/mysqli_local_infile_default_off.phpt
+++ b/ext/mysqli/tests/mysqli_local_infile_default_off.phpt
@@ -1,8 +1,9 @@
 --TEST--
 ensure default for local infile is off
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_local_infile_directory_access_allowed.phpt b/ext/mysqli/tests/mysqli_local_infile_directory_access_allowed.phpt
index a9c0c82e990..43eebb73976 100644
--- a/ext/mysqli/tests/mysqli_local_infile_directory_access_allowed.phpt
+++ b/ext/mysqli/tests/mysqli_local_infile_directory_access_allowed.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli.local_infile_directory vs access allowed
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_local_infile_directory_access_denied.phpt b/ext/mysqli/tests/mysqli_local_infile_directory_access_denied.phpt
index 8f50e032208..957aeeb65fa 100644
--- a/ext/mysqli/tests/mysqli_local_infile_directory_access_denied.phpt
+++ b/ext/mysqli/tests/mysqli_local_infile_directory_access_denied.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli.local_infile_directory access denied
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_local_infile_directory_vs_open_basedir.phpt b/ext/mysqli/tests/mysqli_local_infile_directory_vs_open_basedir.phpt
index a48606ad665..6349bef488b 100644
--- a/ext/mysqli/tests/mysqli_local_infile_directory_vs_open_basedir.phpt
+++ b/ext/mysqli/tests/mysqli_local_infile_directory_vs_open_basedir.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli.local_infile_directory vs open_basedir
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_local_infile_set_on.phpt b/ext/mysqli/tests/mysqli_local_infile_set_on.phpt
index 172d6dcb9b3..89f7e4a75ab 100644
--- a/ext/mysqli/tests/mysqli_local_infile_set_on.phpt
+++ b/ext/mysqli/tests/mysqli_local_infile_set_on.phpt
@@ -1,8 +1,9 @@
 --TEST--
 enable local infile
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_max_links.phpt b/ext/mysqli/tests/mysqli_max_links.phpt
index 21405199e5d..82dd9cbcf51 100644
--- a/ext/mysqli/tests/mysqli_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_max_links.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing mysqli.max_links
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt
index aaa4f65f288..ac0926d66fa 100644
--- a/ext/mysqli/tests/mysqli_more_results.phpt
+++ b/ext/mysqli/tests/mysqli_more_results.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_more_results()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt
index 0cc260a5579..76c3b598aa8 100644
--- a/ext/mysqli/tests/mysqli_multi_query.phpt
+++ b/ext/mysqli/tests/mysqli_multi_query.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_multi_query()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
index ec424e44bda..be8c3aafa2e 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqlnd.net_read_timeout limit check
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$IS_MYSQLND)
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index a4459992d88..b8b8c284900 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqlnd.net_read_timeout > default_socket_timeout
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND) {
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
index 5ba35270281..e0c8278ae81 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqlnd.net_read_timeout = 0
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND) {
diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt
index 425260b9265..fde8773bb42 100644
--- a/ext/mysqli/tests/mysqli_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_next_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_next_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_next_result_error.phpt b/ext/mysqli/tests/mysqli_next_result_error.phpt
index 4118bd0eab0..84c39083494 100644
--- a/ext/mysqli/tests/mysqli_next_result_error.phpt
+++ b/ext/mysqli/tests/mysqli_next_result_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Error in multi query
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt
index 5d54b02a2b7..a89b2d38edb 100644
--- a/ext/mysqli/tests/mysqli_no_reconnect.phpt
+++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying implicit reconnect after wait_timeout and KILL using mysqli_ping()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt
index 083ccef4bfb..93f5093f944 100644
--- a/ext/mysqli/tests/mysqli_num_fields.phpt
+++ b/ext/mysqli/tests/mysqli_num_fields.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_num_fields()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt
index f617757d378..58202f12cd4 100644
--- a/ext/mysqli/tests/mysqli_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_num_rows.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_num_rows()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_open_bug74432.phpt b/ext/mysqli/tests/mysqli_open_bug74432.phpt
index cb5d00a1e46..72800439da1 100644
--- a/ext/mysqli/tests/mysqli_open_bug74432.phpt
+++ b/ext/mysqli/tests/mysqli_open_bug74432.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74432, BC issue on undocumented connect string
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt
index 2ff895cada2..fac9a82144c 100644
--- a/ext/mysqli/tests/mysqli_options.phpt
+++ b/ext/mysqli/tests/mysqli_options.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_options()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 
 ?>
diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt
index 2b87083cbd4..5d38295e295 100644
--- a/ext/mysqli/tests/mysqli_options_init_command.phpt
+++ b/ext/mysqli/tests/mysqli_options_init_command.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_options()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
index 0b7f8df703f..ccabbd18d68 100644
--- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
+++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_options() - MYSQLI_OPT_INT_AND_FLOAT_NATIVE
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_options_openbasedir.phpt b/ext/mysqli/tests/mysqli_options_openbasedir.phpt
index 5fd213c108f..75d324fd4f9 100644
--- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt
+++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_options() - MYSQLI_OPT_LOCAL_INFILE and open_basedir
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt
index 7f94f202cc0..625e20ad423 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PAM: SHA-256
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 ob_start();
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
index f67d57ca75c..94db7fabe40 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PAM: SHA-256, mysqlnd.sha256_server_public_key
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 ob_start();
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
index a76feebf9fb..497a7300ca6 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PAM: SHA-256, option: MYSQLI_SERVER_PUBLIC_KEY
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 ob_start();
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
index 9b2109d7545..3c6b53d43a7 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PAM: SHA-256, option: MYSQLI_SERVER_PUBLIC_KEY (invalid)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 ob_start();
diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
index ab6052a7002..ae3f4cb2ec2 100644
--- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Calling connect() on an open persistent connection to create a new persistent connection
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
index 8320e250368..08ab0e8778f 100644
--- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_pconnect() - mysqli.allow_persistent = 0
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 die("skip TODO - we need to add a user level way to check if CHANGE_USER gets called by pconnect");
diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt
index 1415ee4ac65..d53ed449959 100644
--- a/ext/mysqli/tests/mysqli_pconn_kill.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Killing a persistent connection.
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 ?>
diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt
index c78fda1a015..4dd65c18a1d 100644
--- a/ext/mysqli/tests/mysqli_pconn_limits.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Persistent connections - limits (-1, unlimited)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 ?>
diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index f48222c4253..e923fc71baa 100644
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Persistent connections and mysqli.max_links
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once('table.inc');
 
diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
index 4f1dff27e89..85dc168a81a 100644
--- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
@@ -1,10 +1,11 @@
 --TEST--
 mysqli_pconnect() - reusing/caching persistent connections - TODO
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 die("skip TODO - we need to add a user level way to check if CHANGE_USER gets called by pconnect");
 
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt
index c7211ca06e1..7c17c9133e3 100644
--- a/ext/mysqli/tests/mysqli_pconn_twice.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Calling connect() on an open persistent connection to create a new persistent connection
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 ?>
diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt
index 2fce4788532..2f482895805 100644
--- a/ext/mysqli/tests/mysqli_pconnect.phpt
+++ b/ext/mysqli/tests/mysqli_pconnect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_pconnect()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt
index ea78a6bb0c1..3e542feb14a 100644
--- a/ext/mysqli/tests/mysqli_phpinfo.phpt
+++ b/ext/mysqli/tests/mysqli_phpinfo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 phpinfo() mysqli section
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt
index e4d184c6210..7f00140b183 100644
--- a/ext/mysqli/tests/mysqli_ping.phpt
+++ b/ext/mysqli/tests/mysqli_ping.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_ping()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt
index 615c027d684..691075bee25 100644
--- a/ext/mysqli/tests/mysqli_poll.phpt
+++ b/ext/mysqli/tests/mysqli_poll.phpt
@@ -1,8 +1,9 @@
 --TEST--
 int mysqli_poll() simple
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt
index 1cd18cc45ca..d1c851205f4 100644
--- a/ext/mysqli/tests/mysqli_poll_kill.phpt
+++ b/ext/mysqli/tests/mysqli_poll_kill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 int mysqli_poll() and kill
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
index 44397ca37c1..a5ee8a0b50c 100644
--- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
+++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_poll() & INSERT SELECT
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_poll_reference.phpt b/ext/mysqli/tests/mysqli_poll_reference.phpt
index ca084aa63c6..a74c932ac8d 100644
--- a/ext/mysqli/tests/mysqli_poll_reference.phpt
+++ b/ext/mysqli/tests/mysqli_poll_reference.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_poll() & references
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt
index f6676396e53..84cf79dbe5e 100644
--- a/ext/mysqli/tests/mysqli_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_prepare.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_prepare()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
index 42021b1b88c..ae41a2a4d32 100644
--- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_prepare() - no object on failure
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt
index f13254b449a..ea2a97c9e60 100644
--- a/ext/mysqli/tests/mysqli_ps_select_union.phpt
+++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Prepared Statements and SELECT UNION
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt
index e2f6de3995d..dca42b7e692 100644
--- a/ext/mysqli/tests/mysqli_query.phpt
+++ b/ext/mysqli/tests/mysqli_query.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_query()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_query_iterators.phpt b/ext/mysqli/tests/mysqli_query_iterators.phpt
index 3ad35363b9c..783a2b05aba 100644
--- a/ext/mysqli/tests/mysqli_query_iterators.phpt
+++ b/ext/mysqli/tests/mysqli_query_iterators.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli iterators
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
index 566dc9dc272..fec2228d744 100644
--- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_query() - Stored Procedures
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 6a5e1be9124..98624b1abe4 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_query() - unicode (cyrillic)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 require_once('table.inc');
diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt
index 5a168637803..2df7356215d 100644
--- a/ext/mysqli/tests/mysqli_real_connect.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_connect()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt
index 0a9fa583d13..a72c1a74dbe 100644
--- a/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect_compression_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80107 mysqli_query() fails for ~16 MB long query when compression is enabled
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once("connect.inc");
 $link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 if (!$link) {
diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
index d49c01d3b7a..7b37f371c65 100644
--- a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_connect() - persistent connections
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$IS_MYSQLND)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt
index 5e6c7d91301..38d9678c31e 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_escape_string()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index 2dec713db2b..bc2fe717937 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -1,9 +1,10 @@
 --TEST--
 mysqli_real_escape_string() - big5
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index 9af4ade5894..bea70cb3e5a 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -1,9 +1,10 @@
 --TEST--
 mysqli_real_escape_string() - eucjpms
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index c79302d4027..b85b229aadd 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -1,9 +1,10 @@
 --TEST--
 mysqli_real_escape_string() - euckr
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index d84944b4bd2..dcc645d8671 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -1,9 +1,10 @@
 --TEST--
 mysqli_real_escape_string() - gb2312
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
 
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index 4da0d8a2329..5b3f079de5c 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_escape_string() - gbk
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
index b48e9c02d80..853ace720dc 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_escape_string() - SQL Mode NO_BACKSLASH_ESCAPE
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index 034a3bd607b..73727ea8748 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_escape_string() - sjis
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
index 4bb5ef79690..d4999f96d31 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_escape_string()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt
index 4b429940d7d..6601525b475 100644
--- a/ext/mysqli/tests/mysqli_real_query.phpt
+++ b/ext/mysqli/tests/mysqli_real_query.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_real_query()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt
index b93996ef38b..2f4a09e1d39 100644
--- a/ext/mysqli/tests/mysqli_reap_async_query.phpt
+++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_reap_async_query()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt
index d473211b58c..6cb13c5e360 100644
--- a/ext/mysqli/tests/mysqli_reconnect.phpt
+++ b/ext/mysqli/tests/mysqli_reconnect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying implicit reconnect after wait_timeout and KILL using mysqli_ping()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (stristr(mysqli_get_client_info(), 'mysqlnd'))
     die("skip: test for libmysql");
diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt
index 44c33b39c22..64716524c36 100644
--- a/ext/mysqli/tests/mysqli_release_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_release_savepoint()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt
index 840c2c017a0..2751138ef81 100644
--- a/ext/mysqli/tests/mysqli_report.phpt
+++ b/ext/mysqli/tests/mysqli_report.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_report()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt
index 305d7010837..9ef80da1d86 100644
--- a/ext/mysqli/tests/mysqli_report_new.phpt
+++ b/ext/mysqli/tests/mysqli_report_new.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_report(), change user, MySQL 5.6+
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
index c1ba3e4756c..f030051dd5f 100644
--- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt
+++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_report(), MySQL < 5.6
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
diff --git a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
index 6be779f3313..1a1677589d5 100644
--- a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
+++ b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_result(), invalid mode
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt
index be90b45794d..0e2e2d98be0 100644
--- a/ext/mysqli/tests/mysqli_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_result_references.phpt
@@ -1,8 +1,9 @@
 --TEST--
 References to result sets
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
index 5f5e3525964..61a60cb6873 100644
--- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
@@ -1,8 +1,9 @@
 --TEST--
 References to result sets - mysqlnd (no copies but references)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$IS_MYSQLND)
diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index 5962c583eb5..0605e916a29 100644
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying to clone mysqli_result object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt
index 17f7aed05e9..0978308e8c3 100644
--- a/ext/mysqli/tests/mysqli_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_rollback.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_rollback()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt
index ebe27686aca..a34c1aaee13 100644
--- a/ext/mysqli/tests/mysqli_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_savepoint.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_savepoint()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt
index 50463b81066..0a64a7b7584 100644
--- a/ext/mysqli/tests/mysqli_select_db.phpt
+++ b/ext/mysqli/tests/mysqli_select_db.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_select_db()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt
index e9373a44dbd..075e193959e 100644
--- a/ext/mysqli/tests/mysqli_set_charset.phpt
+++ b/ext/mysqli/tests/mysqli_set_charset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_set_charset()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset'))
diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt
index 4fc4735b33c..c6868e2e418 100644
--- a/ext/mysqli/tests/mysqli_set_opt.phpt
+++ b/ext/mysqli/tests/mysqli_set_opt.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_set_opt()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt
index e871d0ff3e5..da071913e13 100644
--- a/ext/mysqli/tests/mysqli_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_sqlstate.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_sqlstate()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt
index 2ad705bda45..6abc84fb341 100644
--- a/ext/mysqli/tests/mysqli_ssl_set.phpt
+++ b/ext/mysqli/tests/mysqli_ssl_set.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_ssl_set() - test is a stub!
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_ssl_set'))
     die("skip function not available");
diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt
index 73a7656e1fa..5900d836346 100644
--- a/ext/mysqli/tests/mysqli_stat.phpt
+++ b/ext/mysqli/tests/mysqli_stat.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stat()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
index de4f73bc18c..d3baf3e66ec 100644
--- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_affected_rows()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
index 2b35eb88c56..6f6e011de10 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_attr_get()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
index 9ef46151f90..320486f42db 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_attr_get() - prefetch
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 die("SKIP: prefetch isn't supported at the moment");
 ?>
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
index 634faa01c39..0b17edf7a1a 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_attr_set() - mysqlnd does not check for invalid codes
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
index 75351b0983c..04d0a3c0ebd 100644
--- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_prepare()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
index f9eca0f3339..58a99c86e7f 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bind limits
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
index f3f11511ca1..009a089137e 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
index 4db8db655ea..f23433dcd72 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param used with call_user_func_array() (see also bug #43568)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
index b3a4bfe2236..d7758dd4bac 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param() - checking whether the parameters are modified (bug#44390)
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt
index 137670235a6..251bb546a31 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param() - Binding with very high number of columns
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
index b622f254d1e..9c6a80a3a46 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param() - playing with references
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
index 617e6e2cb0b..e85a97a9944 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_param() - binding variable twice
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index 5c4d43375de..0459133cce1 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
index f24c5856ed0..46a6f60da01 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt
index a2dc488e577..b40f414b39e 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Playing with SELECT FORMAT(...) AS _format - see also bugs.php.net/42378
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
index 91a8c0a556f..138655ed212 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_result() - playing with references
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
index 00dcae479cc..1955290c2c5 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_bind_result() - ZEROFILL
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt
index ba0dcd7140d..39460fc9cd8 100644
--- a/ext/mysqli/tests/mysqli_stmt_close.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_close.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_close()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
index a16aa631e4a..db767851f64 100644
--- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_data_seek()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index 14f1ebbe506..3ab05504bbe 100644
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Playing with datatype change between prepare and execute
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt
index b65770c444c..b3307040e80 100644
--- a/ext/mysqli/tests/mysqli_stmt_errno.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_errno()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt
index 0bf93edaa97..ce3b248622c 100644
--- a/ext/mysqli/tests/mysqli_stmt_error.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_error()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt
index a939a93d31e..3970b2ed4db 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
     die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt b/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt
index e99203eeaa3..c7a8eb14889 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_bind.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute() - bind in execute
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 if (!stristr(mysqli_get_client_info(), 'mysqlnd')) {
     die("skip: only available in mysqlnd");
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_bind_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_execute_bind_libmysql.phpt
index f7ddb05c389..7e0e5dd953b 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_bind_libmysql.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_bind_libmysql.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute() - bind in execute - not supported with libmysql
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once 'skipif.inc';
 require_once 'skipifconnectfailure.inc';
 if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
     die("skip: only applicable for libmysqlclient");
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index b26c16f98ae..c7269e8cb47 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute() - Stored Procedures
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
index 86a703c6412..b8a3ac1f7e1 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute() - SP, next result
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
index 667268b3aa1..403180050f6 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_execute() - OUT
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
index 64b4862653a..e8fcd0811db 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_fetch()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
index 1e25a77a6b6..d66160615c2 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Fetching BIT column values using the PS API
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
     require_once('connect.inc');
     require_once('table.inc');
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
index 073a48c228c..574a20f40de 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_fetch_fields() unicode, win32
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
index 432d72fe545..4055501c115 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_fetch - geometry / spatial types
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     if (!defined("MYSQLI_TYPE_GEOMETRY"))
diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
index 4424248c48f..ee3d4072289 100644
--- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_field_counts()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
index 867a8193d41..e14befed267 100644
--- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_free_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
index 0f98217d598..d63ee6b8f0a 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
index 99fabb89d8f..fc0deef2c82 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_stmt_get_result'))
     die('skip mysqli_stmt_get_result not available');
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
index dace91f4c89..64a1b86340b 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Fetching BIT column values using the PS API
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
index 300a1e3397c..0c60fc61bde 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result() - meta data, field_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
index 2105a590d43..6eac7978a43 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result - geometry / spatial types
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index 2fe305ed21c..e1c2be6cee3 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result() - meta data
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
index b33611eb329..9f4b01b93ae 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result() - meta data, field info
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
index 9a0e52d5cb7..d92177e7a30 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result() - SHOW, DESCRIBE, EXPLAIN
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index 8c3d6e1e35d..65daea87137 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result() - seeking
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
index b188ed1d844..b8e0a7a7750 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_result - data types
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
     require_once('skipifconnectfailure.inc');
 
     if (!function_exists('mysqli_stmt_get_result'))
diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
index 3787a13386c..0dadb7bb4a1 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_get_warnings() - TODO
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once("connect.inc");
diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt
index 22a21a64d27..fca0cc522f6 100644
--- a/ext/mysqli/tests/mysqli_stmt_init.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_init.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_init()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
index d49bd1b0943..61a1aeadb45 100644
--- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_insert_id()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt
index 07abac4dcc0..496fca4e4f6 100644
--- a/ext/mysqli/tests/mysqli_stmt_multires.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Multiple result set with PS
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
     die("skip mysqlnd only test");
diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
index 8b932dc0534..252f3954de5 100644
--- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_num_rows()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
index 50886949359..e1f4c342492 100644
--- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_param_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
index 36ce473f3da..b3f4e69eb9b 100644
--- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_prepare()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt
index 933f0774bf0..38b57e17b49 100644
--- a/ext/mysqli/tests/mysqli_stmt_reset.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_reset()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index 250e93ed001..0eb0f782210 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_result_metadata()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index 929e9df645d..5eac0ba5d20 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_result_metadata() - non SELECT statements
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.php?id=42490");
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
index 0fce3502fc2..048d6f0fd9b 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_send_long_data()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
index b191df60225..21b0e4625dd 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_send_long_data() - exceed packet size, libmysql - bug #26824
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (stristr(mysqli_get_client_info(), 'mysqlnd'))
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
index c7376afdd30..07c2e144875 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_send_long_data() - exceed packet size, mysqlnd
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
index edad2b9c3f9..34a6c28b12f 100644
--- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_sqlstate()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
index d8f4c4769f7..10df777b9fa 100644
--- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_stmt_store_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
index 0d777800228..0db0f0a2baf 100644
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying to clone mysqli_stmt object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt
index 8d4e72bdf9b..02fc55bd51a 100644
--- a/ext/mysqli/tests/mysqli_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_store_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_store_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
index 70a864270d9..2c38f2159ad 100644
--- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_store_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) {
     die("skip Requires MYSQLI_STORE_RESULT_COPY_DATA");
diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt
index 51c76e7d3c0..6cf9490c43d 100644
--- a/ext/mysqli/tests/mysqli_store_result_copy.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_store_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
     die("SKIP mysqlnd only test");
diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt
index f72d33cf25e..9862fadaa9c 100644
--- a/ext/mysqli/tests/mysqli_thread_id.phpt
+++ b/ext/mysqli/tests/mysqli_thread_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_thread_id()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt
index d4ab11a956e..4518855765d 100644
--- a/ext/mysqli/tests/mysqli_thread_safe.phpt
+++ b/ext/mysqli/tests/mysqli_thread_safe.phpt
@@ -1,9 +1,7 @@
 --TEST--
 mysqli_thread_safe()
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+mysqli
 --FILE--
 <?php
     if (!is_bool($tmp = mysqli_thread_safe()))
diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt
index 27b75849c50..d1686888c1f 100644
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying to clone mysqli object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt
index a333891bba2..f74f04cab01 100644
--- a/ext/mysqli/tests/mysqli_use_result.phpt
+++ b/ext/mysqli/tests/mysqli_use_result.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_use_result()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt
index 5ad0e103349..0babf59593f 100644
--- a/ext/mysqli/tests/mysqli_warning_count.phpt
+++ b/ext/mysqli/tests/mysqli_warning_count.phpt
@@ -1,8 +1,9 @@
 --TEST--
 mysqli_warning_count()
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
index e33bdb7d3a3..f1aaad606b3 100644
--- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Trying to clone mysqli_warning object
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$TEST_EXPERIMENTAL)
diff --git a/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt b/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt
index c4d80498b14..d6956b7e635 100644
--- a/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt
+++ b/ext/mysqli/tests/ps_cursor_multiple_result_sets.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PS using cursor and returning multiple result sets
+--EXTENSIONS--
+mysqli
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/skipif.inc b/ext/mysqli/tests/skipif.inc
deleted file mode 100644
index a5a5df14c26..00000000000
--- a/ext/mysqli/tests/skipif.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-if (!extension_loaded('mysqli')){
-    die('skip mysqli extension not available');
-}
-?>
diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt
index c8f415d0ced..52eb47b6bcc 100644
--- a/ext/oci8/tests/array_bind_003.phpt
+++ b/ext/oci8/tests/array_bind_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and invalid values 3
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt
index 0a1b89d1d47..1bb6f9967b3 100644
--- a/ext/oci8/tests/array_bind_004.phpt
+++ b/ext/oci8/tests/array_bind_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and invalid values 4
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt
index 6575ad70d5b..d8e8de40733 100644
--- a/ext/oci8/tests/array_bind_005.phpt
+++ b/ext/oci8/tests/array_bind_005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and invalid values 5
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt
index 85615d85ea7..c3270271614 100644
--- a/ext/oci8/tests/array_bind_006.phpt
+++ b/ext/oci8/tests/array_bind_006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name(), SQLT_CHR and default max_length
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt
index e7d31a13815..22440e8256c 100644
--- a/ext/oci8/tests/array_bind_008.phpt
+++ b/ext/oci8/tests/array_bind_008.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and invalid values 8
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt
index abf7907739b..9b1bef53f96 100644
--- a/ext/oci8/tests/array_bind_014.phpt
+++ b/ext/oci8/tests/array_bind_014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and NUMBERs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_bdouble.phpt b/ext/oci8/tests/array_bind_bdouble.phpt
index 5b9b433afe1..7f94bbb8e92 100644
--- a/ext/oci8/tests/array_bind_bdouble.phpt
+++ b/ext/oci8/tests/array_bind_bdouble.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Unsupported type: oci_bind_array_by_name() and SQLT_BDOUBLE
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_bfloat.phpt b/ext/oci8/tests/array_bind_bfloat.phpt
index 598ea504d64..5498edb5f1b 100644
--- a/ext/oci8/tests/array_bind_bfloat.phpt
+++ b/ext/oci8/tests/array_bind_bfloat.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Unsupported type: oci_bind_array_by_name() and SQLT_BFLOAT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt
index c04703d446f..3969df376ea 100644
--- a/ext/oci8/tests/array_bind_date.phpt
+++ b/ext/oci8/tests/array_bind_date.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_ODT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt
index 5d5d6bdeb66..8a56bc0c09b 100644
--- a/ext/oci8/tests/array_bind_date1.phpt
+++ b/ext/oci8/tests/array_bind_date1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_ODT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_float.phpt b/ext/oci8/tests/array_bind_float.phpt
index 4eb7d4e5466..588acec7d30 100644
--- a/ext/oci8/tests/array_bind_float.phpt
+++ b/ext/oci8/tests/array_bind_float.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_FLT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_float1.phpt b/ext/oci8/tests/array_bind_float1.phpt
index e5eb136d7b6..63b38679f63 100644
--- a/ext/oci8/tests/array_bind_float1.phpt
+++ b/ext/oci8/tests/array_bind_float1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_FLT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_int.phpt b/ext/oci8/tests/array_bind_int.phpt
index 6a6d709e38f..9e1b27eb250 100644
--- a/ext/oci8/tests/array_bind_int.phpt
+++ b/ext/oci8/tests/array_bind_int.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_INT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_int1.phpt b/ext/oci8/tests/array_bind_int1.phpt
index 6fa8c5ce698..2d78378fb46 100644
--- a/ext/oci8/tests/array_bind_int1.phpt
+++ b/ext/oci8/tests/array_bind_int1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_INT
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt
index ee712d2b649..2b00c9323e0 100644
--- a/ext/oci8/tests/array_bind_str.phpt
+++ b/ext/oci8/tests/array_bind_str.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_CHR
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt
index 2094e78ba59..498d9bb4de2 100644
--- a/ext/oci8/tests/array_bind_str1.phpt
+++ b/ext/oci8/tests/array_bind_str1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_bind_array_by_name() and SQLT_CHR
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/array_bind_uin.phpt b/ext/oci8/tests/array_bind_uin.phpt
index f35fce7c192..b628186dc51 100644
--- a/ext/oci8/tests/array_bind_uin.phpt
+++ b/ext/oci8/tests/array_bind_uin.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Unsupported type: oci_bind_array_by_name() and SQLT_UIN
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/b47243_1.phpt b/ext/oci8/tests/b47243_1.phpt
index 826404021be..7cbb3597438 100644
--- a/ext/oci8/tests/b47243_1.phpt
+++ b/ext/oci8/tests/b47243_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47243 (Crash on exit with ZTS mode)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt
index f7a9978978c..557f30ac480 100644
--- a/ext/oci8/tests/b47243_2.phpt
+++ b/ext/oci8/tests/b47243_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47243 (Crash on exit with ZTS mode)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt
index c9d9936c214..d82f5396e98 100644
--- a/ext/oci8/tests/b47243_3.phpt
+++ b/ext/oci8/tests/b47243_3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47243 (Crash on exit with ZTS mode)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_long.phpt b/ext/oci8/tests/bind_long.phpt
index 7dc1c0db23e..d0bd6bc44f1 100644
--- a/ext/oci8/tests/bind_long.phpt
+++ b/ext/oci8/tests/bind_long.phpt
@@ -1,5 +1,7 @@
 --TEST--
 bind LONG field
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_long_raw.phpt b/ext/oci8/tests/bind_long_raw.phpt
index d008604812f..0fa7261623d 100644
--- a/ext/oci8/tests/bind_long_raw.phpt
+++ b/ext/oci8/tests/bind_long_raw.phpt
@@ -1,5 +1,7 @@
 --TEST--
 bind LONG RAW field
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_misccoltypes.phpt b/ext/oci8/tests/bind_misccoltypes.phpt
index 928256ad6bc..e62823e95e3 100644
--- a/ext/oci8/tests/bind_misccoltypes.phpt
+++ b/ext/oci8/tests/bind_misccoltypes.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bind miscellaneous column types using default types
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_raw.phpt b/ext/oci8/tests/bind_raw.phpt
index dca9730ccb7..5106b085305 100644
--- a/ext/oci8/tests/bind_raw.phpt
+++ b/ext/oci8/tests/bind_raw.phpt
@@ -1,5 +1,7 @@
 --TEST--
 bind RAW field
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_raw_2.phpt b/ext/oci8/tests/bind_raw_2.phpt
index 5195b1ca893..eecb69439fb 100644
--- a/ext/oci8/tests/bind_raw_2.phpt
+++ b/ext/oci8/tests/bind_raw_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 bind RAW field with OCI_B_BIN
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bind_unsupported_3.phpt b/ext/oci8/tests/bind_unsupported_3.phpt
index 27d1b209496..48572f30dd6 100644
--- a/ext/oci8/tests/bind_unsupported_3.phpt
+++ b/ext/oci8/tests/bind_unsupported_3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bind with various bind types not supported by TimesTen
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => false, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt
index 3665f01edc7..8deb566dfc5 100644
--- a/ext/oci8/tests/bug32325.phpt
+++ b/ext/oci8/tests/bug32325.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #32325 (Cannot retrieve collection using OCI8)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug35973.phpt b/ext/oci8/tests/bug35973.phpt
index 53c43d41d50..c6338101729 100644
--- a/ext/oci8/tests/bug35973.phpt
+++ b/ext/oci8/tests/bug35973.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #35973 (Error ORA-24806 occurs when trying to fetch a NCLOB field)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug36010.phpt b/ext/oci8/tests/bug36010.phpt
index 0947d3f6fbd..1e5ec1c6e5b 100644
--- a/ext/oci8/tests/bug36010.phpt
+++ b/ext/oci8/tests/bug36010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36010 (Crash when executing SQL statement with lob parameter twice)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt
index ce0ac0a5038..656099d084f 100644
--- a/ext/oci8/tests/bug37220.phpt
+++ b/ext/oci8/tests/bug37220.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37220 (LOB Type mismatch when using windows & oci8.dll)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt
index a33ef77c795..74a22e28475 100644
--- a/ext/oci8/tests/bug37581.phpt
+++ b/ext/oci8/tests/bug37581.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37581 (oci_bind_array_by_name clobbers input array when using SQLT_AFC, AVC)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug38173.phpt b/ext/oci8/tests/bug38173.phpt
index 087e6a7485e..15820f36c39 100644
--- a/ext/oci8/tests/bug38173.phpt
+++ b/ext/oci8/tests/bug38173.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #38173 (Freeing nested cursors causes OCI8 to segfault)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt
index 0887c83b09d..c50efae0110 100644
--- a/ext/oci8/tests/bug40078.phpt
+++ b/ext/oci8/tests/bug40078.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #40078 (ORA-01405 when fetching NULL values using oci_bind_array_by_name())
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug40415.phpt b/ext/oci8/tests/bug40415.phpt
index 1de1f2b40a3..93ab6024118 100644
--- a/ext/oci8/tests/bug40415.phpt
+++ b/ext/oci8/tests/bug40415.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #40415 (Using oci_fetchall with nested cursors)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug41069.phpt b/ext/oci8/tests/bug41069.phpt
index 49d2905a4d6..d72192b12e6 100644
--- a/ext/oci8/tests/bug41069.phpt
+++ b/ext/oci8/tests/bug41069.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #41069 (Oracle crash with certain data over a DB-link when prefetch memory limit used - Oracle bug 6039623)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug42134.phpt b/ext/oci8/tests/bug42134.phpt
index 13273cff8f8..2e134d06d82 100644
--- a/ext/oci8/tests/bug42134.phpt
+++ b/ext/oci8/tests/bug42134.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42134 (Collection error for invalid collection name)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug42173.phpt b/ext/oci8/tests/bug42173.phpt
index 9c6b4996e20..83021346559 100644
--- a/ext/oci8/tests/bug42173.phpt
+++ b/ext/oci8/tests/bug42173.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42173 (TIMESTAMP and INTERVAL query and field functions)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug42496_1.phpt b/ext/oci8/tests/bug42496_1.phpt
index 9db7d720e9f..a83f4a0ee6c 100644
--- a/ext/oci8/tests/bug42496_1.phpt
+++ b/ext/oci8/tests/bug42496_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum open cursors reached)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug42496_2.phpt b/ext/oci8/tests/bug42496_2.phpt
index 52c42f8bcfd..4d9894885bf 100644
--- a/ext/oci8/tests/bug42496_2.phpt
+++ b/ext/oci8/tests/bug42496_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum open cursors reached)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug42841.phpt b/ext/oci8/tests/bug42841.phpt
index 3b4a6051a66..d60e5fe5a04 100644
--- a/ext/oci8/tests/bug42841.phpt
+++ b/ext/oci8/tests/bug42841.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42841 (REF CURSOR and oci_new_cursor PHP crash)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug43492.phpt b/ext/oci8/tests/bug43492.phpt
index 05fc43210b1..b0d8e77e2f5 100644
--- a/ext/oci8/tests/bug43492.phpt
+++ b/ext/oci8/tests/bug43492.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #43492 (Nested cursor leaks)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug43492_2.phpt b/ext/oci8/tests/bug43492_2.phpt
index 0ea4cdf8061..1ea30fcaaf0 100644
--- a/ext/oci8/tests/bug43492_2.phpt
+++ b/ext/oci8/tests/bug43492_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #43492 (Nested cursor leaks after related bug #44206 fixed)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug43497.phpt b/ext/oci8/tests/bug43497.phpt
index 45325f6b442..c6f5b04dc32 100644
--- a/ext/oci8/tests/bug43497.phpt
+++ b/ext/oci8/tests/bug43497.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug44008.phpt b/ext/oci8/tests/bug44008.phpt
index d3b9cafdd41..6f1a860b8c0 100644
--- a/ext/oci8/tests/bug44008.phpt
+++ b/ext/oci8/tests/bug44008.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44008 (Incorrect usage of OCILob->close crashes PHP)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug44113.phpt b/ext/oci8/tests/bug44113.phpt
index ca2a03e9145..916d67a87cd 100644
--- a/ext/oci8/tests/bug44113.phpt
+++ b/ext/oci8/tests/bug44113.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44113 (New collection creation can fail with OCI-22303)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug44206.phpt b/ext/oci8/tests/bug44206.phpt
index 2b051771e25..53aa2b19d85 100644
--- a/ext/oci8/tests/bug44206.phpt
+++ b/ext/oci8/tests/bug44206.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44206 (Test if selecting ref cursors leads to ORA-1000 maximum open cursors reached)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug46994.phpt b/ext/oci8/tests/bug46994.phpt
index ace65b8bd27..36bf20b2f7f 100644
--- a/ext/oci8/tests/bug46994.phpt
+++ b/ext/oci8/tests/bug46994.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #46994 (CLOB size does not update when using CLOB IN OUT param in stored procedure)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug47189.phpt b/ext/oci8/tests/bug47189.phpt
index 96aec547222..3a4ed05cbfe 100644
--- a/ext/oci8/tests/bug47189.phpt
+++ b/ext/oci8/tests/bug47189.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47189 (Multiple oci_fetch_all calls)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs: different error handling for this undefined behavior
diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt
index 377141e3cc9..260826b2ecb 100644
--- a/ext/oci8/tests/bug47281.phpt
+++ b/ext/oci8/tests/bug47281.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47281 ($php_errormsg is limited in size of characters)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug47281_tt.phpt b/ext/oci8/tests/bug47281_tt.phpt
index f0e6d0200d6..a1cfa01bd98 100644
--- a/ext/oci8/tests/bug47281_tt.phpt
+++ b/ext/oci8/tests/bug47281_tt.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47281 ($php_errormsg is limited in size of characters)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => false, 'timesten' => true);  // test runs on these DBs: shorter message length in TimesTen
diff --git a/ext/oci8/tests/bug51253.phpt b/ext/oci8/tests/bug51253.phpt
index 9b6da41019b..772cc7c2d64 100644
--- a/ext/oci8/tests/bug51253.phpt
+++ b/ext/oci8/tests/bug51253.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #51253 (oci_bind_array_by_name() array references)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug51291_2.phpt b/ext/oci8/tests/bug51291_2.phpt
index 56655283fa2..d951ee05b64 100644
--- a/ext/oci8/tests/bug51291_2.phpt
+++ b/ext/oci8/tests/bug51291_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #51291 (oci_error() doesn't report last error when called two times)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs: different error messages from TimesTen
diff --git a/ext/oci8/tests/bug70700.phpt b/ext/oci8/tests/bug70700.phpt
index b674a593dd9..cf017107324 100644
--- a/ext/oci8/tests/bug70700.phpt
+++ b/ext/oci8/tests/bug70700.phpt
@@ -6,6 +6,7 @@ Chuck Burgess
 ashnazg@php.net
 --EXTENSIONS--
 mbstring
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug71148.phpt b/ext/oci8/tests/bug71148.phpt
index 60fac0d3ae2..43fa3f8a0c6 100644
--- a/ext/oci8/tests/bug71148.phpt
+++ b/ext/oci8/tests/bug71148.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71448 (Binding reference overwritten on php7)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt
index 718d6534452..f5ab9812bae 100644
--- a/ext/oci8/tests/bug71600.phpt
+++ b/ext/oci8/tests/bug71600.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71600 (oci_fetch_all result in segfault when select more than 8 columns)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/bug72524.phpt b/ext/oci8/tests/bug72524.phpt
index 9159c75cac4..88ad613f6f5 100644
--- a/ext/oci8/tests/bug72524.phpt
+++ b/ext/oci8/tests/bug72524.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72524 (Binding null values triggers ORA-24816 error)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt
index da9d85f11f3..c05d7113cfc 100644
--- a/ext/oci8/tests/calltimeout1.phpt
+++ b/ext/oci8/tests/calltimeout1.phpt
@@ -2,6 +2,7 @@
 oci_set_call_timeout: test timing out 
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt
index f4863013d51..d17dbeaa8c1 100644
--- a/ext/oci8/tests/coll_001.phpt
+++ b/ext/oci8/tests/coll_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_new_collection()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt
index 2eabc209150..a7e7b7f1cd2 100644
--- a/ext/oci8/tests/coll_002.phpt
+++ b/ext/oci8/tests/coll_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_new_collection() + free()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt
index 0e931ddd4d7..24e4e3872a6 100644
--- a/ext/oci8/tests/coll_002_func.phpt
+++ b/ext/oci8/tests/coll_002_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_new_collection() + free()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_003.phpt b/ext/oci8/tests/coll_003.phpt
index 1608ee81fed..126a7771da8 100644
--- a/ext/oci8/tests/coll_003.phpt
+++ b/ext/oci8/tests/coll_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collection methods
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_003_func.phpt b/ext/oci8/tests/coll_003_func.phpt
index d6058dcfab2..4826ac08eed 100644
--- a/ext/oci8/tests/coll_003_func.phpt
+++ b/ext/oci8/tests/coll_003_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collection methods
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_004.phpt b/ext/oci8/tests/coll_004.phpt
index e4aec166a5a..f35a2cebecd 100644
--- a/ext/oci8/tests/coll_004.phpt
+++ b/ext/oci8/tests/coll_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_collection_assign()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_004_func.phpt b/ext/oci8/tests/coll_004_func.phpt
index 8aa4234773e..f97b56dc5c9 100644
--- a/ext/oci8/tests/coll_004_func.phpt
+++ b/ext/oci8/tests/coll_004_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_collection_assign()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt
index 6f00f6d9c56..3944688a976 100644
--- a/ext/oci8/tests/coll_009.phpt
+++ b/ext/oci8/tests/coll_009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and wrong dates
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_009_func.phpt b/ext/oci8/tests/coll_009_func.phpt
index 10e03c20956..a37f7236a31 100644
--- a/ext/oci8/tests/coll_009_func.phpt
+++ b/ext/oci8/tests/coll_009_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and wrong dates
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt
index 005dcd54604..0fc003ed57f 100644
--- a/ext/oci8/tests/coll_010.phpt
+++ b/ext/oci8/tests/coll_010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and nulls
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt
index 3950dc7cb46..d6b3cdc26c5 100644
--- a/ext/oci8/tests/coll_010_func.phpt
+++ b/ext/oci8/tests/coll_010_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and nulls
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt
index 6af52e9a3c7..5e3e2c10868 100644
--- a/ext/oci8/tests/coll_011.phpt
+++ b/ext/oci8/tests/coll_011.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and strings
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt
index ca9d733e885..5c3e94ee4b6 100644
--- a/ext/oci8/tests/coll_011_func.phpt
+++ b/ext/oci8/tests/coll_011_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and strings
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt
index 680e03049ff..7b030543036 100644
--- a/ext/oci8/tests/coll_012.phpt
+++ b/ext/oci8/tests/coll_012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and correct dates
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt
index aa047653dd7..68c46f5fe5c 100644
--- a/ext/oci8/tests/coll_012_func.phpt
+++ b/ext/oci8/tests/coll_012_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and correct dates
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt
index 10e5422b2a7..afc50fc8fa9 100644
--- a/ext/oci8/tests/coll_013.phpt
+++ b/ext/oci8/tests/coll_013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and correct dates (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt
index 7e4f253bfc2..c6264e8666b 100644
--- a/ext/oci8/tests/coll_013_func.phpt
+++ b/ext/oci8/tests/coll_013_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and correct dates (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt
index 158fd39f2ed..3dcb5978151 100644
--- a/ext/oci8/tests/coll_014.phpt
+++ b/ext/oci8/tests/coll_014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and strings (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt
index a3f1d9bde86..164a2f9ca1c 100644
--- a/ext/oci8/tests/coll_014_func.phpt
+++ b/ext/oci8/tests/coll_014_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and strings (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_015.phpt b/ext/oci8/tests/coll_015.phpt
index cc519f202f9..e7a103360ed 100644
--- a/ext/oci8/tests/coll_015.phpt
+++ b/ext/oci8/tests/coll_015.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and numbers (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_015_func.phpt b/ext/oci8/tests/coll_015_func.phpt
index 5db45ee3393..9d436f9233d 100644
--- a/ext/oci8/tests/coll_015_func.phpt
+++ b/ext/oci8/tests/coll_015_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and numbers (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt
index 342af18f101..9e3348f18bd 100644
--- a/ext/oci8/tests/coll_016.phpt
+++ b/ext/oci8/tests/coll_016.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and negative/too big element indexes
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt
index a9d9f0f8f41..7dcc3eebc29 100644
--- a/ext/oci8/tests/coll_016_func.phpt
+++ b/ext/oci8/tests/coll_016_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and negative/too big element indexes
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt
index 082713a7323..140f6ee7158 100644
--- a/ext/oci8/tests/coll_017.phpt
+++ b/ext/oci8/tests/coll_017.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and nulls (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt
index 8f4587d54cf..68097456ade 100644
--- a/ext/oci8/tests/coll_017_func.phpt
+++ b/ext/oci8/tests/coll_017_func.phpt
@@ -1,5 +1,7 @@
 --TEST--
 collections and nulls (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_018.phpt b/ext/oci8/tests/coll_018.phpt
index ff66ec80305..543240fa03a 100644
--- a/ext/oci8/tests/coll_018.phpt
+++ b/ext/oci8/tests/coll_018.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Collection trim tests
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt
index de6e1871020..2e4b122446b 100644
--- a/ext/oci8/tests/coll_019.phpt
+++ b/ext/oci8/tests/coll_019.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test collection Oracle error handling collections and numbers (2)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/commit_001.phpt b/ext/oci8/tests/commit_001.phpt
index d99a6b3cbf8..9de681812e0 100644
--- a/ext/oci8/tests/commit_001.phpt
+++ b/ext/oci8/tests/commit_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test OCI_NO_AUTO_COMMIT constant
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/commit_002.phpt b/ext/oci8/tests/commit_002.phpt
index 4696f3b5561..93b77a9ee91 100644
--- a/ext/oci8/tests/commit_002.phpt
+++ b/ext/oci8/tests/commit_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test oci_commit failure
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/conn_attr_1.phpt b/ext/oci8/tests/conn_attr_1.phpt
index 4b1b8a3779a..2b2e7b9d877 100644
--- a/ext/oci8/tests/conn_attr_1.phpt
+++ b/ext/oci8/tests/conn_attr_1.phpt
@@ -2,6 +2,7 @@
 Set and get of connection attributes with all types of connections.
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(__DIR__.'/skipif.inc');
diff --git a/ext/oci8/tests/conn_attr_2.phpt b/ext/oci8/tests/conn_attr_2.phpt
index 0005faa9a35..3ffc6b6e0e3 100644
--- a/ext/oci8/tests/conn_attr_2.phpt
+++ b/ext/oci8/tests/conn_attr_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Set and get of connection attributes across persistent connections and sysdba connection.
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/conn_attr_3.phpt b/ext/oci8/tests/conn_attr_3.phpt
index bcab76b80c2..629d9af2e05 100644
--- a/ext/oci8/tests/conn_attr_3.phpt
+++ b/ext/oci8/tests/conn_attr_3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Set and get of connection attributes with oci_close().
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index 9cf55f55f95..6e92e85a9e7 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Set and get of connection attributes with errors.
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/conn_attr_5.phpt b/ext/oci8/tests/conn_attr_5.phpt
index 006b49ab1e3..21ef279466d 100644
--- a/ext/oci8/tests/conn_attr_5.phpt
+++ b/ext/oci8/tests/conn_attr_5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Set and get connection attributes with scope end.
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt
index 17b4b0d91ac..92a9e8ce5fc 100644
--- a/ext/oci8/tests/cursor_bind.phpt
+++ b/ext/oci8/tests/cursor_bind.phpt
@@ -1,5 +1,7 @@
 --TEST--
 bind and fetch cursor from a statement
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/cursor_bind_err.phpt b/ext/oci8/tests/cursor_bind_err.phpt
index bf7fbc29312..7cd85216366 100644
--- a/ext/oci8/tests/cursor_bind_err.phpt
+++ b/ext/oci8/tests/cursor_bind_err.phpt
@@ -1,5 +1,7 @@
 --TEST--
 binding a cursor (with errors)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt
index a9fa0dcb41e..b6eeb3cf30f 100644
--- a/ext/oci8/tests/cursors.phpt
+++ b/ext/oci8/tests/cursors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 fetching cursor from a statement
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt
index 69d4648a313..70ec026ad8d 100644
--- a/ext/oci8/tests/db_op_1.phpt
+++ b/ext/oci8/tests/db_op_1.phpt
@@ -2,6 +2,7 @@
 oci_set_db_operation: basic test for end-to-end tracing
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
index 6d85bc1e031..46a0e39f39d 100644
--- a/ext/oci8/tests/db_op_2.phpt
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -2,6 +2,7 @@
 oci_set_db_operation: test DBOP for end-to-end tracing
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt
index 01ba9db0b52..5701828ef97 100644
--- a/ext/oci8/tests/dbmsoutput.phpt
+++ b/ext/oci8/tests/dbmsoutput.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PL/SQL: dbms_output
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/define2.phpt b/ext/oci8/tests/define2.phpt
index 9dbac4620bf..66c756c7a55 100644
--- a/ext/oci8/tests/define2.phpt
+++ b/ext/oci8/tests/define2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test oci_define_by_name types
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt
index 69fb5a48c11..97888d6b93a 100644
--- a/ext/oci8/tests/define3.phpt
+++ b/ext/oci8/tests/define3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test oci_define_by_name() LOB descriptor
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/define6.phpt b/ext/oci8/tests/define6.phpt
index a59ba30a600..7c373ada0b3 100644
--- a/ext/oci8/tests/define6.phpt
+++ b/ext/oci8/tests/define6.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_define_by_name tests with REF CURSORs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt
index 6b1e47d7a9f..c928d9a2706 100644
--- a/ext/oci8/tests/descriptors.phpt
+++ b/ext/oci8/tests/descriptors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 commit connection after destroying the descriptor
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/drcp_connect1.phpt b/ext/oci8/tests/drcp_connect1.phpt
index 53d1e25c31d..f44aa8cc891 100644
--- a/ext/oci8/tests/drcp_connect1.phpt
+++ b/ext/oci8/tests/drcp_connect1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DRCP: oci_connect()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs (Calling PL/SQL from SQL is not supported in TimesTen)
diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt
index f1f74ddce44..aba8bf9d80f 100644
--- a/ext/oci8/tests/error.phpt
+++ b/ext/oci8/tests/error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_error() error message for parsing error
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs: different error messages from TimesTen
diff --git a/ext/oci8/tests/error2.phpt b/ext/oci8/tests/error2.phpt
index 2e1c72fa690..8753def6143 100644
--- a/ext/oci8/tests/error2.phpt
+++ b/ext/oci8/tests/error2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Exercise error code for SUCCESS_WITH_INFO
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt
index 8df2e512e75..c62c417953a 100644
--- a/ext/oci8/tests/error3.phpt
+++ b/ext/oci8/tests/error3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Maximum Oracle error length
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/error_bind_2.phpt b/ext/oci8/tests/error_bind_2.phpt
index 91a7c49ff57..d476854a6e1 100644
--- a/ext/oci8/tests/error_bind_2.phpt
+++ b/ext/oci8/tests/error_bind_2.phpt
@@ -2,6 +2,7 @@
 Test some more oci_bind_by_name error conditions
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/error_bind_3.phpt b/ext/oci8/tests/error_bind_3.phpt
index 443a2027e40..b1b45ccb625 100644
--- a/ext/oci8/tests/error_bind_3.phpt
+++ b/ext/oci8/tests/error_bind_3.phpt
@@ -2,6 +2,7 @@
 Test some more oci_bind_by_name error conditions
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/fetch_all2.phpt b/ext/oci8/tests/fetch_all2.phpt
index c9f5175c58a..28131e75a22 100644
--- a/ext/oci8/tests/fetch_all2.phpt
+++ b/ext/oci8/tests/fetch_all2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_fetch_all() - 2
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt
index ff74ad76739..d83d49126d5 100644
--- a/ext/oci8/tests/fetch_array.phpt
+++ b/ext/oci8/tests/fetch_array.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_fetch_array()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt
index ca6d153abe5..ae4089219ca 100644
--- a/ext/oci8/tests/fetch_object.phpt
+++ b/ext/oci8/tests/fetch_object.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_fetch_object()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/fetch_object_1.phpt b/ext/oci8/tests/fetch_object_1.phpt
index fc83f375715..7d3bf81da67 100644
--- a/ext/oci8/tests/fetch_object_1.phpt
+++ b/ext/oci8/tests/fetch_object_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_fetch_object()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/fetch_object_2.phpt b/ext/oci8/tests/fetch_object_2.phpt
index fcf80fd8533..805fac251d5 100644
--- a/ext/oci8/tests/fetch_object_2.phpt
+++ b/ext/oci8/tests/fetch_object_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_fetch_object() with CLOB and NULL
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt
index 76ff3d4f9f2..d9398953f80 100644
--- a/ext/oci8/tests/field_funcs.phpt
+++ b/ext/oci8/tests/field_funcs.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_field_*() family
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_1.phpt b/ext/oci8/tests/imp_res_1.phpt
index 61d3c4324c4..052773a8a22 100644
--- a/ext/oci8/tests/imp_res_1.phpt
+++ b/ext/oci8/tests/imp_res_1.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: basic test
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt
index ebd1e8b126a..daa82f4e9ea 100644
--- a/ext/oci8/tests/imp_res_2.phpt
+++ b/ext/oci8/tests/imp_res_2.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: Zero Rows
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt
index 6d6b865fcca..cc8ed058c1a 100644
--- a/ext/oci8/tests/imp_res_3.phpt
+++ b/ext/oci8/tests/imp_res_3.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: bigger data size
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_4.phpt b/ext/oci8/tests/imp_res_4.phpt
index 36fbfc2410a..2716ee474a4 100644
--- a/ext/oci8/tests/imp_res_4.phpt
+++ b/ext/oci8/tests/imp_res_4.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_fetch
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_5.phpt b/ext/oci8/tests/imp_res_5.phpt
index 72bacf0e601..de82de5f234 100644
--- a/ext/oci8/tests/imp_res_5.phpt
+++ b/ext/oci8/tests/imp_res_5.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_fetch_all
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_6.phpt b/ext/oci8/tests/imp_res_6.phpt
index a2810bc5107..c075004bc3a 100644
--- a/ext/oci8/tests/imp_res_6.phpt
+++ b/ext/oci8/tests/imp_res_6.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: alternating oci_fetch_* calls
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt
index 5fc258be4ba..2f0872656ec 100644
--- a/ext/oci8/tests/imp_res_7.phpt
+++ b/ext/oci8/tests/imp_res_7.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: bigger data size
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_call_error.phpt b/ext/oci8/tests/imp_res_call_error.phpt
index ad756626703..70eced48c89 100644
--- a/ext/oci8/tests/imp_res_call_error.phpt
+++ b/ext/oci8/tests/imp_res_call_error.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: using SQL 'CALL'
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt
index 053e4eaa30d..579c54b55bc 100644
--- a/ext/oci8/tests/imp_res_cancel.phpt
+++ b/ext/oci8/tests/imp_res_cancel.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_cancel
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt
index 3594f85ec14..cb1f7ac8cf6 100644
--- a/ext/oci8/tests/imp_res_close.phpt
+++ b/ext/oci8/tests/imp_res_close.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_free_statement #1
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt
index 92ef9c660bd..1b401801885 100644
--- a/ext/oci8/tests/imp_res_cursor.phpt
+++ b/ext/oci8/tests/imp_res_cursor.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: nested cursor
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt
index 35445bda63e..357ef4d01c5 100644
--- a/ext/oci8/tests/imp_res_dbmsoutput.phpt
+++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: interleaved with DBMS_OUTPUT
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt
index 6df7828c274..60c10380373 100644
--- a/ext/oci8/tests/imp_res_field.phpt
+++ b/ext/oci8/tests/imp_res_field.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: field tests
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_func_error.phpt b/ext/oci8/tests/imp_res_func_error.phpt
index 58b8f71a9b4..3dcd7014664 100644
--- a/ext/oci8/tests/imp_res_func_error.phpt
+++ b/ext/oci8/tests/imp_res_func_error.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: test with a PL/SQL function
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt
index b8d39cc7c9f..b3b2dbee819 100644
--- a/ext/oci8/tests/imp_res_get_1.phpt
+++ b/ext/oci8/tests/imp_res_get_1.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt
index d2ef438a549..b3b226804e0 100644
--- a/ext/oci8/tests/imp_res_get_2.phpt
+++ b/ext/oci8/tests/imp_res_get_2.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: similar to imp_res_get_1 but with unrolled loop
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt
index c7b75a06d91..880dd690a9c 100644
--- a/ext/oci8/tests/imp_res_get_3.phpt
+++ b/ext/oci8/tests/imp_res_get_3.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test 3
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_4.phpt b/ext/oci8/tests/imp_res_get_4.phpt
index 823656ba809..e2079c15c77 100644
--- a/ext/oci8/tests/imp_res_get_4.phpt
+++ b/ext/oci8/tests/imp_res_get_4.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleaved fetches
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt
index 912dadfef60..a5dfeabdf55 100644
--- a/ext/oci8/tests/imp_res_get_5.phpt
+++ b/ext/oci8/tests/imp_res_get_5.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: get from wrong statement
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt
index 2f007630974..a39c5777371 100644
--- a/ext/oci8/tests/imp_res_get_all.phpt
+++ b/ext/oci8/tests/imp_res_get_all.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_fetch_all
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt
index 1cd66731a76..792652af971 100644
--- a/ext/oci8/tests/imp_res_get_cancel.phpt
+++ b/ext/oci8/tests/imp_res_get_cancel.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_cancel
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_close_1.phpt b/ext/oci8/tests/imp_res_get_close_1.phpt
index 3abb885cc60..9a6cba87777 100644
--- a/ext/oci8/tests/imp_res_get_close_1.phpt
+++ b/ext/oci8/tests/imp_res_get_close_1.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #1
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt
index 4f75ec3b9c3..dab376acab1 100644
--- a/ext/oci8/tests/imp_res_get_close_2.phpt
+++ b/ext/oci8/tests/imp_res_get_close_2.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #2
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt
index 722d28fbd00..8842ec35b83 100644
--- a/ext/oci8/tests/imp_res_get_close_3.phpt
+++ b/ext/oci8/tests/imp_res_get_close_3.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #3
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt
index 715ed531e03..a8b33f6838e 100644
--- a/ext/oci8/tests/imp_res_get_cursor.phpt
+++ b/ext/oci8/tests/imp_res_get_cursor.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: nested cursor
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
index 31c5cd7c642..2e0bf47a17f 100644
--- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
+++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleaved with DBMS_OUTPUT
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt
index c8961cbb4c6..4fe4beaf9df 100644
--- a/ext/oci8/tests/imp_res_get_exec.phpt
+++ b/ext/oci8/tests/imp_res_get_exec.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: Execute twice
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt
index 8d268b00f1e..b18c162aecf 100644
--- a/ext/oci8/tests/imp_res_get_none.phpt
+++ b/ext/oci8/tests/imp_res_get_none.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: no implicit results
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt
index 355a88520d5..8f6b3792431 100644
--- a/ext/oci8/tests/imp_res_insert.phpt
+++ b/ext/oci8/tests/imp_res_insert.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: Commit modes
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt
index 8633d78baf0..ede1fa8fb93 100644
--- a/ext/oci8/tests/imp_res_lob.phpt
+++ b/ext/oci8/tests/imp_res_lob.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: LOBs
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt
index 1be4d2f949b..0915ec96005 100644
--- a/ext/oci8/tests/imp_res_prefetch.phpt
+++ b/ext/oci8/tests/imp_res_prefetch.phpt
@@ -2,6 +2,7 @@
 Oracle Database 12c Implicit Result Sets: basic test
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt
index 2e2a549df8d..2135c579c71 100644
--- a/ext/oci8/tests/lob_001.phpt
+++ b/ext/oci8/tests/lob_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write() and friends
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index a4714caceaa..bf63ec246a6 100644
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write() and friends (with errors)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt
index 4ffdceecca4..5ebc124a293 100644
--- a/ext/oci8/tests/lob_003.phpt
+++ b/ext/oci8/tests/lob_003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_read() and friends
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt
index ead1bc0e2ac..b92512e4b47 100644
--- a/ext/oci8/tests/lob_004.phpt
+++ b/ext/oci8/tests/lob_004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_seek()/rewind()/append()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt
index 9e656bea7a2..6180da2b4df 100644
--- a/ext/oci8/tests/lob_005.phpt
+++ b/ext/oci8/tests/lob_005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_is_equal()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt
index 4576e428d6b..aaf6946bc59 100644
--- a/ext/oci8/tests/lob_006.phpt
+++ b/ext/oci8/tests/lob_006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write()/truncate()/erase()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt
index 3a3137ae037..be758ff34a3 100644
--- a/ext/oci8/tests/lob_007.phpt
+++ b/ext/oci8/tests/lob_007.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write()/size()/load()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt
index 15b300df86c..72858fccf1b 100644
--- a/ext/oci8/tests/lob_008.phpt
+++ b/ext/oci8/tests/lob_008.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write()/read()/eof()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt
index 5e0d2afaab4..84fb3b9ddbe 100644
--- a/ext/oci8/tests/lob_009.phpt
+++ b/ext/oci8/tests/lob_009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_import()/read()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_010.phpt b/ext/oci8/tests/lob_010.phpt
index 50924e5516b..b73819e680e 100644
--- a/ext/oci8/tests/lob_010.phpt
+++ b/ext/oci8/tests/lob_010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_save()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_011.phpt b/ext/oci8/tests/lob_011.phpt
index 6f008b303c2..d7eeb1afd63 100644
--- a/ext/oci8/tests/lob_011.phpt
+++ b/ext/oci8/tests/lob_011.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_copy()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_012.phpt b/ext/oci8/tests/lob_012.phpt
index 94e30106296..71f6e648614 100644
--- a/ext/oci8/tests/lob_012.phpt
+++ b/ext/oci8/tests/lob_012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_export()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_013.phpt b/ext/oci8/tests/lob_013.phpt
index bd703465b52..b15bcd09d04 100644
--- a/ext/oci8/tests/lob_013.phpt
+++ b/ext/oci8/tests/lob_013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 lob buffering
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_014.phpt b/ext/oci8/tests/lob_014.phpt
index f39c7e1ad1f..75da710a6e5 100644
--- a/ext/oci8/tests/lob_014.phpt
+++ b/ext/oci8/tests/lob_014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_free()/close()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt
index 24000f36f90..9b95b748748 100644
--- a/ext/oci8/tests/lob_016.phpt
+++ b/ext/oci8/tests/lob_016.phpt
@@ -1,5 +1,7 @@
 --TEST--
 returning multiple lobs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt
index 15c336c9d77..d23f406eba9 100644
--- a/ext/oci8/tests/lob_017.phpt
+++ b/ext/oci8/tests/lob_017.phpt
@@ -1,5 +1,7 @@
 --TEST--
 returning multiple lobs (using persistent connection)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt
index 2feab1a3f38..a6833dd2591 100644
--- a/ext/oci8/tests/lob_018.phpt
+++ b/ext/oci8/tests/lob_018.phpt
@@ -1,5 +1,7 @@
 --TEST--
 fetching the same lob several times
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_019.phpt b/ext/oci8/tests/lob_019.phpt
index 6bdbeb926c1..1ae83446299 100644
--- a/ext/oci8/tests/lob_019.phpt
+++ b/ext/oci8/tests/lob_019.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write()/erase()/read() with BLOBs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt
index 2057b99723f..b16e8a754a2 100644
--- a/ext/oci8/tests/lob_020.phpt
+++ b/ext/oci8/tests/lob_020.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write()/erase()/read() with CLOBs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt
index 0833715569a..8039cc678e0 100644
--- a/ext/oci8/tests/lob_021.phpt
+++ b/ext/oci8/tests/lob_021.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_free()/close()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt
index 3f571228184..d8394a71a65 100644
--- a/ext/oci8/tests/lob_022.phpt
+++ b/ext/oci8/tests/lob_022.phpt
@@ -1,5 +1,7 @@
 --TEST--
 fetching the same lob several times
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_023.phpt b/ext/oci8/tests/lob_023.phpt
index 1c45e8d8d80..b6ab381eea4 100644
--- a/ext/oci8/tests/lob_023.phpt
+++ b/ext/oci8/tests/lob_023.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_import()/read()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_024.phpt b/ext/oci8/tests/lob_024.phpt
index b4c44d6b721..5c286e85044 100644
--- a/ext/oci8/tests/lob_024.phpt
+++ b/ext/oci8/tests/lob_024.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_load()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_025.phpt b/ext/oci8/tests/lob_025.phpt
index 897e3c73742..8ea5aa1ace8 100644
--- a/ext/oci8/tests/lob_025.phpt
+++ b/ext/oci8/tests/lob_025.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_read() tests
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index ee52a9c816f..ddd114ef3e2 100644
--- a/ext/oci8/tests/lob_026.phpt
+++ b/ext/oci8/tests/lob_026.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_seek()/rewind()/append()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_027.phpt b/ext/oci8/tests/lob_027.phpt
index 8f5992a555a..4ce6adbabb6 100644
--- a/ext/oci8/tests/lob_027.phpt
+++ b/ext/oci8/tests/lob_027.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_truncate()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_028.phpt b/ext/oci8/tests/lob_028.phpt
index 9d05f8c7123..267855c0e79 100644
--- a/ext/oci8/tests/lob_028.phpt
+++ b/ext/oci8/tests/lob_028.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test descriptor types for oci_new_descriptor()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_029.phpt b/ext/oci8/tests/lob_029.phpt
index 3f25dda71a1..fceab492604 100644
--- a/ext/oci8/tests/lob_029.phpt
+++ b/ext/oci8/tests/lob_029.phpt
@@ -1,5 +1,7 @@
 --TEST--
 reading/writing BFILE LOBs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_030.phpt b/ext/oci8/tests/lob_030.phpt
index 39fb1304d0c..c5719fdc87c 100644
--- a/ext/oci8/tests/lob_030.phpt
+++ b/ext/oci8/tests/lob_030.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test piecewise fetch of CLOBs equal to, and larger than PHP_OCI_LOB_BUFFER_SIZE
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_031.phpt b/ext/oci8/tests/lob_031.phpt
index 52119856d61..f05230ff78a 100644
--- a/ext/oci8/tests/lob_031.phpt
+++ b/ext/oci8/tests/lob_031.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test LOB->read(), LOB->seek() and LOB->tell() with nul bytes in data
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_032.phpt b/ext/oci8/tests/lob_032.phpt
index 6b66ae9cbe6..edf78b06b8e 100644
--- a/ext/oci8/tests/lob_032.phpt
+++ b/ext/oci8/tests/lob_032.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_write() and friends
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_033.phpt b/ext/oci8/tests/lob_033.phpt
index 35f0f1275eb..256b4985158 100644
--- a/ext/oci8/tests/lob_033.phpt
+++ b/ext/oci8/tests/lob_033.phpt
@@ -1,5 +1,7 @@
 --TEST--
 various oci_lob_write() error messages
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_034.phpt b/ext/oci8/tests/lob_034.phpt
index b19b38dac71..ffbc0a31161 100644
--- a/ext/oci8/tests/lob_034.phpt
+++ b/ext/oci8/tests/lob_034.phpt
@@ -1,5 +1,7 @@
 --TEST--
 lob buffering - 2
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_035.phpt b/ext/oci8/tests/lob_035.phpt
index 53146e12865..b9a0c2a1021 100644
--- a/ext/oci8/tests/lob_035.phpt
+++ b/ext/oci8/tests/lob_035.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_copy() - 2
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_036.phpt b/ext/oci8/tests/lob_036.phpt
index b440a4ea132..e2ad1d631f7 100644
--- a/ext/oci8/tests/lob_036.phpt
+++ b/ext/oci8/tests/lob_036.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Exercise cleanup code when LOB buffering is on
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_037.phpt b/ext/oci8/tests/lob_037.phpt
index a26357615b3..5689ac1b6f9 100644
--- a/ext/oci8/tests/lob_037.phpt
+++ b/ext/oci8/tests/lob_037.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Fetching two different lobs and using them after fetch
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_038.phpt b/ext/oci8/tests/lob_038.phpt
index 1ea912df927..0227ceba0e4 100644
--- a/ext/oci8/tests/lob_038.phpt
+++ b/ext/oci8/tests/lob_038.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Array fetch CLOB and BLOB
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_039.phpt b/ext/oci8/tests/lob_039.phpt
index bde7c4b2c39..6033261c8ae 100644
--- a/ext/oci8/tests/lob_039.phpt
+++ b/ext/oci8/tests/lob_039.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test CLOB->write() for multiple inserts
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_040.phpt b/ext/oci8/tests/lob_040.phpt
index 3711c4b54d9..3a5eef7e7f8 100644
--- a/ext/oci8/tests/lob_040.phpt
+++ b/ext/oci8/tests/lob_040.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37706 (Test LOB locator reuse. Extends simple test of lob_037.phpt)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt
index cc15989a2e0..6f0c4268b55 100644
--- a/ext/oci8/tests/lob_041.phpt
+++ b/ext/oci8/tests/lob_041.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check LOBS are valid after statement free
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_042.phpt b/ext/oci8/tests/lob_042.phpt
index f9e072e0fe6..30f78f0042f 100644
--- a/ext/oci8/tests/lob_042.phpt
+++ b/ext/oci8/tests/lob_042.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check various LOB error messages
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt
index c0f8973dfd1..e85e56768f4 100644
--- a/ext/oci8/tests/lob_043.phpt
+++ b/ext/oci8/tests/lob_043.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #49560 (LOB resource destructor and refcount test)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt
index 242eef195da..76137fb8864 100644
--- a/ext/oci8/tests/lob_044.phpt
+++ b/ext/oci8/tests/lob_044.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_lob_truncate() with default parameter value
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_aliases.phpt b/ext/oci8/tests/lob_aliases.phpt
index 7ffec56e356..f4b08cfedf5 100644
--- a/ext/oci8/tests/lob_aliases.phpt
+++ b/ext/oci8/tests/lob_aliases.phpt
@@ -1,5 +1,7 @@
 --TEST--
 LOB method aliases
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt
index df9c83fd479..054403dcf71 100644
--- a/ext/oci8/tests/lob_null.phpt
+++ b/ext/oci8/tests/lob_null.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test null data for CLOBs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt
index dd74499d68c..5fc90257e9b 100644
--- a/ext/oci8/tests/lob_temp.phpt
+++ b/ext/oci8/tests/lob_temp.phpt
@@ -1,5 +1,7 @@
 --TEST--
 temporary lobs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_temp1.phpt b/ext/oci8/tests/lob_temp1.phpt
index 76423c38026..a1c4d8bad4a 100644
--- a/ext/oci8/tests/lob_temp1.phpt
+++ b/ext/oci8/tests/lob_temp1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 closing temporary lobs
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/lob_temp2.phpt b/ext/oci8/tests/lob_temp2.phpt
index be2fcd74978..aaa5c28c091 100644
--- a/ext/oci8/tests/lob_temp2.phpt
+++ b/ext/oci8/tests/lob_temp2.phpt
@@ -2,6 +2,7 @@
 Writing temporary lob before binding
 --EXTENSIONS--
 oci8
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/null_byte_2.phpt b/ext/oci8/tests/null_byte_2.phpt
index 132fda5e1d4..2a5cf9047c2 100644
--- a/ext/oci8/tests/null_byte_2.phpt
+++ b/ext/oci8/tests/null_byte_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Null bytes in SQL statements
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/oci_execute_segfault.phpt b/ext/oci8/tests/oci_execute_segfault.phpt
index 957318e7583..511ca178719 100644
--- a/ext/oci8/tests/oci_execute_segfault.phpt
+++ b/ext/oci8/tests/oci_execute_segfault.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_execute() segfault after repeated bind of LOB descriptor
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt
index cdc79b1057b..a9746ada7cb 100644
--- a/ext/oci8/tests/password_new.phpt
+++ b/ext/oci8/tests/password_new.phpt
@@ -1,5 +1,7 @@
 --TEST--
 oci_password_change()
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt
index d4b0707abc2..3c82247c1f5 100644
--- a/ext/oci8/tests/pecl_bug10194.phpt
+++ b/ext/oci8/tests/pecl_bug10194.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/pecl_bug10194_blob.phpt b/ext/oci8/tests/pecl_bug10194_blob.phpt
index 860bd5688fb..7375d7b9c64 100644
--- a/ext/oci8/tests/pecl_bug10194_blob.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
index bfb60f310ac..051feb157f4 100644
--- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt
+++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on thes
diff --git a/ext/oci8/tests/pecl_bug16842.phpt b/ext/oci8/tests/pecl_bug16842.phpt
index 302b81d68cc..b2c10ae710a 100644
--- a/ext/oci8/tests/pecl_bug16842.phpt
+++ b/ext/oci8/tests/pecl_bug16842.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PECL Bug #16842 (NO_DATA_FOUND exception is a warning)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/pecl_bug8816.phpt b/ext/oci8/tests/pecl_bug8816.phpt
index dda6b9f8b10..1b554a20159 100644
--- a/ext/oci8/tests/pecl_bug8816.phpt
+++ b/ext/oci8/tests/pecl_bug8816.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PECL Bug #8816 (issue in php_oci_statement_fetch with more than one piecewise column)
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/skipif.inc b/ext/oci8/tests/skipif.inc
index 0ae2876e221..c1a3d175121 100644
--- a/ext/oci8/tests/skipif.inc
+++ b/ext/oci8/tests/skipif.inc
@@ -1,7 +1,5 @@
 <?php
 
-if (!extension_loaded('oci8')) die("skip oci8 extension is not available\n");
-
 // Check the test file is valid for this DB type
 require(dirname(__FILE__).'/connect.inc');
 $v = oci_server_version($c);
diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt
index 78d1b57c89a..973eac689d3 100644
--- a/ext/oci8/tests/statement_cache.phpt
+++ b/ext/oci8/tests/statement_cache.phpt
@@ -1,5 +1,7 @@
 --TEST--
 statement cache
+--EXTENSIONS--
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => true);  // test runs on these DBs
diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt
index cd0a31f428e..c6cd33c368a 100644
--- a/ext/oci8/tests/xmltype_01.phpt
+++ b/ext/oci8/tests/xmltype_01.phpt
@@ -2,6 +2,7 @@
 Basic XMLType test
 --EXTENSIONS--
 simplexml
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt
index ed574bdff8e..7e7be351f07 100644
--- a/ext/oci8/tests/xmltype_02.phpt
+++ b/ext/oci8/tests/xmltype_02.phpt
@@ -2,6 +2,7 @@
 Basic XMLType test #2
 --EXTENSIONS--
 simplexml
+oci8
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
diff --git a/ext/odbc/tests/bug44618.phpt b/ext/odbc/tests/bug44618.phpt
index 668cee7afad..ed838a21fe6 100644
--- a/ext/odbc/tests/bug44618.phpt
+++ b/ext/odbc/tests/bug44618.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #44618 (Fetching may rely on uninitialized data)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug46050.phpt b/ext/odbc/tests/bug46050.phpt
index 33564f2170e..91d48f002a2 100644
--- a/ext/odbc/tests/bug46050.phpt
+++ b/ext/odbc/tests/bug46050.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #46050 (odbc_next_result corrupts prepared resource)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug47803.phpt b/ext/odbc/tests/bug47803.phpt
index f13da017ba6..8da24107f20 100644
--- a/ext/odbc/tests/bug47803.phpt
+++ b/ext/odbc/tests/bug47803.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47803 Executing prepared statements is successful only for the first two statements
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt
index d453efb010b..468d3d5234a 100644
--- a/ext/odbc/tests/bug60616.phpt
+++ b/ext/odbc/tests/bug60616.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_exec(): Getting accurate unicode data from query
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 <?php
diff --git a/ext/odbc/tests/bug68087.phpt b/ext/odbc/tests/bug68087.phpt
index 64b232d9bcf..6d4d4cc0b2b 100644
--- a/ext/odbc/tests/bug68087.phpt
+++ b/ext/odbc/tests/bug68087.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_exec(): Getting accurate date data from query
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug69354.phpt b/ext/odbc/tests/bug69354.phpt
index cf4e9114ada..3aab7aa4e93 100644
--- a/ext/odbc/tests/bug69354.phpt
+++ b/ext/odbc/tests/bug69354.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69354 Incorrect use of SQLColAttributes with ODBC 3.0
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug69975.phpt b/ext/odbc/tests/bug69975.phpt
index eca75645198..3617ee71980 100644
--- a/ext/odbc/tests/bug69975.phpt
+++ b/ext/odbc/tests/bug69975.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69975 (PHP segfaults when accessing nvarchar(max) defined columns)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug71171.phpt b/ext/odbc/tests/bug71171.phpt
index f7a856d14c1..d2cef550e3b 100644
--- a/ext/odbc/tests/bug71171.phpt
+++ b/ext/odbc/tests/bug71171.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71171 odbc_fetch_array generates SIGFAULT, variant 0
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug73448.phpt b/ext/odbc/tests/bug73448.phpt
index ea6c585c0fe..eae5aa8ec0e 100644
--- a/ext/odbc/tests/bug73448.phpt
+++ b/ext/odbc/tests/bug73448.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73448 odbc_errormsg returns trash, always 513 bytes
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug73725.phpt b/ext/odbc/tests/bug73725.phpt
index c48a9112e71..2f4afb9e5ad 100644
--- a/ext/odbc/tests/bug73725.phpt
+++ b/ext/odbc/tests/bug73725.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73725 Unable to retrieve value of varchar(max) type
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug78470.phpt b/ext/odbc/tests/bug78470.phpt
index d905b956679..ea601a1fdfc 100644
--- a/ext/odbc/tests/bug78470.phpt
+++ b/ext/odbc/tests/bug78470.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78470 (odbc_specialcolumns() no longer accepts $nullable)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug80147.phpt b/ext/odbc/tests/bug80147.phpt
index 26e27c534eb..d0a21ac6531 100644
--- a/ext/odbc/tests/bug80147.phpt
+++ b/ext/odbc/tests/bug80147.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80147 (BINARY strings may not be properly zero-terminated)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug80152.phpt b/ext/odbc/tests/bug80152.phpt
index 719ec3a5168..e141a9ef236 100644
--- a/ext/odbc/tests/bug80152.phpt
+++ b/ext/odbc/tests/bug80152.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80152 (odbc_execute() moves internal pointer of $params)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/bug80592.phpt b/ext/odbc/tests/bug80592.phpt
index a0e096b0da8..076057502de 100644
--- a/ext/odbc/tests/bug80592.phpt
+++ b/ext/odbc/tests/bug80592.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80592 (all floats are the same in ODBC parameters)
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/odbc_columnprivileges_001.phpt b/ext/odbc/tests/odbc_columnprivileges_001.phpt
index 353ae1e81a2..5aba2589555 100644
--- a/ext/odbc/tests/odbc_columnprivileges_001.phpt
+++ b/ext/odbc/tests/odbc_columnprivileges_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_columnprivileges(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/odbc_columns_001.phpt b/ext/odbc/tests/odbc_columns_001.phpt
index 374a9bf6ea8..489d2ccd84e 100644
--- a/ext/odbc/tests/odbc_columns_001.phpt
+++ b/ext/odbc/tests/odbc_columns_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_columns(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
index a641d07b741..b546de2cd9d 100644
--- a/ext/odbc/tests/odbc_data_source_001.phpt
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_data_source(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php
     include 'skipif.inc';
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index 95a2f56f80f..649d940060c 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_exec(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 <?php
diff --git a/ext/odbc/tests/odbc_exec_002.phpt b/ext/odbc/tests/odbc_exec_002.phpt
index 309497e6c6b..590d58d8a82 100644
--- a/ext/odbc/tests/odbc_exec_002.phpt
+++ b/ext/odbc/tests/odbc_exec_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_exec(): Getting data from query
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/odbc_free_result_001.phpt b/ext/odbc/tests/odbc_free_result_001.phpt
index 09b3e435fbb..8f906a5090d 100644
--- a/ext/odbc/tests/odbc_free_result_001.phpt
+++ b/ext/odbc/tests/odbc_free_result_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_free_result(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/odbc_tables_001.phpt b/ext/odbc/tests/odbc_tables_001.phpt
index 420c41cda88..7d4d816c7de 100644
--- a/ext/odbc/tests/odbc_tables_001.phpt
+++ b/ext/odbc/tests/odbc_tables_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 odbc_tables(): Basic test
+--EXTENSIONS--
+odbc
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/odbc/tests/skipif.inc b/ext/odbc/tests/skipif.inc
index a2c9a4aade6..9785f5843a7 100644
--- a/ext/odbc/tests/skipif.inc
+++ b/ext/odbc/tests/skipif.inc
@@ -1,7 +1,5 @@
 <?php
 
-if (!extension_loaded('odbc')) die('skip odbc extension not loaded');
-
 include 'config.inc';
 
 $conn = @odbc_connect($dsn, $user, $pass);
diff --git a/ext/pdo_firebird/tests/bug_47415.phpt b/ext/pdo_firebird/tests/bug_47415.phpt
index 4f928b803a9..f9698b7110e 100644
--- a/ext/pdo_firebird/tests/bug_47415.phpt
+++ b/ext/pdo_firebird/tests/bug_47415.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47415 PDO_Firebird segfaults when passing lowercased column name to bindColumn()
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_48877.phpt b/ext/pdo_firebird/tests/bug_48877.phpt
index 8a62bed1696..c7845fbe1bf 100644
--- a/ext/pdo_firebird/tests/bug_48877.phpt
+++ b/ext/pdo_firebird/tests/bug_48877.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: bug 48877 The "bindValue" and "bindParam" do not work for PDO Firebird if we use named parameters (:parameter).
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_53280.phpt b/ext/pdo_firebird/tests/bug_53280.phpt
index 61182b07da9..21366a09927 100644
--- a/ext/pdo_firebird/tests/bug_53280.phpt
+++ b/ext/pdo_firebird/tests/bug_53280.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: bug 53280 segfaults if query column count is less than param count
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
index 5eaf5c0093a..0aaf3701dff 100644
--- a/ext/pdo_firebird/tests/bug_62024.phpt
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #62024 Cannot insert second row with null using parametrized query (Firebird PDO)
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
index ec4061f35a8..2095ddcbdb7 100644
--- a/ext/pdo_firebird/tests/bug_64037.phpt
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #64037 Firebird return wrong value for numeric field
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_72583.phpt b/ext/pdo_firebird/tests/bug_72583.phpt
index ba93ae3cf74..136c387edb4 100644
--- a/ext/pdo_firebird/tests/bug_72583.phpt
+++ b/ext/pdo_firebird/tests/bug_72583.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: Feature 72583 Fetch integers as php integers not as strings
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_72931.phpt b/ext/pdo_firebird/tests/bug_72931.phpt
index 2800c371688..edd899bf3a6 100644
--- a/ext/pdo_firebird/tests/bug_72931.phpt
+++ b/ext/pdo_firebird/tests/bug_72931.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: Bug 72931 Insert returning fails on Firebird 3
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_73087.phpt b/ext/pdo_firebird/tests/bug_73087.phpt
index 8ca3f064991..26bb4ea0986 100644
--- a/ext/pdo_firebird/tests/bug_73087.phpt
+++ b/ext/pdo_firebird/tests/bug_73087.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: bug 73087 segfault binding blob parameter
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_74462.phpt b/ext/pdo_firebird/tests/bug_74462.phpt
index 4680f485638..75009338309 100644
--- a/ext/pdo_firebird/tests/bug_74462.phpt
+++ b/ext/pdo_firebird/tests/bug_74462.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: Bug #74462 Returns only NULLs for boolean fields
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt
index 1a5b9bae18e..72983edd073 100644
--- a/ext/pdo_firebird/tests/bug_76488.phpt
+++ b/ext/pdo_firebird/tests/bug_76488.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: Bug #76488 Memory leak when fetching a BLOB field
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_77863.phpt b/ext/pdo_firebird/tests/bug_77863.phpt
index 141c926944a..35c577c2ee8 100644
--- a/ext/pdo_firebird/tests/bug_77863.phpt
+++ b/ext/pdo_firebird/tests/bug_77863.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: Bug #76488 PDO Firebird does not support boolean datatype in input parameters
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_80521.phpt b/ext/pdo_firebird/tests/bug_80521.phpt
index ca756cbfd87..e2c00c6a811 100644
--- a/ext/pdo_firebird/tests/bug_80521.phpt
+++ b/ext/pdo_firebird/tests/bug_80521.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80521 (Parameters with underscores no longer recognized)
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/bug_aaa.phpt b/ext/pdo_firebird/tests/bug_aaa.phpt
index 4c74a956ce5..b25c5f98897 100644
--- a/ext/pdo_firebird/tests/bug_aaa.phpt
+++ b/ext/pdo_firebird/tests/bug_aaa.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: cursor should not be marked as opened on singleton statements
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt
index 2331e46e260..0afaf8958f2 100644
--- a/ext/pdo_firebird/tests/connect.phpt
+++ b/ext/pdo_firebird/tests/connect.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: connect/disconnect
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index 0f641ef4060..f95b6e4041b 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: DDL/transactions
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/dialect_1.phpt b/ext/pdo_firebird/tests/dialect_1.phpt
index 43cb6c2e703..dec35c57068 100644
--- a/ext/pdo_firebird/tests/dialect_1.phpt
+++ b/ext/pdo_firebird/tests/dialect_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: support 1 sql dialect
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc');
 if (strpos(getenv('PDO_FIREBIRD_TEST_DSN'), 'dialect=1')===false) {
diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt
index f49636f8456..4cc6421be0f 100644
--- a/ext/pdo_firebird/tests/execute.phpt
+++ b/ext/pdo_firebird/tests/execute.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: prepare/execute/binding
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/execute_block.phpt b/ext/pdo_firebird/tests/execute_block.phpt
index 44f8d729276..f844b59e392 100644
--- a/ext/pdo_firebird/tests/execute_block.phpt
+++ b/ext/pdo_firebird/tests/execute_block.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: support EXECUTE BLOCK
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); 	
 ?>
diff --git a/ext/pdo_firebird/tests/ignore_parammarks.phpt b/ext/pdo_firebird/tests/ignore_parammarks.phpt
index 3796a971913..4c7ae970bbf 100644
--- a/ext/pdo_firebird/tests/ignore_parammarks.phpt
+++ b/ext/pdo_firebird/tests/ignore_parammarks.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: ingnore parameter marks in comments
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); 	
 ?>
diff --git a/ext/pdo_firebird/tests/rowCount.phpt b/ext/pdo_firebird/tests/rowCount.phpt
index 5eb0f14b176..d955493d828 100644
--- a/ext/pdo_firebird/tests/rowCount.phpt
+++ b/ext/pdo_firebird/tests/rowCount.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PDO_Firebird: rowCount
+--EXTENSIONS--
+pdo_firebird
 --SKIPIF--
 <?php require('skipif.inc'); ?>
 --ENV--
diff --git a/ext/pdo_firebird/tests/skipif.inc b/ext/pdo_firebird/tests/skipif.inc
index 1e4611ac630..46c038c37b4 100644
--- a/ext/pdo_firebird/tests/skipif.inc
+++ b/ext/pdo_firebird/tests/skipif.inc
@@ -1,12 +1,4 @@
 <?php
-
-if(!extension_loaded('pdo_firebird'))
-{
-        die('skip: pdo_firebird not available');
+if (!getenv('PDO_FIREBIRD_TEST_DSN')) {
+    die('skip: PDO_FIREBIRD_TEST_DSN must be set');
 }
-elseif(!getenv('PDO_FIREBIRD_TEST_DSN'))
-{
-        die('skip: PDO_FIREBIRD_TEST_DSN must be set');
-}
-
-?>
\ No newline at end of file
diff --git a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
index b55110d511a..2e0d9a8fd5a 100644
--- a/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
+++ b/ext/pdo_mysql/tests/PDO_getAvaliableDrivers.phpt
@@ -1,8 +1,8 @@
 --TEST--
 public static array PDO::getAvailableDrivers ( void );
 array pdo_drivers ( void );
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+pdo_mysql
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
diff --git a/ext/pdo_mysql/tests/bug41125.phpt b/ext/pdo_mysql/tests/bug41125.phpt
index cc5edba6fa8..fd854b5e9c5 100644
--- a/ext/pdo_mysql/tests/bug41125.phpt
+++ b/ext/pdo_mysql/tests/bug41125.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #41125 (PDO mysql + quote() + prepare() can result in seg fault)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt
index ad31d21ff82..1b99d479379 100644
--- a/ext/pdo_mysql/tests/bug44327.phpt
+++ b/ext/pdo_mysql/tests/bug44327.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/bug46292.phpt b/ext/pdo_mysql/tests/bug46292.phpt
index 84f1ce0deae..156be1faf2d 100644
--- a/ext/pdo_mysql/tests/bug46292.phpt
+++ b/ext/pdo_mysql/tests/bug46292.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #46292 (PDO::setFetchMode() shouldn't requires the 2nd arg when using FETCH_CLASSTYPE)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug53551.phpt b/ext/pdo_mysql/tests/bug53551.phpt
index cb7e0fa2b61..ab394e557a7 100644
--- a/ext/pdo_mysql/tests/bug53551.phpt
+++ b/ext/pdo_mysql/tests/bug53551.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/bug54929.phpt b/ext/pdo_mysql/tests/bug54929.phpt
index c9f68af862a..27e228b25af 100644
--- a/ext/pdo_mysql/tests/bug54929.phpt
+++ b/ext/pdo_mysql/tests/bug54929.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #54929 (Parse error with single quote in sql comment (pdo-mysql))
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/bug63176.phpt b/ext/pdo_mysql/tests/bug63176.phpt
index 0db43366249..3e0e5e02eee 100644
--- a/ext/pdo_mysql/tests/bug63176.phpt
+++ b/ext/pdo_mysql/tests/bug63176.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug63185.phpt b/ext/pdo_mysql/tests/bug63185.phpt
index c40b7e68343..bb388eedce6 100644
--- a/ext/pdo_mysql/tests/bug63185.phpt
+++ b/ext/pdo_mysql/tests/bug63185.phpt
@@ -3,9 +3,9 @@ Bug #63185: nextRowset() ignores MySQL errors with native prepared statements
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug66141.phpt b/ext/pdo_mysql/tests/bug66141.phpt
index 6d16a14a1c7..4accc673dcd 100644
--- a/ext/pdo_mysql/tests/bug66141.phpt
+++ b/ext/pdo_mysql/tests/bug66141.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug66528.phpt b/ext/pdo_mysql/tests/bug66528.phpt
index 3fb86e06d10..1563a9d6cbf 100644
--- a/ext/pdo_mysql/tests/bug66528.phpt
+++ b/ext/pdo_mysql/tests/bug66528.phpt
@@ -3,9 +3,9 @@ Bug #66528: No PDOException or errorCode if database becomes unavailable before
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug66878.phpt b/ext/pdo_mysql/tests/bug66878.phpt
index f7501762ba2..44c640ba0c2 100644
--- a/ext/pdo_mysql/tests/bug66878.phpt
+++ b/ext/pdo_mysql/tests/bug66878.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #66878: Multiple rowsets not returned unless PDO statement object is unset()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug67004.phpt b/ext/pdo_mysql/tests/bug67004.phpt
index 98b0a08d0c4..2911b24ab62 100644
--- a/ext/pdo_mysql/tests/bug67004.phpt
+++ b/ext/pdo_mysql/tests/bug67004.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #67004: Executing PDOStatement::fetch() more than once prevents releasing resultset
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug68371.phpt b/ext/pdo_mysql/tests/bug68371.phpt
index 17eee8c2f41..bc96ce8eda8 100644
--- a/ext/pdo_mysql/tests/bug68371.phpt
+++ b/ext/pdo_mysql/tests/bug68371.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL Bug #38671 (PDO#getAttribute() cannot be called with platform-specific attribute names)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug70066.phpt b/ext/pdo_mysql/tests/bug70066.phpt
index ef3c611cd7d..f9ef239b133 100644
--- a/ext/pdo_mysql/tests/bug70066.phpt
+++ b/ext/pdo_mysql/tests/bug70066.phpt
@@ -3,9 +3,9 @@ Bug #70066: Unexpected "Cannot execute queries while other unbuffered queries"
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug70272.phpt b/ext/pdo_mysql/tests/bug70272.phpt
index eba12038682..b3f4a485bc8 100644
--- a/ext/pdo_mysql/tests/bug70272.phpt
+++ b/ext/pdo_mysql/tests/bug70272.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #70272 (Segfault in pdo_mysql)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug70389.phpt b/ext/pdo_mysql/tests/bug70389.phpt
index adfd65f5ab1..1a50f2b8d8c 100644
--- a/ext/pdo_mysql/tests/bug70389.phpt
+++ b/ext/pdo_mysql/tests/bug70389.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #70389 (PDO constructor changes unrelated variables)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug70862.phpt b/ext/pdo_mysql/tests/bug70862.phpt
index fee79cbebb9..e91319b2b9f 100644
--- a/ext/pdo_mysql/tests/bug70862.phpt
+++ b/ext/pdo_mysql/tests/bug70862.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL Prepared Statements and BLOBs
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug71145.phpt b/ext/pdo_mysql/tests/bug71145.phpt
index 2f2834cbca2..97883072ea3 100644
--- a/ext/pdo_mysql/tests/bug71145.phpt
+++ b/ext/pdo_mysql/tests/bug71145.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #71145: Multiple statements in init command triggers unbuffered query error
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug71569.phpt b/ext/pdo_mysql/tests/bug71569.phpt
index 15dfd82cd1f..aade487ed03 100644
--- a/ext/pdo_mysql/tests/bug71569.phpt
+++ b/ext/pdo_mysql/tests/bug71569.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #71569 (#70389 fix causes segmentation fault)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug75177.phpt b/ext/pdo_mysql/tests/bug75177.phpt
index 104734f3aca..42f20b66598 100644
--- a/ext/pdo_mysql/tests/bug75177.phpt
+++ b/ext/pdo_mysql/tests/bug75177.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL Bug #75177 Type 'bit' is fetched as unexpected string
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!MySQLPDOTest::isPDOMySQLnd()) die('skip only for mysqlnd');
diff --git a/ext/pdo_mysql/tests/bug76815.phpt b/ext/pdo_mysql/tests/bug76815.phpt
index 4e627e0ff79..e991e7aec0b 100644
--- a/ext/pdo_mysql/tests/bug76815.phpt
+++ b/ext/pdo_mysql/tests/bug76815.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #76815: PDOStatement cannot be GCed/closeCursor-ed when a PROCEDURE resultset SIGNAL
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug77289.phpt b/ext/pdo_mysql/tests/bug77289.phpt
index e8ea91262e1..8c847a59c8f 100644
--- a/ext/pdo_mysql/tests/bug77289.phpt
+++ b/ext/pdo_mysql/tests/bug77289.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77289: PDO MySQL segfaults with persistent connection
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug78152.phpt b/ext/pdo_mysql/tests/bug78152.phpt
index 8fc4fc7986d..c3734c41e5f 100644
--- a/ext/pdo_mysql/tests/bug78152.phpt
+++ b/ext/pdo_mysql/tests/bug78152.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #78152: PDO::exec() - Bad error handling with multiple commands
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug79132.phpt b/ext/pdo_mysql/tests/bug79132.phpt
index 6535dbdee9f..0761c23a02f 100644
--- a/ext/pdo_mysql/tests/bug79132.phpt
+++ b/ext/pdo_mysql/tests/bug79132.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79132: PDO re-uses parameter values from earlier calls to execute()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug79375.phpt b/ext/pdo_mysql/tests/bug79375.phpt
index 56ed48e4bd4..6d5b99a6106 100644
--- a/ext/pdo_mysql/tests/bug79375.phpt
+++ b/ext/pdo_mysql/tests/bug79375.phpt
@@ -3,10 +3,10 @@ Bug #79375: mysqli_store_result does not report error from lock wait timeout
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug79596.phpt b/ext/pdo_mysql/tests/bug79596.phpt
index b71bbd5d8c9..5b0d62d3f27 100644
--- a/ext/pdo_mysql/tests/bug79596.phpt
+++ b/ext/pdo_mysql/tests/bug79596.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79596 (MySQL FLOAT truncates to int some locales)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!setlocale(LC_ALL, 'de_DE', 'de-DE')) die('skip German locale not available');
diff --git a/ext/pdo_mysql/tests/bug79872.phpt b/ext/pdo_mysql/tests/bug79872.phpt
index 0d1ecaf2d31..7713370dee3 100644
--- a/ext/pdo_mysql/tests/bug79872.phpt
+++ b/ext/pdo_mysql/tests/bug79872.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #79872: Can't execute query with pending result sets
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug80458.phpt b/ext/pdo_mysql/tests/bug80458.phpt
index 0cca815925b..c82e987905b 100644
--- a/ext/pdo_mysql/tests/bug80458.phpt
+++ b/ext/pdo_mysql/tests/bug80458.phpt
@@ -3,9 +3,9 @@ Bug #80458 PDOStatement::fetchAll() throws for upsert queries
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug80808.phpt b/ext/pdo_mysql/tests/bug80808.phpt
index 364b559a4ce..7757a9c2311 100644
--- a/ext/pdo_mysql/tests/bug80808.phpt
+++ b/ext/pdo_mysql/tests/bug80808.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #80808: PDO returns ZEROFILL integers without leading zeros
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug80908.phpt b/ext/pdo_mysql/tests/bug80908.phpt
index 48747d6c090..c8155034efc 100644
--- a/ext/pdo_mysql/tests/bug80908.phpt
+++ b/ext/pdo_mysql/tests/bug80908.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug81037.phpt b/ext/pdo_mysql/tests/bug81037.phpt
index 22a029df9e3..73cc757a4cf 100644
--- a/ext/pdo_mysql/tests/bug81037.phpt
+++ b/ext/pdo_mysql/tests/bug81037.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt
index 40a84fa80c6..c56fbf72fe2 100644
--- a/ext/pdo_mysql/tests/bug_39858.phpt
+++ b/ext/pdo_mysql/tests/bug_39858.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/bug_41125.phpt b/ext/pdo_mysql/tests/bug_41125.phpt
index 5962cec8988..b5f58e99008 100644
--- a/ext/pdo_mysql/tests/bug_41125.phpt
+++ b/ext/pdo_mysql/tests/bug_41125.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #41125 (PDO mysql + quote() + prepare() can result in segfault)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
index 270e65398d7..51f41eb6d8c 100644
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/bug_42499.phpt b/ext/pdo_mysql/tests/bug_42499.phpt
index a50cca13d42..fd8c4778625 100644
--- a/ext/pdo_mysql/tests/bug_42499.phpt
+++ b/ext/pdo_mysql/tests/bug_42499.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 
 MySQLPDOTest::skip();
diff --git a/ext/pdo_mysql/tests/bug_43371.phpt b/ext/pdo_mysql/tests/bug_43371.phpt
index 80c2149f614..f8b98c237a2 100644
--- a/ext/pdo_mysql/tests/bug_43371.phpt
+++ b/ext/pdo_mysql/tests/bug_43371.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #43371 (Memory errors in PDO constructor)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug_44707.phpt b/ext/pdo_mysql/tests/bug_44707.phpt
index c33395e6bfd..da13453cf2a 100644
--- a/ext/pdo_mysql/tests/bug_44707.phpt
+++ b/ext/pdo_mysql/tests/bug_44707.phpt
@@ -3,9 +3,9 @@ Bug #44707 (The MySQL PDO driver resets variable content after bindParam on tiny
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 
 MySQLPDOTest::skip();
diff --git a/ext/pdo_mysql/tests/bug_61207.phpt b/ext/pdo_mysql/tests/bug_61207.phpt
index 449af2b67e6..0263b323944 100644
--- a/ext/pdo_mysql/tests/bug_61207.phpt
+++ b/ext/pdo_mysql/tests/bug_61207.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL Bug #61207 (PDO::nextRowset() after a multi-statement query doesn't always work)
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/bug_61411.phpt b/ext/pdo_mysql/tests/bug_61411.phpt
index 4068d5d6590..b04d1dd4dcb 100644
--- a/ext/pdo_mysql/tests/bug_61411.phpt
+++ b/ext/pdo_mysql/tests/bug_61411.phpt
@@ -3,9 +3,9 @@ Bug #61411 (PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE)
 --EXTENSIONS--
 pdo
 pdo_mysql
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/bug_74376.phpt b/ext/pdo_mysql/tests/bug_74376.phpt
index 67afca06aa7..80abdc12514 100644
--- a/ext/pdo_mysql/tests/bug_74376.phpt
+++ b/ext/pdo_mysql/tests/bug_74376.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/bug_pecl_12925.phpt b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
index 262d1db8878..a24a06fa5e4 100644
--- a/ext/pdo_mysql/tests/bug_pecl_12925.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_12925.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
index 2bcc04b23da..62dfaec9477 100644
--- a/ext/pdo_mysql/tests/bug_pecl_7976.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/change_column_count.phpt b/ext/pdo_mysql/tests/change_column_count.phpt
index 2183f52dbda..9ec62b2f1e8 100644
--- a/ext/pdo_mysql/tests/change_column_count.phpt
+++ b/ext/pdo_mysql/tests/change_column_count.phpt
@@ -5,7 +5,6 @@ pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/native_types.phpt b/ext/pdo_mysql/tests/native_types.phpt
index 8c6be68082c..0516bc33532 100644
--- a/ext/pdo_mysql/tests/native_types.phpt
+++ b/ext/pdo_mysql/tests/native_types.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL should use native types if ATTR_STRINGIFY_FETCHES is not enabled
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!MySQLPDOTest::isPDOMySQLnd()) die('skip mysqlnd only');
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
index bff3fcbe5a6..bf70cad4fce 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct() - Generic + DSN
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
index 3c3b41ad286..1e3f05b3c8f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct() - URI
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 /* TODO - fix this limitation */
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
index 76db58dff20..695dd69b999 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct(), options
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
index c186689932f..9fcbf3b2b79 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct(), libmysql only options
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
index 55b923be71d..59cb144e191 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct() - URI
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
index 0dd8663d08f..928e620546f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_autocommit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_AUTOCOMMIT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
index f9f0f55afb9..1c629a3f013 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_CASE
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
index 604ec90c416..396624e0454 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_client_version.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_CLIENT_VERSION
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
index 07a1de5b652..b1896e53ee7 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_CONNECTION_STATUS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
index e105a0eac1d..fadf5e979f9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_driver_name.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_DRIVER_NAME
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
index fc4f2f0808c..40c985b4c3f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_errmode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_ERRMODE
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
index eabc4db8295..8e7d781f2f8 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_fetch_table_names.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_FETCH_TABLE_NAMES
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
index b12161d4f3e..a6921b09289 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::MYSQL_ATTR_INIT_COMMAND
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
index d4ea033c08d..06ed77c3c4a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct(), PDO::MYSQL_ATTR_MAX_BUFFER_SIZE
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
index 34d9d57ce3c..9c97729ccc8 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::MYSQL_ATTR_MULTI_STATEMENTS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
index 78d6ae78795..6fa3ce05524 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_ORACLE_NULLS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
index 432e5d70d22..f24de5a390a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_prefetch.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_PREFETCH
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
index 90e726017dd..c672acd2eb6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_SERVER_INFO
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
index 62a2fae8b02..e193ae3fca5 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_version.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_SERVER_VERSION
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
index 9ca2e3a6b01..317e3ec3a22 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::ATTR_STATEMENT_CLASS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
index cdecc97b2e3..7c78d691eaf 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO->beginTransaction()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
index 1ff37cc3cc7..38d0bb85646 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), BIT columns - remove after fix!
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index 205e059b541..a79e219fd07 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO MySQL specific class constants
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) {
     /* Need connection to detect library version */
     require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_closecursor_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_closecursor_error.phpt
index 5d4c9335426..344332b40ab 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_closecursor_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_closecursor_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Error during closeCursor() of multi query
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
index f88ae149faf..af94cda4814 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->commit()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_attr.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_attr.phpt
index 2e5285a6e77..810f9601266 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_connect_attr.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_connect_attr.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO_MYSQL: check the session_connect_attrs table for connection attributes
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!MySQLPDOTest::isPDOMySQLnd()) die('skip only for mysqlnd');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
index 294d45e586a..1c57b0a4593 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO_MYSQL: Defining a connection charset in the DSN
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
index c2b07100c0c..1e405d3ffdf 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_errorcode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->errorCode()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt
index 2da0f4aaa3f..ef24fb1135f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->errorInfo()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec.phpt
index a670be737f6..8f5d9728df7 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), affected rows
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
index 53d36af4ff1..94f3917ce14 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_ddl.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), affected rows
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
index 7a0d6e36a26..ba075524c69 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), affected rows
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
index 2cff2e39156..da66cf3293e 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), SELECT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
index fb20dff5bc5..a01c49bc41e 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->fetch()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
index 80c6a23db82..8be56a1f3a0 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->getAttribute()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_inTransaction.phpt b/ext/pdo_mysql/tests/pdo_mysql_inTransaction.phpt
index 7ce93e8409a..d6fe59a6c1b 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_inTransaction.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_inTransaction.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO class inTransaction
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_interface.phpt b/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
index e3ca7caa1b6..aeb441bc036 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO class interface
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt b/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt
index b63ecb2c52e..08120a05ba1 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_last_insert_id.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->lastInsertId()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
index 9a12f837fb7..24e2954b772 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
@@ -1,8 +1,9 @@
 --TEST--
 ensure default for local infile is off
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!defined('PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY')) {
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_allowed.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_allowed.phpt
index edabfbc07f9..bee61157bdb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_allowed.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_allowed.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY vs access allowed
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipifinfilenotallowed.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_denied.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_denied.phpt
index c955c1daad3..62e87996394 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_denied.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_directory_denied.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY vs access denied
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipifinfilenotallowed.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_overrides_local_infile_directory.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_overrides_local_infile_directory.phpt
index c6d60fd1abc..9b26719fa08 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_overrides_local_infile_directory.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_overrides_local_infile_directory.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::MYSQL_ATTR_LOCAL_INFILE overrides PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipifinfilenotallowed.inc');
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
index 4e163348b0f..bd79cc5e682 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
@@ -1,8 +1,9 @@
 --TEST--
 enable local infile
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
index aa644ed2b47..e3d0bafa948 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->nextRowSet() with PDO::MYSQL_ATTR_MULTI_STATEMENTS either true or false
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
index 72a29f9e36e..8c397bd7c76 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->__construct(), PDO::ATTR_PERSISTENT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
index e44f1d2a526..6106e8a30b9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO phpinfo() output
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
index f4f1dcd13d6..f8e5472f528 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), emulated PS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
index b652a08ea29..59a1c4e31f7 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_anonymous.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), emulated PS, anonymous placeholder
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_placeholder_everywhere.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_placeholder_everywhere.phpt
index abd809539b7..b7528f68d81 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_placeholder_everywhere.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_emulated_placeholder_everywhere.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), emulated PS, anonymous placeholder
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 // TODO: This test is MySQL version specific - for whatever reason
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt
index 9c5b953a52f..0fd19a7e8cc 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_match_against.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #41876 (bindParam() and bindValue() do not work with MySQL MATCH () AGAINST ())
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
index 13534f0a1e4..46896a77994 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
index 5f32da7412f..7318caa1858 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS, clear line after error
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
index 4c9dcb0e7e8..f94d8f83abb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_column.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS, named placeholder
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_dup_named_placeholder.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_dup_named_placeholder.phpt
index 8e521549026..1891333aa2f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_dup_named_placeholder.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_dup_named_placeholder.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS, named placeholder II
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
index d24cb894aca..f5ec8a9307d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS, mixed, wired style
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt
index 35658d55294..821d19cd658 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_named_placeholder.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(), native PS, named placeholder
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
index 50819f96953..a428fb11998 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_placeholder_everywhere.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->prepare(),native PS, anonymous placeholder
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_quote.phpt b/ext/pdo_mysql/tests/pdo_mysql_quote.phpt
index efb38ba5765..3c3cde297f1 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_quote.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_quote.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL ensure quote function returns expected results
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
index 25a467d877f..81d4f143923 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDO::rollBack()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt
index 6d1ac4bbfbd..218a6d702a4 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindcolumn.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->bindColumn()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt
index 4559c499ea2..f20181010b9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->bindParam()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
index 5da2bb30fb9..b5aa91136ef 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindparam_types.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->bindParam() - SQL column types
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt
index 537156ebbf6..1bcc8e0e165 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_bindvalue.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->bindValue()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
index 7556bf7e6fb..12839b17f83 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement - inserting BLOB from stream
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
index 7f45e56b6b0..aee5be61119 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobs.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL Prepared Statements and BLOBs
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor.phpt
index 4125155f6d6..45725853d3c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->closeCursor()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt
index e732ed5e345..bbdb61e3d56 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_closecursor_empty.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->closeCursor()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
index 2c4de9f87c1..3607744d87a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_columncount.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->columnCount()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
index cfd30a635da..6d00353a7d8 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->errorCode();
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
index b876628e257..05770f198d2 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->errorInfo();
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
index 8e414a6c16e..b6e65f0c397 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_non_select.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->execute()/fetch(), Non-SELECT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
index d0ee38dcaec..ed1d108b639 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->fetch(), PDO::FETCH_SERIALIZE
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt
index 049e7bd85c6..02897dbbadf 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->fetch(), PDO::FETCH_SERIALIZE
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
index bb92353fbe1..54f5826fff5 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO: PDOStatement->fetchObject()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject_ctor_args.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject_ctor_args.phpt
index 2947ad4e32b..747d2370026 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject_ctor_args.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject_ctor_args.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO: PDOStatement->fetchObject() with $constructorArgs
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 0e87b118ee5..d4a7b2fa98d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL: PDOStatement->getColumnMeta()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 // Too many differences among MySQL version - run only with a recent one
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index 7f4904d23bd..010ef31f463 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -1,8 +1,9 @@
 --TEST--
 PDOStatements and multi query
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
index b528f865abc..6114cc3d9aa 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->nextRowSet()
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
index 99eb4813040..4d411406cde 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_rowcount.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->rowCount() @ SELECT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
index a2df9b4597c..a2ddc43d726 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO:query() vs. PDO::prepare() and MySQL error 2050
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
index 5e70861816c..2b67e5ba2e4 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL Prepared Statements and different column counts
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
diff --git a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
index 8a2824f5020..3bc6faf33fb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDOStatement->execute()/fetch(), Non-SELECT
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_types.phpt b/ext/pdo_mysql/tests/pdo_mysql_types.phpt
index 6360c9a61b6..01122a735ed 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_types.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_types.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), native types wo ZEROFILL
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
index 8e98b74acbf..7f330a4292c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_types_zerofill.phpt
@@ -1,8 +1,9 @@
 --TEST--
 MySQL PDO->exec(), native types - ZEROFILL
+--EXTENSIONS--
+pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
diff --git a/ext/pdo_mysql/tests/skipif.inc b/ext/pdo_mysql/tests/skipif.inc
deleted file mode 100644
index 65c7f34fc63..00000000000
--- a/ext/pdo_mysql/tests/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql'))
-    die('skip PDO_MySQL driver not loaded');
diff --git a/ext/pgsql/tests/00version.phpt b/ext/pgsql/tests/00version.phpt
index 407d59f7ac9..c245bdc436b 100644
--- a/ext/pgsql/tests/00version.phpt
+++ b/ext/pgsql/tests/00version.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL version
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/01createdb.phpt b/ext/pgsql/tests/01createdb.phpt
index 2abd051c8b6..7ea6de33dfc 100644
--- a/ext/pgsql/tests/01createdb.phpt
+++ b/ext/pgsql/tests/01createdb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL create db
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/02connection.phpt b/ext/pgsql/tests/02connection.phpt
index 2cbec6b6a27..deb21f82f2f 100644
--- a/ext/pgsql/tests/02connection.phpt
+++ b/ext/pgsql/tests/02connection.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL connection
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/03sync_query.phpt b/ext/pgsql/tests/03sync_query.phpt
index 135e4217e50..2f6fd0af95f 100644
--- a/ext/pgsql/tests/03sync_query.phpt
+++ b/ext/pgsql/tests/03sync_query.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL sync query
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/04async_query.phpt b/ext/pgsql/tests/04async_query.phpt
index 34d383ed686..5cf86384894 100644
--- a/ext/pgsql/tests/04async_query.phpt
+++ b/ext/pgsql/tests/04async_query.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL async query
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/05large_object.phpt b/ext/pgsql/tests/05large_object.phpt
index f373d012c6e..dbafbcf1717 100644
--- a/ext/pgsql/tests/05large_object.phpt
+++ b/ext/pgsql/tests/05large_object.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL large object
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/06_bug73498.phpt b/ext/pgsql/tests/06_bug73498.phpt
index fdb2af2f970..4b05d1eff72 100644
--- a/ext/pgsql/tests/06_bug73498.phpt
+++ b/ext/pgsql/tests/06_bug73498.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug 73498 Incorrect DELIMITER syntax for pg_copy_to()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/06copy.phpt b/ext/pgsql/tests/06copy.phpt
index bed783a6f8b..25e9bf8672a 100644
--- a/ext/pgsql/tests/06copy.phpt
+++ b/ext/pgsql/tests/06copy.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL copy functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/07optional.phpt b/ext/pgsql/tests/07optional.phpt
index f633f814982..d16d98b56ab 100644
--- a/ext/pgsql/tests/07optional.phpt
+++ b/ext/pgsql/tests/07optional.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL optional functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/08escape.phpt b/ext/pgsql/tests/08escape.phpt
index 6b510aef733..c2ed99b3887 100644
--- a/ext/pgsql/tests/08escape.phpt
+++ b/ext/pgsql/tests/08escape.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL escape functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt
index 9cb894f5d2f..9ab79c207a1 100644
--- a/ext/pgsql/tests/09notice.phpt
+++ b/ext/pgsql/tests/09notice.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL notice function
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 
diff --git a/ext/pgsql/tests/10pg_convert.phpt b/ext/pgsql/tests/10pg_convert.phpt
index f00cab76646..21d643ea11a 100644
--- a/ext/pgsql/tests/10pg_convert.phpt
+++ b/ext/pgsql/tests/10pg_convert.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_convert()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/10pg_convert_9.phpt b/ext/pgsql/tests/10pg_convert_9.phpt
index 5f867ef0883..9106bc3b419 100644
--- a/ext/pgsql/tests/10pg_convert_9.phpt
+++ b/ext/pgsql/tests/10pg_convert_9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_convert() (9.0+)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/10pg_convert_json_array.phpt b/ext/pgsql/tests/10pg_convert_json_array.phpt
index 46aec3ffbc0..b0580365c38 100644
--- a/ext/pgsql/tests/10pg_convert_json_array.phpt
+++ b/ext/pgsql/tests/10pg_convert_json_array.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_convert() and JSON/Array
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/11pg_meta_data.phpt b/ext/pgsql/tests/11pg_meta_data.phpt
index 5374ccb619b..2c849019a6e 100644
--- a/ext/pgsql/tests/11pg_meta_data.phpt
+++ b/ext/pgsql/tests/11pg_meta_data.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_metadata()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/12pg_insert.phpt b/ext/pgsql/tests/12pg_insert.phpt
index c03060a87e5..220ac9609be 100644
--- a/ext/pgsql/tests/12pg_insert.phpt
+++ b/ext/pgsql/tests/12pg_insert.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_insert()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/12pg_insert_9.phpt b/ext/pgsql/tests/12pg_insert_9.phpt
index 10a85834b4a..5816c9332bf 100644
--- a/ext/pgsql/tests/12pg_insert_9.phpt
+++ b/ext/pgsql/tests/12pg_insert_9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_insert() (9.0+)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/13pg_select.phpt b/ext/pgsql/tests/13pg_select.phpt
index db2ca06bf86..f572d6a58ff 100644
--- a/ext/pgsql/tests/13pg_select.phpt
+++ b/ext/pgsql/tests/13pg_select.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_select()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/13pg_select_9.phpt b/ext/pgsql/tests/13pg_select_9.phpt
index 2031f18d81e..7942056c17f 100644
--- a/ext/pgsql/tests/13pg_select_9.phpt
+++ b/ext/pgsql/tests/13pg_select_9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_select() (9.0+)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/14pg_update.phpt b/ext/pgsql/tests/14pg_update.phpt
index 843dbac9578..25da4af0319 100644
--- a/ext/pgsql/tests/14pg_update.phpt
+++ b/ext/pgsql/tests/14pg_update.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_update()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/14pg_update_9.phpt b/ext/pgsql/tests/14pg_update_9.phpt
index e3e802b7a2c..cf32de7c434 100644
--- a/ext/pgsql/tests/14pg_update_9.phpt
+++ b/ext/pgsql/tests/14pg_update_9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_update() (9.0+)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/15pg_delete.phpt b/ext/pgsql/tests/15pg_delete.phpt
index 5afcf602537..5ca6623f0ee 100644
--- a/ext/pgsql/tests/15pg_delete.phpt
+++ b/ext/pgsql/tests/15pg_delete.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_delete()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/16pg_result_status.phpt b/ext/pgsql/tests/16pg_result_status.phpt
index 268dc9fd64c..0cde015a789 100644
--- a/ext/pgsql/tests/16pg_result_status.phpt
+++ b/ext/pgsql/tests/16pg_result_status.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_result_status()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/17result.phpt b/ext/pgsql/tests/17result.phpt
index f7f2ef19342..f91bba53075 100644
--- a/ext/pgsql/tests/17result.phpt
+++ b/ext/pgsql/tests/17result.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_fetch_*() functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/18pg_escape_bytea_before.phpt b/ext/pgsql/tests/18pg_escape_bytea_before.phpt
index 8222eccde43..e105f04b897 100644
--- a/ext/pgsql/tests/18pg_escape_bytea_before.phpt
+++ b/ext/pgsql/tests/18pg_escape_bytea_before.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_escape_bytea() functions (before connection)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/18pg_escape_bytea_esc.phpt b/ext/pgsql/tests/18pg_escape_bytea_esc.phpt
index 0420c7eb752..801af6d62b9 100644
--- a/ext/pgsql/tests/18pg_escape_bytea_esc.phpt
+++ b/ext/pgsql/tests/18pg_escape_bytea_esc.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_escape_bytea() functions (escape format)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/18pg_escape_bytea_hex.phpt b/ext/pgsql/tests/18pg_escape_bytea_hex.phpt
index af2f3cf4d43..155ad04e8e7 100644
--- a/ext/pgsql/tests/18pg_escape_bytea_hex.phpt
+++ b/ext/pgsql/tests/18pg_escape_bytea_hex.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_escape_bytea() functions (hex format)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/19pg_ping.phpt b/ext/pgsql/tests/19pg_ping.phpt
index 9059bde470f..f69b8c63627 100644
--- a/ext/pgsql/tests/19pg_ping.phpt
+++ b/ext/pgsql/tests/19pg_ping.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_ping() functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/20pg_get_pid.phpt b/ext/pgsql/tests/20pg_get_pid.phpt
index 06cdfa86563..f57132f14e6 100644
--- a/ext/pgsql/tests/20pg_get_pid.phpt
+++ b/ext/pgsql/tests/20pg_get_pid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_get_pid() functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/21pg_get_notify.phpt b/ext/pgsql/tests/21pg_get_notify.phpt
index 9171fc01aa4..7aff6bebb09 100644
--- a/ext/pgsql/tests/21pg_get_notify.phpt
+++ b/ext/pgsql/tests/21pg_get_notify.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_get_notify() functions
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/22pg_fetch_object.phpt b/ext/pgsql/tests/22pg_fetch_object.phpt
index 1f17d076f58..2a0242fed91 100644
--- a/ext/pgsql/tests/22pg_fetch_object.phpt
+++ b/ext/pgsql/tests/22pg_fetch_object.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_fetch_object()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/23sync_query_params.phpt b/ext/pgsql/tests/23sync_query_params.phpt
index 1406cec5bf0..d6f607af822 100644
--- a/ext/pgsql/tests/23sync_query_params.phpt
+++ b/ext/pgsql/tests/23sync_query_params.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL sync query params
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/24sync_query_prepared.phpt b/ext/pgsql/tests/24sync_query_prepared.phpt
index 1ab7e095f4b..0b791c9c20c 100644
--- a/ext/pgsql/tests/24sync_query_prepared.phpt
+++ b/ext/pgsql/tests/24sync_query_prepared.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL sync prepared queries
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/25async_query_params.phpt b/ext/pgsql/tests/25async_query_params.phpt
index 87b5e0dbb11..2de80cfac7c 100644
--- a/ext/pgsql/tests/25async_query_params.phpt
+++ b/ext/pgsql/tests/25async_query_params.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL async query params
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/26async_query_prepared.phpt b/ext/pgsql/tests/26async_query_prepared.phpt
index 6eacb4e3eeb..e1fb43a3792 100644
--- a/ext/pgsql/tests/26async_query_prepared.phpt
+++ b/ext/pgsql/tests/26async_query_prepared.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL async prepared queries
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/27large_object_oid.phpt b/ext/pgsql/tests/27large_object_oid.phpt
index c9e33992d70..d1d88948b74 100644
--- a/ext/pgsql/tests/27large_object_oid.phpt
+++ b/ext/pgsql/tests/27large_object_oid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL create large object with given oid
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/28large_object_import_oid.phpt b/ext/pgsql/tests/28large_object_import_oid.phpt
index c5a1ecec9aa..a01cb928a65 100644
--- a/ext/pgsql/tests/28large_object_import_oid.phpt
+++ b/ext/pgsql/tests/28large_object_import_oid.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL import large object with given oid
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/29nb_async_connect.phpt b/ext/pgsql/tests/29nb_async_connect.phpt
index d98b34da478..535f26464ec 100644
--- a/ext/pgsql/tests/29nb_async_connect.phpt
+++ b/ext/pgsql/tests/29nb_async_connect.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL non-blocking async connect
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/30nb_async_query_params.phpt b/ext/pgsql/tests/30nb_async_query_params.phpt
index 612327a9c48..3510a71f1b8 100644
--- a/ext/pgsql/tests/30nb_async_query_params.phpt
+++ b/ext/pgsql/tests/30nb_async_query_params.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL non-blocking async query params
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/31nb_async_query_prepared.phpt b/ext/pgsql/tests/31nb_async_query_prepared.phpt
index 476f21bc519..36cf4f7b10d 100644
--- a/ext/pgsql/tests/31nb_async_query_prepared.phpt
+++ b/ext/pgsql/tests/31nb_async_query_prepared.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL non-blocking async prepared queries
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/32nb_async_query.phpt b/ext/pgsql/tests/32nb_async_query.phpt
index a90f9799a3a..d09a36b0727 100644
--- a/ext/pgsql/tests/32nb_async_query.phpt
+++ b/ext/pgsql/tests/32nb_async_query.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL non-blocking async queries
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/80_bug14383.phpt b/ext/pgsql/tests/80_bug14383.phpt
index e9c60938881..31468a037c7 100644
--- a/ext/pgsql/tests/80_bug14383.phpt
+++ b/ext/pgsql/tests/80_bug14383.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #14383 (8.0+) (using postgres with DBA causes DBA not to be able to find any keys)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once(__DIR__.'/../../dba/tests/skipif.inc');
diff --git a/ext/pgsql/tests/80_bug24499.phpt b/ext/pgsql/tests/80_bug24499.phpt
index 1ba8accadea..0b97bed04c7 100644
--- a/ext/pgsql/tests/80_bug24499.phpt
+++ b/ext/pgsql/tests/80_bug24499.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #24499 (Notice: Undefined property: stdClass::)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug27597.phpt b/ext/pgsql/tests/80_bug27597.phpt
index 92f0d81800f..bc2b1e52a21 100644
--- a/ext/pgsql/tests/80_bug27597.phpt
+++ b/ext/pgsql/tests/80_bug27597.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #27597 (pg_fetch_array not returning false)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt
index 8bc9af399f7..80d79388db6 100644
--- a/ext/pgsql/tests/80_bug32223.phpt
+++ b/ext/pgsql/tests/80_bug32223.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #32223 (weird behaviour of pg_last_notice)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt
index 1c687ccec94..b352bfb5e13 100644
--- a/ext/pgsql/tests/80_bug32223b.phpt
+++ b/ext/pgsql/tests/80_bug32223b.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #32223 (weird behaviour of pg_last_notice using define)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt
index ad769d02607..7506f6e7e07 100644
--- a/ext/pgsql/tests/80_bug36625.phpt
+++ b/ext/pgsql/tests/80_bug36625.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #36625 (8.0+) (pg_trace() does not work)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug39971.phpt b/ext/pgsql/tests/80_bug39971.phpt
index 4fd065adf7a..bdf8b4757a1 100644
--- a/ext/pgsql/tests/80_bug39971.phpt
+++ b/ext/pgsql/tests/80_bug39971.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #39971 (8.0+) (pg_insert/pg_update do not allow now() to be used for timestamp fields)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/80_bug42783.phpt b/ext/pgsql/tests/80_bug42783.phpt
index 49119891e0b..7e47fe7939b 100644
--- a/ext/pgsql/tests/80_bug42783.phpt
+++ b/ext/pgsql/tests/80_bug42783.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42783 (pg_insert() does not support an empty value array)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/98old_api.phpt b/ext/pgsql/tests/98old_api.phpt
index 425753136ae..09a8f5c51dc 100644
--- a/ext/pgsql/tests/98old_api.phpt
+++ b/ext/pgsql/tests/98old_api.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL old api
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/9999dropdb.phpt b/ext/pgsql/tests/9999dropdb.phpt
index f3583a545b6..e0466c89884 100644
--- a/ext/pgsql/tests/9999dropdb.phpt
+++ b/ext/pgsql/tests/9999dropdb.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL drop db
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug37100.phpt b/ext/pgsql/tests/bug37100.phpt
index 3faecc671c4..2d0ca59e0f5 100644
--- a/ext/pgsql/tests/bug37100.phpt
+++ b/ext/pgsql/tests/bug37100.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37100 (data is returned truncated with BINARY CURSOR)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/bug37100_9.phpt b/ext/pgsql/tests/bug37100_9.phpt
index 9f4160d129d..aea1a6bc2d7 100644
--- a/ext/pgsql/tests/bug37100_9.phpt
+++ b/ext/pgsql/tests/bug37100_9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37100 (data is returned truncated with BINARY CURSOR) (9.0+)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/bug46408.phpt b/ext/pgsql/tests/bug46408.phpt
index f78cca1cd0e..385ac9cf66d 100644
--- a/ext/pgsql/tests/bug46408.phpt
+++ b/ext/pgsql/tests/bug46408.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #46408 (Locale number format settings can cause pg_query_params to break with numerics)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/bug47199.phpt b/ext/pgsql/tests/bug47199.phpt
index 1fcc4b0d590..fe2f0591327 100644
--- a/ext/pgsql/tests/bug47199.phpt
+++ b/ext/pgsql/tests/bug47199.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #47199 (pg_delete fails on NULL)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 require_once('skipif.inc');
diff --git a/ext/pgsql/tests/bug60244.phpt b/ext/pgsql/tests/bug60244.phpt
index 2fb083b82a0..189ddbd54ee 100644
--- a/ext/pgsql/tests/bug60244.phpt
+++ b/ext/pgsql/tests/bug60244.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #60244 (pg_fetch_* functions do not validate that row param is >0)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/bug64609.phpt b/ext/pgsql/tests/bug64609.phpt
index e31ec8e0191..4fabed4faac 100644
--- a/ext/pgsql/tests/bug64609.phpt
+++ b/ext/pgsql/tests/bug64609.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #64609 (pg_convert enum type support)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/bug65119.phpt b/ext/pgsql/tests/bug65119.phpt
index c02ff28f063..32516670103 100644
--- a/ext/pgsql/tests/bug65119.phpt
+++ b/ext/pgsql/tests/bug65119.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #65119 (pg_copy_from() modifies input array variable)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/bug68638.phpt b/ext/pgsql/tests/bug68638.phpt
index e0701a79f5a..e1dda17cc98 100644
--- a/ext/pgsql/tests/bug68638.phpt
+++ b/ext/pgsql/tests/bug68638.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #68638 pg_update() fails to store infinite values
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug71062.phpt b/ext/pgsql/tests/bug71062.phpt
index 56e350daad6..828fd50411b 100644
--- a/ext/pgsql/tests/bug71062.phpt
+++ b/ext/pgsql/tests/bug71062.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug71998.phpt b/ext/pgsql/tests/bug71998.phpt
index 116135ab51e..fb112b5d371 100644
--- a/ext/pgsql/tests/bug71998.phpt
+++ b/ext/pgsql/tests/bug71998.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71998 Function pg_insert does not insert when column type = inet
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug72028.phpt b/ext/pgsql/tests/bug72028.phpt
index 7073ca7d03a..c8f7a23842c 100644
--- a/ext/pgsql/tests/bug72028.phpt
+++ b/ext/pgsql/tests/bug72028.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72028 pg_query_params(): NULL converts to empty string
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug72195.phpt b/ext/pgsql/tests/bug72195.phpt
index 0236a60feb2..46d65125c1b 100644
--- a/ext/pgsql/tests/bug72195.phpt
+++ b/ext/pgsql/tests/bug72195.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72195 (pg_pconnect/pg_connect cause use-after-free)
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt
index 0a8a2abdfa2..cd94f406208 100644
--- a/ext/pgsql/tests/bug72197.phpt
+++ b/ext/pgsql/tests/bug72197.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72197 pg_lo_create arbitrary read
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug75419.phpt b/ext/pgsql/tests/bug75419.phpt
index 858a829d94d..1c0b4292159 100644
--- a/ext/pgsql/tests/bug75419.phpt
+++ b/ext/pgsql/tests/bug75419.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #75419 Default link leaked via pg_close()
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug76548.phpt b/ext/pgsql/tests/bug76548.phpt
index 9087b234a2f..f1622868288 100644
--- a/ext/pgsql/tests/bug76548.phpt
+++ b/ext/pgsql/tests/bug76548.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #76548 pg_fetch_result did not fetch the next row
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/bug77047.phpt b/ext/pgsql/tests/bug77047.phpt
index 222a5398b63..7464abda713 100644
--- a/ext/pgsql/tests/bug77047.phpt
+++ b/ext/pgsql/tests/bug77047.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #77047 pg_insert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php
 include("skipif.inc");
diff --git a/ext/pgsql/tests/close_default_link.phpt b/ext/pgsql/tests/close_default_link.phpt
index c73aa5460bb..f6de277bf74 100644
--- a/ext/pgsql/tests/close_default_link.phpt
+++ b/ext/pgsql/tests/close_default_link.phpt
@@ -1,5 +1,7 @@
 --TEST--
 pg_close() default link after connection variable has been dropped
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/connect_after_close.phpt b/ext/pgsql/tests/connect_after_close.phpt
index 932a06ed523..1178abe70bf 100644
--- a/ext/pgsql/tests/connect_after_close.phpt
+++ b/ext/pgsql/tests/connect_after_close.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Reopen connection after it was closed
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/connection_reuse.phpt b/ext/pgsql/tests/connection_reuse.phpt
index a2d7911767b..6eb1f5b7e54 100644
--- a/ext/pgsql/tests/connection_reuse.phpt
+++ b/ext/pgsql/tests/connection_reuse.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Reusing connection with same connection string
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_delete_001.phpt b/ext/pgsql/tests/pg_delete_001.phpt
index a98c95dc4cb..def9b7b22a3 100644
--- a/ext/pgsql/tests/pg_delete_001.phpt
+++ b/ext/pgsql/tests/pg_delete_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_delete() - basic test using schema
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_insert_001.phpt b/ext/pgsql/tests/pg_insert_001.phpt
index ecb13c4ee9e..7d32b049db4 100644
--- a/ext/pgsql/tests/pg_insert_001.phpt
+++ b/ext/pgsql/tests/pg_insert_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_select() - basic test using schema
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_insert_002.phpt b/ext/pgsql/tests/pg_insert_002.phpt
index 0aa6395cfa0..a404df31db5 100644
--- a/ext/pgsql/tests/pg_insert_002.phpt
+++ b/ext/pgsql/tests/pg_insert_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_insert() - test for CVE-2015-1532
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_meta_data_001.phpt b/ext/pgsql/tests/pg_meta_data_001.phpt
index a7bb381de6d..9c36a5ad631 100644
--- a/ext/pgsql/tests/pg_meta_data_001.phpt
+++ b/ext/pgsql/tests/pg_meta_data_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_meta_data() - basic test using schema
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_select_001.phpt b/ext/pgsql/tests/pg_select_001.phpt
index 803cf1fbbfc..ac5d4d79a03 100644
--- a/ext/pgsql/tests/pg_select_001.phpt
+++ b/ext/pgsql/tests/pg_select_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_select() - basic test using schema
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/pg_update_001.phpt b/ext/pgsql/tests/pg_update_001.phpt
index 7ef66c26525..1df81eece69 100644
--- a/ext/pgsql/tests/pg_update_001.phpt
+++ b/ext/pgsql/tests/pg_update_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PostgreSQL pg_update() - basic test using schema
+--EXTENSIONS--
+psql
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/pgsql/tests/skipif.inc b/ext/pgsql/tests/skipif.inc
index bf32d6b16f6..ca67b610ebc 100644
--- a/ext/pgsql/tests/skipif.inc
+++ b/ext/pgsql/tests/skipif.inc
@@ -9,9 +9,6 @@
 include("config.inc");
 include("lcmess.inc");
 
-if (!extension_loaded("pgsql")) {
-    die("skip pgsql extension not loaded\n");
-}
 if (getenv("SKIP_REPEAT")) {
     // pgsql tests are order-dependent.
     // We should probably change that, but in the meantime do not allow repetition.
diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt
index 50ed56b21e8..cb1ce59d807 100644
--- a/ext/session/tests/001.phpt
+++ b/ext/session/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session object serialization
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/002.phpt b/ext/session/tests/002.phpt
index 4992d34cebe..fadbd6cdc5f 100644
--- a/ext/session/tests/002.phpt
+++ b/ext/session/tests/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_unset() without a initialized session
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 4f9b37b75d9..c0628e28abd 100644
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session object deserialization
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index b1f370eee44..09012860018 100644
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_set_save_handler test
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index e9dbf05cb71..6c7f246a363 100644
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -1,5 +1,7 @@
 --TEST--
 custom save handler, multiple session_start()s, complex data structure test.
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index e3c048748f0..ac57f7b23a9 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -1,5 +1,7 @@
 --TEST--
 correct instantiation of references between variables in sessions
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt
index 898cf76a5a3..28f88ef5a65 100644
--- a/ext/session/tests/009.phpt
+++ b/ext/session/tests/009.phpt
@@ -1,5 +1,7 @@
 --TEST--
 unset($_SESSION["name"]); test
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/010.phpt b/ext/session/tests/010.phpt
index 79638d283d7..367edcfa61f 100644
--- a/ext/session/tests/010.phpt
+++ b/ext/session/tests/010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 $session_array = explode(";", session_encode()); should not segfault
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/011.phpt b/ext/session/tests/011.phpt
index ff1adbaec8d..4d39715ea2f 100644
--- a/ext/session/tests/011.phpt
+++ b/ext/session/tests/011.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_decode(); should not segfault
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt
index ad3f54962e5..6d7c49bfaf1 100644
--- a/ext/session/tests/012.phpt
+++ b/ext/session/tests/012.phpt
@@ -1,5 +1,7 @@
 --TEST--
 registering $_SESSION should not segfault
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt
index 07fcea407b2..1aad3dab312 100644
--- a/ext/session/tests/013.phpt
+++ b/ext/session/tests/013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 redefining SID should not cause warnings
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/014.phpt b/ext/session/tests/014.phpt
index a0c65152434..04d43e635ea 100644
--- a/ext/session/tests/014.phpt
+++ b/ext/session/tests/014.phpt
@@ -1,5 +1,7 @@
 --TEST--
 a script should not be able to modify session.use_trans_sid
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/015.phpt b/ext/session/tests/015.phpt
index 788f1eac063..1d6e9d65fe6 100644
--- a/ext/session/tests/015.phpt
+++ b/ext/session/tests/015.phpt
@@ -1,5 +1,7 @@
 --TEST--
 use_trans_sid should not affect SID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/017.phpt b/ext/session/tests/017.phpt
index 957fcb2e452..9d546158e08 100644
--- a/ext/session/tests/017.phpt
+++ b/ext/session/tests/017.phpt
@@ -1,5 +1,7 @@
 --TEST--
 setting $_SESSION before session_start() should not cause segfault
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/018.phpt b/ext/session/tests/018.phpt
index d132abf7173..f504f120d6b 100644
--- a/ext/session/tests/018.phpt
+++ b/ext/session/tests/018.phpt
@@ -1,5 +1,7 @@
 --TEST--
 rewriter correctly handles attribute names which contain dashes
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index e3793a55222..cf220996f9a 100644
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -1,5 +1,7 @@
 --TEST--
 serializing references test case using globals
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/020.phpt b/ext/session/tests/020.phpt
index f4ec38c8fbb..873973f04bf 100644
--- a/ext/session/tests/020.phpt
+++ b/ext/session/tests/020.phpt
@@ -1,5 +1,7 @@
 --TEST--
 rewriter uses arg_separator.output for modifying URLs
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/021.phpt b/ext/session/tests/021.phpt
index 2532324feeb..02f712a9d87 100644
--- a/ext/session/tests/021.phpt
+++ b/ext/session/tests/021.phpt
@@ -1,5 +1,7 @@
 --TEST--
 rewriter handles form and fieldset tags correctly
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/022.phpt b/ext/session/tests/022.phpt
index e7e26f88b02..43e12fcda33 100644
--- a/ext/session/tests/022.phpt
+++ b/ext/session/tests/022.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session object serialization
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/023.phpt b/ext/session/tests/023.phpt
index e9ce0842560..78f6e41c7e7 100644
--- a/ext/session/tests/023.phpt
+++ b/ext/session/tests/023.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session object deserialization
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/024.phpt b/ext/session/tests/024.phpt
index 75fa895d6b0..b0f819b9d0d 100644
--- a/ext/session/tests/024.phpt
+++ b/ext/session/tests/024.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_set_save_handler test
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/025.phpt b/ext/session/tests/025.phpt
index e347a3ebdb3..b18715af366 100644
--- a/ext/session/tests/025.phpt
+++ b/ext/session/tests/025.phpt
@@ -1,5 +1,7 @@
 --TEST--
 custom save handler, multiple session_start()s, complex data structure test.
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/026.phpt b/ext/session/tests/026.phpt
index f5abdac0a57..ccc205f9a34 100644
--- a/ext/session/tests/026.phpt
+++ b/ext/session/tests/026.phpt
@@ -1,5 +1,7 @@
 --TEST--
 correct instantiation of references between variables in sessions
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/027.phpt b/ext/session/tests/027.phpt
index 969bc5b8721..96d26cf5188 100644
--- a/ext/session/tests/027.phpt
+++ b/ext/session/tests/027.phpt
@@ -1,5 +1,7 @@
 --TEST--
 unset($_SESSION["name"]); should work
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/029.phpt b/ext/session/tests/029.phpt
index 518ead85d66..484cc36e52d 100644
--- a/ext/session/tests/029.phpt
+++ b/ext/session/tests/029.phpt
@@ -1,5 +1,7 @@
 --TEST--
 session_decode(); should not segfault
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/031.phpt b/ext/session/tests/031.phpt
index e8deb3dac5d..63a90a6da5e 100644
--- a/ext/session/tests/031.phpt
+++ b/ext/session/tests/031.phpt
@@ -1,5 +1,7 @@
 --TEST--
 setting hash_function to sha512 and hash_bits_per_character > 4 should not crash
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt
index 6dce7742087..976ab50055f 100644
--- a/ext/session/tests/bug24592.phpt
+++ b/ext/session/tests/bug24592.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #24592 (crash when multiple NULL values are being stored)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug26862.phpt b/ext/session/tests/bug26862.phpt
index 9b15305b779..6e3897c53c6 100644
--- a/ext/session/tests/bug26862.phpt
+++ b/ext/session/tests/bug26862.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #26862 (ob_flush() before output_reset_rewrite_vars() results in data loss)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug31454.phpt b/ext/session/tests/bug31454.phpt
index 4ae0dbd7f56..20e3b8c68fd 100644
--- a/ext/session/tests/bug31454.phpt
+++ b/ext/session/tests/bug31454.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #31454 (session_set_save_handler crashes PHP when supplied non-existent object ref)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug32330.phpt b/ext/session/tests/bug32330.phpt
index 9d567a1f621..79b44a265c6 100644
--- a/ext/session/tests/bug32330.phpt
+++ b/ext/session/tests/bug32330.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #32330 (session_destroy, "Failed to initialize storage module", custom session handler)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug36459.phpt b/ext/session/tests/bug36459.phpt
index c1b64561745..201aed60e05 100644
--- a/ext/session/tests/bug36459.phpt
+++ b/ext/session/tests/bug36459.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug38377.phpt b/ext/session/tests/bug38377.phpt
index bd33bddbdb2..152014054e7 100644
--- a/ext/session/tests/bug38377.phpt
+++ b/ext/session/tests/bug38377.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #38377 (session_destroy() gives warning after session_regenerate_id())
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug41600.phpt b/ext/session/tests/bug41600.phpt
index d4dfce9d884..4181becfef3 100644
--- a/ext/session/tests/bug41600.phpt
+++ b/ext/session/tests/bug41600.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #41600 (url rewriter tags doesn't work with namespaced tags)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug42596.phpt b/ext/session/tests/bug42596.phpt
index 83567bde5f4..dca5fc0c990 100644
--- a/ext/session/tests/bug42596.phpt
+++ b/ext/session/tests/bug42596.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #42596 (session.save_path MODE option will not set "write" bit for group or world)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
     if(substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
diff --git a/ext/session/tests/bug50308.phpt b/ext/session/tests/bug50308.phpt
index fe0b0e89fa5..414a8354d35 100644
--- a/ext/session/tests/bug50308.phpt
+++ b/ext/session/tests/bug50308.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #50308 (session id not appended properly for empty anchor tags)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug51338.phpt b/ext/session/tests/bug51338.phpt
index 5dae50baf7a..d6a2ddb6527 100644
--- a/ext/session/tests/bug51338.phpt
+++ b/ext/session/tests/bug51338.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #51338 (URL-Rewriter should not get enabled if use_only_cookies is set to 1)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug53141.phpt b/ext/session/tests/bug53141.phpt
index e240fec8a73..849a3587604 100644
--- a/ext/session/tests/bug53141.phpt
+++ b/ext/session/tests/bug53141.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #53141 (autoload misbehaves if called from closing session)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug55688.phpt b/ext/session/tests/bug55688.phpt
index dda9ccb0c02..910dfb1f751 100644
--- a/ext/session/tests/bug55688.phpt
+++ b/ext/session/tests/bug55688.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #55688 (Crash when calling SessionHandler::gc())
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug60634.phpt b/ext/session/tests/bug60634.phpt
index 09e64ad4bfe..e9005469c20 100644
--- a/ext/session/tests/bug60634.phpt
+++ b/ext/session/tests/bug60634.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt
index 9a1d2288a36..9fda08e43de 100644
--- a/ext/session/tests/bug60634_error_1.phpt
+++ b/ext/session/tests/bug60634_error_1.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60634_error_2.phpt b/ext/session/tests/bug60634_error_2.phpt
index ef060956928..1c5ca11a4de 100644
--- a/ext/session/tests/bug60634_error_2.phpt
+++ b/ext/session/tests/bug60634_error_2.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt
index 5d6a35ac3d8..5669aa31788 100644
--- a/ext/session/tests/bug60634_error_3.phpt
+++ b/ext/session/tests/bug60634_error_3.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60634_error_4.phpt b/ext/session/tests/bug60634_error_4.phpt
index e3834f262c2..a8abedcab18 100644
--- a/ext/session/tests/bug60634_error_4.phpt
+++ b/ext/session/tests/bug60634_error_4.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt
index 333c86c67fb..1939ee99909 100644
--- a/ext/session/tests/bug60634_error_5.phpt
+++ b/ext/session/tests/bug60634_error_5.phpt
@@ -4,6 +4,8 @@ Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index fbd8a6eeab9..341c9ad2ff2 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #60860 (session.save_handler=user without defined function core dumps)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/bug61470.phpt b/ext/session/tests/bug61470.phpt
index 7f07929f2e7..e26a90a5471 100644
--- a/ext/session/tests/bug61470.phpt
+++ b/ext/session/tests/bug61470.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #61470 (session_regenerate_id() does not create session file)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug61728.phpt b/ext/session/tests/bug61728.phpt
index 5fb451b9f80..e27d8a5b785 100644
--- a/ext/session/tests/bug61728.phpt
+++ b/ext/session/tests/bug61728.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #61728 (PHP crash when calling ob_start in request_shutdown phase)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug63379.phpt b/ext/session/tests/bug63379.phpt
index 5987e66be06..2e2add3cad3 100644
--- a/ext/session/tests/bug63379.phpt
+++ b/ext/session/tests/bug63379.phpt
@@ -3,6 +3,8 @@ Bug #63379: Warning when using session_regenerate_id(TRUE) with a SessionHandler
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug63379_nodestroy.phpt b/ext/session/tests/bug63379_nodestroy.phpt
index 7e0221f0e08..b2279700bd4 100644
--- a/ext/session/tests/bug63379_nodestroy.phpt
+++ b/ext/session/tests/bug63379_nodestroy.phpt
@@ -3,6 +3,8 @@ Bug #63379: Warning when using session_regenerate_id(TRUE) with a SessionHandler
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug65475.phpt b/ext/session/tests/bug65475.phpt
index 637d75c827d..2f4cbd675ea 100644
--- a/ext/session/tests/bug65475.phpt
+++ b/ext/session/tests/bug65475.phpt
@@ -3,6 +3,8 @@ Bug #65475: Session ID is not initialized when session.usr_strict_mode=1
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt
index ba0f2d28b10..88c2e48ed79 100644
--- a/ext/session/tests/bug66481.phpt
+++ b/ext/session/tests/bug66481.phpt
@@ -3,6 +3,8 @@ Bug #66481: Calls to session_name() segfault when session.name is null.
 --INI--
 session.name=
 error_log=
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug66827.phpt b/ext/session/tests/bug66827.phpt
index 6329d292264..e0f95578481 100644
--- a/ext/session/tests/bug66827.phpt
+++ b/ext/session/tests/bug66827.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #66827: Session raises E_NOTICE when session name variable is array.
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug67694.phpt b/ext/session/tests/bug67694.phpt
index 3dffa2651b7..dab2711767e 100644
--- a/ext/session/tests/bug67694.phpt
+++ b/ext/session/tests/bug67694.phpt
@@ -7,6 +7,8 @@ session.auto_start = 0
 session.use_cookies = 0
 session.cache_limiter =
 date.timezone = UTC
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug67972.phpt b/ext/session/tests/bug67972.phpt
index 9ddfd148201..5826b5a1682 100644
--- a/ext/session/tests/bug67972.phpt
+++ b/ext/session/tests/bug67972.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #67972: SessionHandler Invalid memory read create_sid()
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug68063.phpt b/ext/session/tests/bug68063.phpt
index d21a877631d..2aa3ea1c41b 100644
--- a/ext/session/tests/bug68063.phpt
+++ b/ext/session/tests/bug68063.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #68063 (Empty session IDs do still start sessions)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug69111.phpt b/ext/session/tests/bug69111.phpt
index 6c68b95a304..f97858a7da9 100644
--- a/ext/session/tests/bug69111.phpt
+++ b/ext/session/tests/bug69111.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69111 Crash in SessionHandler::read()
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug70013.phpt b/ext/session/tests/bug70013.phpt
index 739e562a274..22adcdbb5ae 100644
--- a/ext/session/tests/bug70013.phpt
+++ b/ext/session/tests/bug70013.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70013 (Reference to $_SESSION is lost after a call to session_regenerate_id())
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug70133.phpt b/ext/session/tests/bug70133.phpt
index 2a10e3121d3..107766711f0 100644
--- a/ext/session/tests/bug70133.phpt
+++ b/ext/session/tests/bug70133.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70133 (Extended SessionHandler::read is ignoring $session_id when calling parent)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug70876.phpt b/ext/session/tests/bug70876.phpt
index ab21f7d0f3d..cbaf5d79eaa 100644
--- a/ext/session/tests/bug70876.phpt
+++ b/ext/session/tests/bug70876.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70876 Segmentation fault when regenerating session id with strict mode
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug71162.phpt b/ext/session/tests/bug71162.phpt
index d16081c3145..d93cfc68396 100644
--- a/ext/session/tests/bug71162.phpt
+++ b/ext/session/tests/bug71162.phpt
@@ -1,5 +1,7 @@
 --TEST--
 updateTimestamp never called when session data is empty
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug71683.phpt b/ext/session/tests/bug71683.phpt
index ee0ecf0d266..9541121daa3 100644
--- a/ext/session/tests/bug71683.phpt
+++ b/ext/session/tests/bug71683.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug71972.phpt b/ext/session/tests/bug71972.phpt
index 1384cae21e3..4d690329e10 100644
--- a/ext/session/tests/bug71972.phpt
+++ b/ext/session/tests/bug71972.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71972 (Cyclic references causing session_start(): Failed to decode session object)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug71974.phpt b/ext/session/tests/bug71974.phpt
index e415bb5d4c6..1c16ab1c24e 100644
--- a/ext/session/tests/bug71974.phpt
+++ b/ext/session/tests/bug71974.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71974 Trans sid will always be send, even if cookies are available
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug72562.phpt b/ext/session/tests/bug72562.phpt
index 8421e8940a1..5a3b4f7a896 100644
--- a/ext/session/tests/bug72562.phpt
+++ b/ext/session/tests/bug72562.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72562: Use After Free in unserialize() with Unexpected Session Deserialization
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug72681.phpt b/ext/session/tests/bug72681.phpt
index 4752767d50a..46f49f8bc68 100644
--- a/ext/session/tests/bug72681.phpt
+++ b/ext/session/tests/bug72681.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72681: PHP Session Data Injection Vulnerability
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug72940.phpt b/ext/session/tests/bug72940.phpt
index d8f8c35bf45..740c5410743 100644
--- a/ext/session/tests/bug72940.phpt
+++ b/ext/session/tests/bug72940.phpt
@@ -5,6 +5,8 @@ error_reporting=-1
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/bug73273.phpt b/ext/session/tests/bug73273.phpt
index 03530e08acc..cb1038afb5e 100644
--- a/ext/session/tests/bug73273.phpt
+++ b/ext/session/tests/bug73273.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73273: session_unset() empties values from all variables in which is $_session stored
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug73529.phpt b/ext/session/tests/bug73529.phpt
index 7fc4fa6d387..eb023d1186c 100644
--- a/ext/session/tests/bug73529.phpt
+++ b/ext/session/tests/bug73529.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #73529 session_decode() silently fails on wrong input
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug74514.phpt b/ext/session/tests/bug74514.phpt
index 5ff86c1bfb2..d2301e9464f 100644
--- a/ext/session/tests/bug74514.phpt
+++ b/ext/session/tests/bug74514.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74514 5 session functions incorrectly warn when calling in read-only/getter mode.
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/bug74541.phpt b/ext/session/tests/bug74541.phpt
index ccdfdbffdec..8d9df858e2e 100644
--- a/ext/session/tests/bug74541.phpt
+++ b/ext/session/tests/bug74541.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74541 Wrong reflection on session_start()
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/bug74833.phpt b/ext/session/tests/bug74833.phpt
index d299f4ee96d..63c85f6c35c 100644
--- a/ext/session/tests/bug74833.phpt
+++ b/ext/session/tests/bug74833.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74833 Session module number is uninitialized when SID is reset
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug74892.phpt b/ext/session/tests/bug74892.phpt
index 3b11ec20a75..793e67cfadd 100644
--- a/ext/session/tests/bug74892.phpt
+++ b/ext/session/tests/bug74892.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74892 Url Rewriting (trans_sid) not working on urls that start with #
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug74936.phpt b/ext/session/tests/bug74936.phpt
index 7b502c85b5b..9b1550e905b 100644
--- a/ext/session/tests/bug74936.phpt
+++ b/ext/session/tests/bug74936.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74936 session_cache_expire() triggers a warning in read mode.
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/bug74941.phpt b/ext/session/tests/bug74941.phpt
index 59b57e1b4de..4eead9abefe 100644
--- a/ext/session/tests/bug74941.phpt
+++ b/ext/session/tests/bug74941.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #74941 session_start() triggers a warning after headers have been sent but cookies are not used
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/bug78624.phpt b/ext/session/tests/bug78624.phpt
index 6d44051322c..286dcdf9d18 100644
--- a/ext/session/tests/bug78624.phpt
+++ b/ext/session/tests/bug78624.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() : session_gc() returns the number of deleted rec
 session.name=PHPSESSID
 session.save_handler=files
 session.gc_probability=0
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/bug80889.phpt b/ext/session/tests/bug80889.phpt
index e9b86684cd0..b635164cd96 100644
--- a/ext/session/tests/bug80889.phpt
+++ b/ext/session/tests/bug80889.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80889 (Cannot set save handler when save_handler is invalid)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug80889a.phpt b/ext/session/tests/bug80889a.phpt
index ff0c0253823..8bbb5e2d22b 100644
--- a/ext/session/tests/bug80889a.phpt
+++ b/ext/session/tests/bug80889a.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80889 (Cannot set save handler when save_handler is invalid)
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt b/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt
index f176a7ae79d..ad9d6dfe047 100644
--- a/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt
+++ b/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Error when setting session.save_handler to user via ini_set
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/rfc1867.phpt b/ext/session/tests/rfc1867.phpt
index aed179d7573..0962a91bc4f 100644
--- a/ext/session/tests/rfc1867.phpt
+++ b/ext/session/tests/rfc1867.phpt
@@ -15,6 +15,8 @@ session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_cleanup.phpt b/ext/session/tests/rfc1867_cleanup.phpt
index 9a0bf626f33..cdfd3c83310 100644
--- a/ext/session/tests/rfc1867_cleanup.phpt
+++ b/ext/session/tests/rfc1867_cleanup.phpt
@@ -15,6 +15,8 @@ session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_disabled.phpt b/ext/session/tests/rfc1867_disabled.phpt
index 43c1079064d..a928a6171c3 100644
--- a/ext/session/tests/rfc1867_disabled.phpt
+++ b/ext/session/tests/rfc1867_disabled.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_disabled_2.phpt b/ext/session/tests/rfc1867_disabled_2.phpt
index f2ff6ebb964..dcfbe075cbf 100644
--- a/ext/session/tests/rfc1867_disabled_2.phpt
+++ b/ext/session/tests/rfc1867_disabled_2.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_inter.phpt b/ext/session/tests/rfc1867_inter.phpt
index db0ca00a05d..a7ddff14f5e 100644
--- a/ext/session/tests/rfc1867_inter.phpt
+++ b/ext/session/tests/rfc1867_inter.phpt
@@ -15,6 +15,8 @@ session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.upload_progress.min_freq=0.000000001
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_invalid_settings.phpt b/ext/session/tests/rfc1867_invalid_settings.phpt
index bfec37c9cd1..855661027a7 100644
--- a/ext/session/tests/rfc1867_invalid_settings.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings.phpt
@@ -3,6 +3,8 @@ session rfc1867 invalid settings
 --INI--
 session.upload_progress.freq=-1
 error_log=
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/rfc1867_invalid_settings_2.phpt b/ext/session/tests/rfc1867_invalid_settings_2.phpt
index bf8e6cc2dd0..b8d27a32bff 100644
--- a/ext/session/tests/rfc1867_invalid_settings_2.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings_2.phpt
@@ -3,6 +3,8 @@ session rfc1867 invalid settings 2
 --INI--
 session.upload_progress.freq=200%
 error_log=
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/rfc1867_no_name.phpt b/ext/session/tests/rfc1867_no_name.phpt
index b27120dc5bb..d6a771baf21 100644
--- a/ext/session/tests/rfc1867_no_name.phpt
+++ b/ext/session/tests/rfc1867_no_name.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=1%
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_sid_cookie.phpt b/ext/session/tests/rfc1867_sid_cookie.phpt
index 9acd8d68f80..e090ebec5d6 100644
--- a/ext/session/tests/rfc1867_sid_cookie.phpt
+++ b/ext/session/tests/rfc1867_sid_cookie.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_sid_get.phpt b/ext/session/tests/rfc1867_sid_get.phpt
index b9dde7bb2ed..f227dd7d343 100644
--- a/ext/session/tests/rfc1867_sid_get.phpt
+++ b/ext/session/tests/rfc1867_sid_get.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --GET--
diff --git a/ext/session/tests/rfc1867_sid_get_2.phpt b/ext/session/tests/rfc1867_sid_get_2.phpt
index 4f0f598a8a5..8362f3b58d4 100644
--- a/ext/session/tests/rfc1867_sid_get_2.phpt
+++ b/ext/session/tests/rfc1867_sid_get_2.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_sid_invalid.phpt b/ext/session/tests/rfc1867_sid_invalid.phpt
index 23e3bdcd37c..265883c96f1 100644
--- a/ext/session/tests/rfc1867_sid_invalid.phpt
+++ b/ext/session/tests/rfc1867_sid_invalid.phpt
@@ -15,6 +15,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_sid_only_cookie.phpt b/ext/session/tests/rfc1867_sid_only_cookie.phpt
index d438068c8f6..c133d3c67a0 100644
--- a/ext/session/tests/rfc1867_sid_only_cookie.phpt
+++ b/ext/session/tests/rfc1867_sid_only_cookie.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --COOKIE--
diff --git a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
index 698fc1609d3..ef66ac0afe4 100644
--- a/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
+++ b/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
@@ -13,6 +13,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --GET--
diff --git a/ext/session/tests/rfc1867_sid_post.phpt b/ext/session/tests/rfc1867_sid_post.phpt
index 4ab3e6c33ef..e1f2123b56a 100644
--- a/ext/session/tests/rfc1867_sid_post.phpt
+++ b/ext/session/tests/rfc1867_sid_post.phpt
@@ -14,6 +14,8 @@ session.upload_progress.prefix=upload_progress_
 session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
 session.upload_progress.freq=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --POST_RAW--
diff --git a/ext/session/tests/session_abort_basic.phpt b/ext/session/tests/session_abort_basic.phpt
index 95a5044d168..8adf6ee2a21 100644
--- a/ext/session/tests/session_abort_basic.phpt
+++ b/ext/session/tests/session_abort_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_abort() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_basic1.phpt b/ext/session/tests/session_basic1.phpt
index 13c21d3e85a..6e24924108b 100644
--- a/ext/session/tests/session_basic1.phpt
+++ b/ext/session/tests/session_basic1.phpt
@@ -8,6 +8,8 @@ session.gc_divisor=1000
 session.gc_maxlifetime=300
 session.save_path=
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_basic2.phpt b/ext/session/tests/session_basic2.phpt
index 68230f89b76..6bd94969e7d 100644
--- a/ext/session/tests/session_basic2.phpt
+++ b/ext/session/tests/session_basic2.phpt
@@ -10,6 +10,8 @@ session.gc_maxlifetime=300
 session.save_path=
 session.sid_length=32
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_basic3.phpt b/ext/session/tests/session_basic3.phpt
index 5f6bd72b82a..61173feeefc 100644
--- a/ext/session/tests/session_basic3.phpt
+++ b/ext/session/tests/session_basic3.phpt
@@ -13,6 +13,8 @@ session.gc_maxlifetime=300
 session.save_path=
 session.name=PHPSESSID
 url_rewriter.hosts=
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_basic4.phpt b/ext/session/tests/session_basic4.phpt
index 9da9d0ab359..996fcac3647 100644
--- a/ext/session/tests/session_basic4.phpt
+++ b/ext/session/tests/session_basic4.phpt
@@ -14,6 +14,8 @@ session.save_path=
 session.name=PHPSESSID
 session.trans_sid_tags="a=href,area=href,frame=src,form="
 url_rewriter.tags="a=href,area=href,frame=src,form="
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_basic5.phpt b/ext/session/tests/session_basic5.phpt
index 6a7511c3170..f9399428a9b 100644
--- a/ext/session/tests/session_basic5.phpt
+++ b/ext/session/tests/session_basic5.phpt
@@ -12,6 +12,8 @@ session.gc_divisor=1000
 session.gc_maxlifetime=300
 session.save_path=
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt
index d2ffe64e92f..9873b80da2b 100644
--- a/ext/session/tests/session_cache_expire_basic.phpt
+++ b/ext/session/tests/session_cache_expire_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_expire() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt
index dd0bd40b83b..6383092f562 100644
--- a/ext/session/tests/session_cache_expire_variation1.phpt
+++ b/ext/session/tests/session_cache_expire_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_expire() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt
index 83f76f150aa..e3c598affb8 100644
--- a/ext/session/tests/session_cache_expire_variation2.phpt
+++ b/ext/session/tests/session_cache_expire_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_expire() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt
index ab5a05a2924..a243418001f 100644
--- a/ext/session/tests/session_cache_expire_variation3.phpt
+++ b/ext/session/tests/session_cache_expire_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_expire() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt
index 57493ee0aa5..6877202143e 100644
--- a/ext/session/tests/session_cache_limiter_basic.phpt
+++ b/ext/session/tests/session_cache_limiter_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_limiter() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_limiter_variation1.phpt b/ext/session/tests/session_cache_limiter_variation1.phpt
index 3241cb3cdb7..dc095f1979c 100644
--- a/ext/session/tests/session_cache_limiter_variation1.phpt
+++ b/ext/session/tests/session_cache_limiter_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_limiter() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_cache_limiter_variation2.phpt b/ext/session/tests/session_cache_limiter_variation2.phpt
index 00724a3f9a7..9ef2d4dfb5e 100644
--- a/ext/session/tests/session_cache_limiter_variation2.phpt
+++ b/ext/session/tests/session_cache_limiter_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_limiter() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_limiter_variation3.phpt b/ext/session/tests/session_cache_limiter_variation3.phpt
index 8f4e9296d1c..06822fcf020 100644
--- a/ext/session/tests/session_cache_limiter_variation3.phpt
+++ b/ext/session/tests/session_cache_limiter_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_cache_limiter() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt
index c0e9011c879..5ef464d268c 100644
--- a/ext/session/tests/session_commit_basic.phpt
+++ b/ext/session/tests/session_commit_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_commit_variation1.phpt b/ext/session/tests/session_commit_variation1.phpt
index 0773ca663d9..80d41f1a4ef 100644
--- a/ext/session/tests/session_commit_variation1.phpt
+++ b/ext/session/tests/session_commit_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt
index d05a8b6e28a..925090eeab1 100644
--- a/ext/session/tests/session_commit_variation2.phpt
+++ b/ext/session/tests/session_commit_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt
index 58d7a56c8bd..a90d52105c1 100644
--- a/ext/session/tests/session_commit_variation3.phpt
+++ b/ext/session/tests/session_commit_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_commit_variation4.phpt b/ext/session/tests/session_commit_variation4.phpt
index b0c3ad4a943..cb1117e844c 100644
--- a/ext/session/tests/session_commit_variation4.phpt
+++ b/ext/session/tests/session_commit_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_commit_variation5.phpt b/ext/session/tests/session_commit_variation5.phpt
index 778bc72b91d..1b25aac4c65 100644
--- a/ext/session/tests/session_commit_variation5.phpt
+++ b/ext/session/tests/session_commit_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_commit() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_create_id_basic.phpt b/ext/session/tests/session_create_id_basic.phpt
index 6b6f21372f1..58d61100fda 100644
--- a/ext/session/tests/session_create_id_basic.phpt
+++ b/ext/session/tests/session_create_id_basic.phpt
@@ -3,6 +3,8 @@ Test session_create_id() function : basic functionality
 --INI--
 session.save_handler=files
 session.sid_length=32
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt
index 60354e00241..4da1110d2e5 100644
--- a/ext/session/tests/session_decode_basic.phpt
+++ b/ext/session/tests/session_decode_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt
index 12f0f205705..74a80921a1f 100644
--- a/ext/session/tests/session_decode_basic_serialize.phpt
+++ b/ext/session/tests/session_decode_basic_serialize.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_error2.phpt b/ext/session/tests/session_decode_error2.phpt
index 7379e8078b7..fd41f5e44e1 100644
--- a/ext/session/tests/session_decode_error2.phpt
+++ b/ext/session/tests/session_decode_error2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt
index 0996e2f2c90..4094c58963f 100644
--- a/ext/session/tests/session_decode_variation1.phpt
+++ b/ext/session/tests/session_decode_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt
index 185716e15a4..5bf6f13f801 100644
--- a/ext/session/tests/session_decode_variation2.phpt
+++ b/ext/session/tests/session_decode_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt
index 2916c727f93..f1384d9cacf 100644
--- a/ext/session/tests/session_decode_variation3.phpt
+++ b/ext/session/tests/session_decode_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt
index efaf6793d9d..dc93aa30813 100644
--- a/ext/session/tests/session_decode_variation4.phpt
+++ b/ext/session/tests/session_decode_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_decode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_destroy_variation1.phpt b/ext/session/tests/session_destroy_variation1.phpt
index e2b8febcabd..8f7a01ce503 100644
--- a/ext/session/tests/session_destroy_variation1.phpt
+++ b/ext/session/tests/session_destroy_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_destroy() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt
index 896d78ac71a..db78e603168 100644
--- a/ext/session/tests/session_destroy_variation2.phpt
+++ b/ext/session/tests/session_destroy_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_destroy() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_destroy_variation3.phpt b/ext/session/tests/session_destroy_variation3.phpt
index 5d00466da3d..4b70193fa97 100644
--- a/ext/session/tests/session_destroy_variation3.phpt
+++ b/ext/session/tests/session_destroy_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_destroy() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt
index b8d8db3a41c..826b7f37022 100644
--- a/ext/session/tests/session_encode_basic.phpt
+++ b/ext/session/tests/session_encode_basic.phpt
@@ -2,6 +2,8 @@
 Test session_encode() function : basic functionality
 --INI--
 serialize_precision=100
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt
index 883b814b74e..e112d693539 100644
--- a/ext/session/tests/session_encode_error2.phpt
+++ b/ext/session/tests/session_encode_error2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_serialize.phpt b/ext/session/tests/session_encode_serialize.phpt
index 7844e223817..be5f2d6896b 100644
--- a/ext/session/tests/session_encode_serialize.phpt
+++ b/ext/session/tests/session_encode_serialize.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : Numeric key raise error. bug65359
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation1.phpt b/ext/session/tests/session_encode_variation1.phpt
index a0d883b7a5f..1b5be5e42dc 100644
--- a/ext/session/tests/session_encode_variation1.phpt
+++ b/ext/session/tests/session_encode_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation2.phpt b/ext/session/tests/session_encode_variation2.phpt
index b13366b3faa..8803c308069 100644
--- a/ext/session/tests/session_encode_variation2.phpt
+++ b/ext/session/tests/session_encode_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt
index 4d30b879e3d..5247acda259 100644
--- a/ext/session/tests/session_encode_variation3.phpt
+++ b/ext/session/tests/session_encode_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt
index 613a3ba1014..f17b7641d89 100644
--- a/ext/session/tests/session_encode_variation4.phpt
+++ b/ext/session/tests/session_encode_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt
index e35666ef21e..18803dfb117 100644
--- a/ext/session/tests/session_encode_variation5.phpt
+++ b/ext/session/tests/session_encode_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation6.phpt b/ext/session/tests/session_encode_variation6.phpt
index 5305d483b5b..301dbd61679 100644
--- a/ext/session/tests/session_encode_variation6.phpt
+++ b/ext/session/tests/session_encode_variation6.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt
index a79ca8be82c..a31e11ddf99 100644
--- a/ext/session/tests/session_encode_variation7.phpt
+++ b/ext/session/tests/session_encode_variation7.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_encode_variation8.phpt b/ext/session/tests/session_encode_variation8.phpt
index 8b867b6b636..3571e8c8216 100644
--- a/ext/session/tests/session_encode_variation8.phpt
+++ b/ext/session/tests/session_encode_variation8.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_encode() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_gc_basic.phpt b/ext/session/tests/session_gc_basic.phpt
index 103b784c8f4..d2cad08164c 100644
--- a/ext/session/tests/session_gc_basic.phpt
+++ b/ext/session/tests/session_gc_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_gc() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt
index fa4692e532c..d34f7ccbf95 100644
--- a/ext/session/tests/session_get_cookie_params_basic.phpt
+++ b/ext/session/tests/session_get_cookie_params_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_get_cookie_params() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt
index 9fdb676f8bf..4feb0d3ec81 100644
--- a/ext/session/tests/session_get_cookie_params_variation1.phpt
+++ b/ext/session/tests/session_get_cookie_params_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_get_cookie_params() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt
index 9d2bab5d833..83b97e88706 100644
--- a/ext/session/tests/session_id_basic.phpt
+++ b/ext/session/tests/session_id_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_id() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_id_basic2.phpt b/ext/session/tests/session_id_basic2.phpt
index 9bd09056faf..5f777a98666 100644
--- a/ext/session/tests/session_id_basic2.phpt
+++ b/ext/session/tests/session_id_basic2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_id() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_id_error2.phpt b/ext/session/tests/session_id_error2.phpt
index 23a9a59a2bc..7b7c5b88a04 100644
--- a/ext/session/tests/session_id_error2.phpt
+++ b/ext/session/tests/session_id_error2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_id() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt
index eb22485cec3..3a2f79a7816 100644
--- a/ext/session/tests/session_id_error3.phpt
+++ b/ext/session/tests/session_id_error3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_id() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_ini_set.phpt b/ext/session/tests/session_ini_set.phpt
index 0335d582398..2fbc87902e4 100644
--- a/ext/session/tests/session_ini_set.phpt
+++ b/ext/session/tests/session_ini_set.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test ini_set() for session : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_module_name_basic.phpt b/ext/session/tests/session_module_name_basic.phpt
index c0cda1b9306..eb3bf3ae420 100644
--- a/ext/session/tests/session_module_name_basic.phpt
+++ b/ext/session/tests/session_module_name_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_module_name() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_module_name_variation1.phpt b/ext/session/tests/session_module_name_variation1.phpt
index fff325ad964..6af6f43a3e8 100644
--- a/ext/session/tests/session_module_name_variation1.phpt
+++ b/ext/session/tests/session_module_name_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_module_name() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_module_name_variation2.phpt b/ext/session/tests/session_module_name_variation2.phpt
index f4992796549..ac7c0a1b233 100644
--- a/ext/session/tests/session_module_name_variation2.phpt
+++ b/ext/session/tests/session_module_name_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_module_name() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt
index 2be7b636de3..9650e4e7516 100644
--- a/ext/session/tests/session_module_name_variation3.phpt
+++ b/ext/session/tests/session_module_name_variation3.phpt
@@ -4,6 +4,8 @@ Test session_module_name() function : variation
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt
index 7e58ddc6c48..ab927f18322 100644
--- a/ext/session/tests/session_module_name_variation4.phpt
+++ b/ext/session/tests/session_module_name_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_module_name() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt
index f987ab66d6d..7904a74d7c3 100644
--- a/ext/session/tests/session_name_basic.phpt
+++ b/ext/session/tests/session_name_basic.phpt
@@ -4,6 +4,8 @@ Test session_name() function : error functionality
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt
index b9debaef2c3..f7ccc7744a8 100644
--- a/ext/session/tests/session_name_variation1.phpt
+++ b/ext/session/tests/session_name_variation1.phpt
@@ -4,6 +4,8 @@ Test session_name() function : variation
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt
index 15a816633e2..2b7e678aea2 100644
--- a/ext/session/tests/session_name_variation2.phpt
+++ b/ext/session/tests/session_name_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_name() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_regenerate_id_basic.phpt b/ext/session/tests/session_regenerate_id_basic.phpt
index 9be5a65b1b0..4bc06e0010d 100644
--- a/ext/session/tests/session_regenerate_id_basic.phpt
+++ b/ext/session/tests/session_regenerate_id_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_regenerate_id() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_regenerate_id_cookie.phpt b/ext/session/tests/session_regenerate_id_cookie.phpt
index acaba5addff..a61e24d2a04 100644
--- a/ext/session/tests/session_regenerate_id_cookie.phpt
+++ b/ext/session/tests/session_regenerate_id_cookie.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_regenerate_id() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 
diff --git a/ext/session/tests/session_regenerate_id_fastshutdown.phpt b/ext/session/tests/session_regenerate_id_fastshutdown.phpt
index 961965fb74f..2bc9dba9dc1 100644
--- a/ext/session/tests/session_regenerate_id_fastshutdown.phpt
+++ b/ext/session/tests/session_regenerate_id_fastshutdown.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_regenerate_id() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_regenerate_id_variation1.phpt b/ext/session/tests/session_regenerate_id_variation1.phpt
index 806f20696eb..2fc42dbb367 100644
--- a/ext/session/tests/session_regenerate_id_variation1.phpt
+++ b/ext/session/tests/session_regenerate_id_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_regenerate_id() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_reset_basic.phpt b/ext/session/tests/session_reset_basic.phpt
index 7ba84ff34cb..46e8dfc54db 100644
--- a/ext/session/tests/session_reset_basic.phpt
+++ b/ext/session/tests/session_reset_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_reset() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt
index db578cb6b1a..b33feffdda3 100644
--- a/ext/session/tests/session_save_path_basic.phpt
+++ b/ext/session/tests/session_save_path_basic.phpt
@@ -4,6 +4,8 @@ Test session_save_path() function : basic functionality
 session.gc_probability=0
 session.save_path=
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_save_path_variation1.phpt b/ext/session/tests/session_save_path_variation1.phpt
index 8dbddca98da..a9bb83d68d2 100644
--- a/ext/session/tests/session_save_path_variation1.phpt
+++ b/ext/session/tests/session_save_path_variation1.phpt
@@ -5,6 +5,8 @@ session.gc_probability=0
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt
index d857cdf6a57..149f7496c20 100644
--- a/ext/session/tests/session_save_path_variation2.phpt
+++ b/ext/session/tests/session_save_path_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_save_path() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_save_path_variation3.phpt b/ext/session/tests/session_save_path_variation3.phpt
index 966e0d893cc..3fa476641c3 100644
--- a/ext/session/tests/session_save_path_variation3.phpt
+++ b/ext/session/tests/session_save_path_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_save_path() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index ec22e92051f..dd68988805d 100644
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_save_path() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc');?>
 --INI--
diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index 3977d0deab4..5863441f57d 100644
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_save_path() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc');
 if(substr(PHP_OS, 0, 3) == "WIN")
diff --git a/ext/session/tests/session_set_cookie_params_basic.phpt b/ext/session/tests/session_set_cookie_params_basic.phpt
index 21f04ef17ff..5eecb6ad67d 100644
--- a/ext/session/tests/session_set_cookie_params_basic.phpt
+++ b/ext/session/tests/session_set_cookie_params_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_cookie_params() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation1.phpt b/ext/session/tests/session_set_cookie_params_variation1.phpt
index 7b2c474d1a6..6bb121354dc 100644
--- a/ext/session/tests/session_set_cookie_params_variation1.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation1.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_lifetime=3600
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation2.phpt b/ext/session/tests/session_set_cookie_params_variation2.phpt
index ca3f0aa8877..0a0031b217f 100644
--- a/ext/session/tests/session_set_cookie_params_variation2.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation2.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_path=/path
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation3.phpt b/ext/session/tests/session_set_cookie_params_variation3.phpt
index 166730f89a5..5f4b1164ec9 100644
--- a/ext/session/tests/session_set_cookie_params_variation3.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation3.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_domain=foo
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation4.phpt b/ext/session/tests/session_set_cookie_params_variation4.phpt
index 380defcd2cc..f5fcbaf073d 100644
--- a/ext/session/tests/session_set_cookie_params_variation4.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation4.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_secure=TRUE
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation5.phpt b/ext/session/tests/session_set_cookie_params_variation5.phpt
index 390937258be..917ba446190 100644
--- a/ext/session/tests/session_set_cookie_params_variation5.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation5.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_httponly=TRUE
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation6.phpt b/ext/session/tests/session_set_cookie_params_variation6.phpt
index 9d9f116d422..f7c729c6a97 100644
--- a/ext/session/tests/session_set_cookie_params_variation6.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation6.phpt
@@ -2,6 +2,8 @@
 Test session_set_cookie_params() function : variation
 --INI--
 session.cookie_samesite=test
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_cookie_params_variation7.phpt b/ext/session/tests/session_set_cookie_params_variation7.phpt
index cdc56554e38..430c6efc36e 100644
--- a/ext/session/tests/session_set_cookie_params_variation7.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation7.phpt
@@ -7,6 +7,8 @@ session.cookie_domain=""
 session.cookie_secure=0
 session.cookie_httponly=0
 session.cookie_samesite=""
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt
index 23865aa512b..e8756ee81a8 100644
--- a/ext/session/tests/session_set_save_handler_basic.phpt
+++ b/ext/session/tests/session_set_save_handler_basic.phpt
@@ -5,6 +5,8 @@ session.save_path=
 session.name=PHPSESSID
 session.gc_probability=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt
index 64217770f10..6bc6c738ef6 100644
--- a/ext/session/tests/session_set_save_handler_class_001.phpt
+++ b/ext/session/tests/session_set_save_handler_class_001.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() : basic class wrapping existing handler
 session.use_strict_mode=1
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt
index 72b1d022853..f439553b8cf 100644
--- a/ext/session/tests/session_set_save_handler_class_002.phpt
+++ b/ext/session/tests/session_set_save_handler_class_002.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : full handler implementation
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt
index b952a7ca9b7..b98bb6d8663 100644
--- a/ext/session/tests/session_set_save_handler_class_003.phpt
+++ b/ext/session/tests/session_set_save_handler_class_003.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : inheritance
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt
index 7583462e023..5445c5fd6aa 100644
--- a/ext/session/tests/session_set_save_handler_class_004.phpt
+++ b/ext/session/tests/session_set_save_handler_class_004.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : default object
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt
index 00ff0df9720..2a5c06d672a 100644
--- a/ext/session/tests/session_set_save_handler_class_005.phpt
+++ b/ext/session/tests/session_set_save_handler_class_005.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() : incomplete implementation
 session.save_handler=files
 session.name=PHPSESSID
 session.gc_probability=0
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_006.phpt b/ext/session/tests/session_set_save_handler_class_006.phpt
index 97b21e26e07..73688ba939b 100644
--- a/ext/session/tests/session_set_save_handler_class_006.phpt
+++ b/ext/session/tests/session_set_save_handler_class_006.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : using objects in close
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_007.phpt b/ext/session/tests/session_set_save_handler_class_007.phpt
index d31e8750d23..1690cc5ef84 100644
--- a/ext/session/tests/session_set_save_handler_class_007.phpt
+++ b/ext/session/tests/session_set_save_handler_class_007.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : manual shutdown, reopen
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_008.phpt b/ext/session/tests/session_set_save_handler_class_008.phpt
index d9f81c4f524..989dd4c719c 100644
--- a/ext/session/tests/session_set_save_handler_class_008.phpt
+++ b/ext/session/tests/session_set_save_handler_class_008.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : manual shutdown
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_009.phpt b/ext/session/tests/session_set_save_handler_class_009.phpt
index c27b9b23478..a39a52d546b 100644
--- a/ext/session/tests/session_set_save_handler_class_009.phpt
+++ b/ext/session/tests/session_set_save_handler_class_009.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : implicit shutdown
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_010.phpt b/ext/session/tests/session_set_save_handler_class_010.phpt
index 39ae04b4952..77c8a7a4ca7 100644
--- a/ext/session/tests/session_set_save_handler_class_010.phpt
+++ b/ext/session/tests/session_set_save_handler_class_010.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : manual shutdown function
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_011.phpt b/ext/session/tests/session_set_save_handler_class_011.phpt
index a3811d2d9a1..5648ef33f54 100644
--- a/ext/session/tests/session_set_save_handler_class_011.phpt
+++ b/ext/session/tests/session_set_save_handler_class_011.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : shutdown failure
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt
index a6f53f61430..0a137bcab60 100644
--- a/ext/session/tests/session_set_save_handler_class_012.phpt
+++ b/ext/session/tests/session_set_save_handler_class_012.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() : incorrect arguments for existing handler open
 session.save_handler=files
 session.name=PHPSESSID
 session.gc_probability=0
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt
index 1f8b5445cc4..5a780fbdd44 100644
--- a/ext/session/tests/session_set_save_handler_class_013.phpt
+++ b/ext/session/tests/session_set_save_handler_class_013.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : incorrect arguments for existing handler close
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
index ff1b84a87e9..fd6f42fc335 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : calling default handler when save_handler=user
 --INI--
 session.save_handler=user
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt
index 955995d5a76..4471cd567b0 100644
--- a/ext/session/tests/session_set_save_handler_class_015.phpt
+++ b/ext/session/tests/session_set_save_handler_class_015.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() : register session handler but don't start
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_016.phpt b/ext/session/tests/session_set_save_handler_class_016.phpt
index d5e39c2292d..1f8187a0115 100644
--- a/ext/session/tests/session_set_save_handler_class_016.phpt
+++ b/ext/session/tests/session_set_save_handler_class_016.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: class with create_sid
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt
index d68467e6345..5c7ea793237 100644
--- a/ext/session/tests/session_set_save_handler_class_017.phpt
+++ b/ext/session/tests/session_set_save_handler_class_017.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: class with create_sid
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_018.phpt b/ext/session/tests/session_set_save_handler_class_018.phpt
index 01879ccc065..63073bd2552 100644
--- a/ext/session/tests/session_set_save_handler_class_018.phpt
+++ b/ext/session/tests/session_set_save_handler_class_018.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: class with validate_sid
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_closures.phpt b/ext/session/tests/session_set_save_handler_closures.phpt
index adf49aa455a..4f8b21f20d1 100644
--- a/ext/session/tests/session_set_save_handler_closures.phpt
+++ b/ext/session/tests/session_set_save_handler_closures.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() function : using closures as callbacks
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_error.phpt b/ext/session/tests/session_set_save_handler_error.phpt
index 34ee886012f..5fe9d263b19 100644
--- a/ext/session/tests/session_set_save_handler_error.phpt
+++ b/ext/session/tests/session_set_save_handler_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt
index 8b2a00475d9..703291b7973 100644
--- a/ext/session/tests/session_set_save_handler_error2.phpt
+++ b/ext/session/tests/session_set_save_handler_error2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt
index bcf08fdc23d..974d5479ff9 100644
--- a/ext/session/tests/session_set_save_handler_error3.phpt
+++ b/ext/session/tests/session_set_save_handler_error3.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() function : error functionality
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_error4.phpt b/ext/session/tests/session_set_save_handler_error4.phpt
index 289a0712bed..c03dd8a9030 100644
--- a/ext/session/tests/session_set_save_handler_error4.phpt
+++ b/ext/session/tests/session_set_save_handler_error4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : error functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_iface_001.phpt b/ext/session/tests/session_set_save_handler_iface_001.phpt
index e5aba2331c6..ffcca30abc8 100644
--- a/ext/session/tests/session_set_save_handler_iface_001.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_001.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: interface
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt
index e661016705c..7f826190e31 100644
--- a/ext/session/tests/session_set_save_handler_iface_002.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_002.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: interface wrong
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt
index 43cdb986f2f..ea8464b809f 100644
--- a/ext/session/tests/session_set_save_handler_iface_003.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_003.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: id interface
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_sid_001.phpt b/ext/session/tests/session_set_save_handler_sid_001.phpt
index ffb54af1d33..6a1c0533e46 100644
--- a/ext/session/tests/session_set_save_handler_sid_001.phpt
+++ b/ext/session/tests/session_set_save_handler_sid_001.phpt
@@ -3,6 +3,8 @@ Test session_set_save_handler() function: create_sid
 --INI--
 session.save_handler=files
 session.name=PHPSESSID
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_sid_002.phpt b/ext/session/tests/session_set_save_handler_sid_002.phpt
index 54bfd1e27ff..c6222726000 100644
--- a/ext/session/tests/session_set_save_handler_sid_002.phpt
+++ b/ext/session/tests/session_set_save_handler_sid_002.phpt
@@ -4,6 +4,8 @@ Test session_set_save_handler() function: create_sid
 session.save_handler=files
 session.name=PHPSESSID
 session.save_path="{TMP}"
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_type_error.phpt b/ext/session/tests/session_set_save_handler_type_error.phpt
index 67c4753d866..76191e61ff3 100644
--- a/ext/session/tests/session_set_save_handler_type_error.phpt
+++ b/ext/session/tests/session_set_save_handler_type_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function: interface wrong
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_set_save_handler_variation1.phpt b/ext/session/tests/session_set_save_handler_variation1.phpt
index 7e3a749aade..cf30ba7f1e1 100644
--- a/ext/session/tests/session_set_save_handler_variation1.phpt
+++ b/ext/session/tests/session_set_save_handler_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt
index a4b7d4df6ee..65d4197b938 100644
--- a/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_variation3.phpt b/ext/session/tests/session_set_save_handler_variation3.phpt
index cc0ae1fb234..36381d199c5 100644
--- a/ext/session/tests/session_set_save_handler_variation3.phpt
+++ b/ext/session/tests/session_set_save_handler_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index 9930f7aaf2c..69e883cdcd1 100644
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_set_save_handler() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_set_save_handler_variation5.phpt b/ext/session/tests/session_set_save_handler_variation5.phpt
index 7cf78142590..e400e9bb274 100644
--- a/ext/session/tests/session_set_save_handler_variation5.phpt
+++ b/ext/session/tests/session_set_save_handler_variation5.phpt
@@ -8,6 +8,8 @@ session.gc_maxlifetime=0
 session.save_path=
 session.name=PHPSESSID
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_variation6.phpt b/ext/session/tests/session_set_save_handler_variation6.phpt
index 11af07f6038..6565c3e49dd 100644
--- a/ext/session/tests/session_set_save_handler_variation6.phpt
+++ b/ext/session/tests/session_set_save_handler_variation6.phpt
@@ -7,6 +7,8 @@ session.save_path=
 session.name=PHPSESSID
 session.gc_probability=0
 session.save_handler=files
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt
index ccfdada6f6e..741a6bd34e9 100644
--- a/ext/session/tests/session_start_error.phpt
+++ b/ext/session/tests/session_start_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() errors
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation1.phpt b/ext/session/tests/session_start_variation1.phpt
index aac1e513899..66520639de0 100644
--- a/ext/session/tests/session_start_variation1.phpt
+++ b/ext/session/tests/session_start_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt
index c88577ab320..96f43a328d7 100644
--- a/ext/session/tests/session_start_variation2.phpt
+++ b/ext/session/tests/session_start_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation3.phpt b/ext/session/tests/session_start_variation3.phpt
index eab04386fca..aa1185110d0 100644
--- a/ext/session/tests/session_start_variation3.phpt
+++ b/ext/session/tests/session_start_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt
index 001073a2978..ade0efc6f80 100644
--- a/ext/session/tests/session_start_variation4.phpt
+++ b/ext/session/tests/session_start_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt
index 8de4982fb51..2f7c03200c4 100644
--- a/ext/session/tests/session_start_variation5.phpt
+++ b/ext/session/tests/session_start_variation5.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt
index 558baf32b61..541c17fc735 100644
--- a/ext/session/tests/session_start_variation6.phpt
+++ b/ext/session/tests/session_start_variation6.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt
index 59cd1e529ef..d1a1526910d 100644
--- a/ext/session/tests/session_start_variation7.phpt
+++ b/ext/session/tests/session_start_variation7.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation8.phpt b/ext/session/tests/session_start_variation8.phpt
index 2a83e2907ad..28a85a62574 100644
--- a/ext/session/tests/session_start_variation8.phpt
+++ b/ext/session/tests/session_start_variation8.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_start_variation9.phpt b/ext/session/tests/session_start_variation9.phpt
index 7e5c465a35b..e4c6e573810 100644
--- a/ext/session/tests/session_start_variation9.phpt
+++ b/ext/session/tests/session_start_variation9.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_status.phpt b/ext/session/tests/session_status.phpt
index f58514aa108..c8f40970b8f 100644
--- a/ext/session/tests/session_status.phpt
+++ b/ext/session/tests/session_status.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_status() function : active, none
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_status_disabled.phpt b/ext/session/tests/session_status_disabled.phpt
index 9a16a2fc0e4..fc75d4d6a4a 100644
--- a/ext/session/tests/session_status_disabled.phpt
+++ b/ext/session/tests/session_status_disabled.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_status() function : disabled
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt
index 575e9a98dcf..30c57d14906 100644
--- a/ext/session/tests/session_unset_basic.phpt
+++ b/ext/session/tests/session_unset_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_unset() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt
index 5e17ca751fc..411beef3f6b 100644
--- a/ext/session/tests/session_unset_variation1.phpt
+++ b/ext/session/tests/session_unset_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_unset() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt
index bbf67d550f0..651f569976f 100644
--- a/ext/session/tests/session_write_close_basic.phpt
+++ b/ext/session/tests/session_write_close_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_write_close() function : basic functionality
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_write_close_variation1.phpt b/ext/session/tests/session_write_close_variation1.phpt
index d5ae075bd51..19d2b8846a5 100644
--- a/ext/session/tests/session_write_close_variation1.phpt
+++ b/ext/session/tests/session_write_close_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_write_close() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_write_close_variation2.phpt b/ext/session/tests/session_write_close_variation2.phpt
index 02f26119199..8288da26c7d 100644
--- a/ext/session/tests/session_write_close_variation2.phpt
+++ b/ext/session/tests/session_write_close_variation2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_write_close() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt
index c726caa248a..f40293eff33 100644
--- a/ext/session/tests/session_write_close_variation3.phpt
+++ b/ext/session/tests/session_write_close_variation3.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_start() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt
index 239086833df..042e45c4d68 100644
--- a/ext/session/tests/session_write_close_variation4.phpt
+++ b/ext/session/tests/session_write_close_variation4.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test session_write_close() function : variation
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/sessionhandler_open_001.phpt b/ext/session/tests/sessionhandler_open_001.phpt
index 2ec7b8f4ca3..68f91b6165e 100644
--- a/ext/session/tests/sessionhandler_open_001.phpt
+++ b/ext/session/tests/sessionhandler_open_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing repated SessionHandler::open() calls
+--EXTENSIONS--
+session
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/skipif.inc b/ext/session/tests/skipif.inc
index c259d9eacaf..85569b2c0a8 100644
--- a/ext/session/tests/skipif.inc
+++ b/ext/session/tests/skipif.inc
@@ -1,12 +1,4 @@
 <?php
-// This script prints "skip" if condition does not meet.
-if (!extension_loaded("session") && ini_get("enable_dl")) {
-  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-  @dl("session$dlext");
-}
-if (!extension_loaded("session")) {
-    die("skip Session module not loaded");
-}
 $save_path = ini_get("session.save_path");
 if ($save_path) {
     if (!file_exists($save_path)) {
diff --git a/ext/snmp/tests/bug60749.phpt b/ext/snmp/tests/bug60749.phpt
index b12aa376148..ed7a97d37a9 100644
--- a/ext/snmp/tests/bug60749.phpt
+++ b/ext/snmp/tests/bug60749.phpt
@@ -2,6 +2,8 @@
 Bug #60749: SNMP module should not strip non-standard SNMP port from hostname
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt
index 5ad75353db8..4fbf80f0400 100644
--- a/ext/snmp/tests/bug64124.phpt
+++ b/ext/snmp/tests/bug64124.phpt
@@ -2,6 +2,8 @@
 Bug #64124 IPv6 malformed
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/bug64159.phpt b/ext/snmp/tests/bug64159.phpt
index 6e947ae346f..24b282be7ec 100644
--- a/ext/snmp/tests/bug64159.phpt
+++ b/ext/snmp/tests/bug64159.phpt
@@ -2,6 +2,8 @@
 Bug #64159: Truncated snmpget
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/bug72479.phpt b/ext/snmp/tests/bug72479.phpt
index 9109c505775..8127bbc9455 100644
--- a/ext/snmp/tests/bug72479.phpt
+++ b/ext/snmp/tests/bug72479.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #72479: Use After Free Vulnerability in SNMP with GC and unserialize()
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/generic_timeout_error.phpt b/ext/snmp/tests/generic_timeout_error.phpt
index dd48b75074b..6cad7e9901c 100644
--- a/ext/snmp/tests/generic_timeout_error.phpt
+++ b/ext/snmp/tests/generic_timeout_error.phpt
@@ -2,6 +2,8 @@
 Generic timeout (wrong community)
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index a4ae028e42e..c305fb15d4b 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -2,6 +2,8 @@
 IPv6 support
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/skipif.inc b/ext/snmp/tests/skipif.inc
index f3fe225e5db..0ae4ee16e5b 100644
--- a/ext/snmp/tests/skipif.inc
+++ b/ext/snmp/tests/skipif.inc
@@ -1,6 +1,4 @@
 <?php
-extension_loaded('snmp') or die('skip snmp extension not available in this build');
-
 require_once (dirname(__FILE__).'/snmp_include.inc');
 
 //test server is available
diff --git a/ext/snmp/tests/snmp-object-errno-errstr.phpt b/ext/snmp/tests/snmp-object-errno-errstr.phpt
index aada964e0ba..831a9f3319d 100644
--- a/ext/snmp/tests/snmp-object-errno-errstr.phpt
+++ b/ext/snmp/tests/snmp-object-errno-errstr.phpt
@@ -2,6 +2,8 @@
 OO API: getErrno & getError methods
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
index 77e2d6bf4f7..1e5b505b50c 100644
--- a/ext/snmp/tests/snmp-object-error.phpt
+++ b/ext/snmp/tests/snmp-object-error.phpt
@@ -2,6 +2,8 @@
 OO API: Generic errors
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp-object-properties-error.phpt b/ext/snmp/tests/snmp-object-properties-error.phpt
index 4a8e8edab72..6c30e0afefa 100644
--- a/ext/snmp/tests/snmp-object-properties-error.phpt
+++ b/ext/snmp/tests/snmp-object-properties-error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test SNMP object property errors
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp-object-properties.phpt b/ext/snmp/tests/snmp-object-properties.phpt
index af37eaac565..535c01269f8 100644
--- a/ext/snmp/tests/snmp-object-properties.phpt
+++ b/ext/snmp/tests/snmp-object-properties.phpt
@@ -2,6 +2,8 @@
 OO API: SNMP object properties
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
index 7d5f1912dae..f8de846492a 100644
--- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt
+++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
@@ -2,6 +2,8 @@
 OO API: SNMP::setSecurity (errors)
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt
index 22a77947b1a..0bf4ed49cbb 100644
--- a/ext/snmp/tests/snmp-object.phpt
+++ b/ext/snmp/tests/snmp-object.phpt
@@ -2,6 +2,8 @@
 OO API
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt
index 92d52d8f0fc..58f12d4c0e5 100644
--- a/ext/snmp/tests/snmp2_get.phpt
+++ b/ext/snmp/tests/snmp2_get.phpt
@@ -2,6 +2,8 @@
 Function snmp2_get
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt
index e9d2749f969..c428783b79f 100644
--- a/ext/snmp/tests/snmp2_getnext.phpt
+++ b/ext/snmp/tests/snmp2_getnext.phpt
@@ -2,6 +2,8 @@
 Function snmp2_getnext
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index d98c2c4c049..91c337f6d67 100644
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -2,6 +2,8 @@
 Function snmp2_real_walk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_set-nomib.phpt b/ext/snmp/tests/snmp2_set-nomib.phpt
index cdb4536e99c..2b9d26d09c7 100644
--- a/ext/snmp/tests/snmp2_set-nomib.phpt
+++ b/ext/snmp/tests/snmp2_set-nomib.phpt
@@ -2,6 +2,8 @@
 Function snmp2_set (without MIBs loading)
 --CREDITS--
 Boris Lytockin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_set.phpt b/ext/snmp/tests/snmp2_set.phpt
index ea0581184e0..11b1d94419f 100644
--- a/ext/snmp/tests/snmp2_set.phpt
+++ b/ext/snmp/tests/snmp2_set.phpt
@@ -2,6 +2,8 @@
 Function snmp2_set
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 326e0a71cd3..4cd9b3a85b6 100644
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -2,6 +2,8 @@
 Function snmp2_walk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt
index 20b4ede70e5..849e363b450 100644
--- a/ext/snmp/tests/snmp3-error.phpt
+++ b/ext/snmp/tests/snmp3-error.phpt
@@ -2,6 +2,8 @@
 SNMPv3 Support (errors)
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt
index 91f563df904..1d12a84f464 100644
--- a/ext/snmp/tests/snmp3.phpt
+++ b/ext/snmp/tests/snmp3.phpt
@@ -2,6 +2,8 @@
 SNMPv3 Support
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
index bce2aca4619..672345c4d14 100644
--- a/ext/snmp/tests/snmp_get_quick_print.phpt
+++ b/ext/snmp/tests/snmp_get_quick_print.phpt
@@ -2,6 +2,8 @@
 Function snmp_get_quick_print / snmp_set_quick_print
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt
index 11358135b0b..0e91b2afdaf 100644
--- a/ext/snmp/tests/snmp_get_valueretrieval.phpt
+++ b/ext/snmp/tests/snmp_get_valueretrieval.phpt
@@ -2,6 +2,8 @@
 Function snmp_get_valueretrieval / snmp_set_valueretrieval
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_getvalue.phpt b/ext/snmp/tests/snmp_getvalue.phpt
index 2ad79052b30..2abc61181cf 100644
--- a/ext/snmp/tests/snmp_getvalue.phpt
+++ b/ext/snmp/tests/snmp_getvalue.phpt
@@ -2,6 +2,8 @@
 Function snmp_getvalue
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_read_mib.phpt b/ext/snmp/tests/snmp_read_mib.phpt
index 65ce16d2099..ac06f817ce6 100644
--- a/ext/snmp/tests/snmp_read_mib.phpt
+++ b/ext/snmp/tests/snmp_read_mib.phpt
@@ -2,6 +2,8 @@
 Function snmp_read_mib
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt
index e1a1ca40500..fffa4229b38 100644
--- a/ext/snmp/tests/snmp_set_enum_print.phpt
+++ b/ext/snmp/tests/snmp_set_enum_print.phpt
@@ -2,6 +2,8 @@
 Function snmp_set_enum_print
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmp_set_oid_output_format.phpt b/ext/snmp/tests/snmp_set_oid_output_format.phpt
index dddf81914ae..bb8c63bdda1 100644
--- a/ext/snmp/tests/snmp_set_oid_output_format.phpt
+++ b/ext/snmp/tests/snmp_set_oid_output_format.phpt
@@ -2,6 +2,8 @@
 Function snmp_set_oid_output_format
 --CREDITS--
 Olivier Doucet
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt
index f5991a99fa1..ed18e1f028b 100644
--- a/ext/snmp/tests/snmpget.phpt
+++ b/ext/snmp/tests/snmpget.phpt
@@ -2,6 +2,8 @@
 Function snmpget
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt
index a36107cae2e..995a4cc987f 100644
--- a/ext/snmp/tests/snmpgetnext.phpt
+++ b/ext/snmp/tests/snmpgetnext.phpt
@@ -2,6 +2,8 @@
 Function snmpgetnext
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index b3e75764660..66f458dadff 100644
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -2,6 +2,8 @@
 Function snmprealwalk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmpset-nomib.phpt b/ext/snmp/tests/snmpset-nomib.phpt
index 491f6291881..5252daa0ebd 100644
--- a/ext/snmp/tests/snmpset-nomib.phpt
+++ b/ext/snmp/tests/snmpset-nomib.phpt
@@ -2,6 +2,8 @@
 Function snmpset (without MIBs loading)
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmpset.phpt b/ext/snmp/tests/snmpset.phpt
index f6320d3c29b..ca935cecf5e 100644
--- a/ext/snmp/tests/snmpset.phpt
+++ b/ext/snmp/tests/snmpset.phpt
@@ -2,6 +2,8 @@
 Function snmpset
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index b7ed803fd38..b0e8a8a8afd 100644
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -2,6 +2,8 @@
 Function snmpwalk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');
diff --git a/ext/snmp/tests/wrong_hostname.phpt b/ext/snmp/tests/wrong_hostname.phpt
index 9e262030017..65dfe3ded37 100644
--- a/ext/snmp/tests/wrong_hostname.phpt
+++ b/ext/snmp/tests/wrong_hostname.phpt
@@ -2,6 +2,8 @@
 Wrong hostname
 --CREDITS--
 Boris Lytochkin
+--EXTENSIONS--
+snmp
 --SKIPIF--
 <?php
 require_once(__DIR__.'/skipif.inc');