diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt
index 453865ef34c..d640d0652f4 100644
--- a/ext/simplexml/tests/000.phpt
+++ b/ext/simplexml/tests/000.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: var_dump()
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/001-mb.phpt b/ext/simplexml/tests/001-mb.phpt
index 860f5e09745..f747a4edab0 100644
--- a/ext/simplexml/tests/001-mb.phpt
+++ b/ext/simplexml/tests/001-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple document
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt
index 37f94363c55..ef5b02d678c 100644
--- a/ext/simplexml/tests/001.phpt
+++ b/ext/simplexml/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple document
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt
index 108ddb64242..650399eb83d 100644
--- a/ext/simplexml/tests/002.phpt
+++ b/ext/simplexml/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: clone
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt
index 55a74a55baf..ad371b06ab9 100644
--- a/ext/simplexml/tests/003.phpt
+++ b/ext/simplexml/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Entities
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt
index b4493a3c5d5..14ca1af7c4f 100644
--- a/ext/simplexml/tests/004.phpt
+++ b/ext/simplexml/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: CDATA
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt
index ee8cd1ff83d..49be3d73401 100644
--- a/ext/simplexml/tests/005.phpt
+++ b/ext/simplexml/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Text data
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt
index 5798e913c03..30fc24babab 100644
--- a/ext/simplexml/tests/006.phpt
+++ b/ext/simplexml/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt
index fbd9439dca8..5acc4a5c40e 100644
--- a/ext/simplexml/tests/007.phpt
+++ b/ext/simplexml/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attributes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt
index dba2df58c79..c946c36dafe 100644
--- a/ext/simplexml/tests/008.phpt
+++ b/ext/simplexml/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: XPath
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt
index 4b2e685c365..9403b2b2f61 100644
--- a/ext/simplexml/tests/009.phpt
+++ b/ext/simplexml/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $sxe = simplexml_load_string(<<<EOF
diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt
index bc651fe7447..7b7234e5500 100644
--- a/ext/simplexml/tests/009b.phpt
+++ b/ext/simplexml/tests/009b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $sxe = simplexml_load_string(<<<EOF
diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt
index e251472d15c..79b0ee3074b 100644
--- a/ext/simplexml/tests/010.phpt
+++ b/ext/simplexml/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Simple Inheritance
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/011.phpt b/ext/simplexml/tests/011.phpt
index b283fc74136..818f8e9e58b 100644
--- a/ext/simplexml/tests/011.phpt
+++ b/ext/simplexml/tests/011.phpt
@@ -1,9 +1,7 @@
 --TEST--
 SimpleXML: echo/print
---SKIPIF--
-<?php
-    if (!extension_loaded('simplexml')) print 'skip';
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/012.phpt b/ext/simplexml/tests/012.phpt
index f1a3e1a9428..a68345d29d9 100644
--- a/ext/simplexml/tests/012.phpt
+++ b/ext/simplexml/tests/012.phpt
@@ -1,9 +1,7 @@
 --TEST--
 SimpleXML: Attribute creation
---SKIPIF--
-<?php
-    if (!extension_loaded('simplexml')) print 'skip';
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt
index 509ed7fb68f..96c068826d4 100644
--- a/ext/simplexml/tests/013.phpt
+++ b/ext/simplexml/tests/013.phpt
@@ -1,9 +1,7 @@
 --TEST--
 SimpleXML: Split text content
---SKIPIF--
-<?php
-    if (!extension_loaded('simplexml')) print 'skip';
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index b1681582f92..40a76c838e0 100644
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (direct)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index 98fda260c8f..b6823306542 100644
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (single)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 14d45491df7..f084fcc680f 100644
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: adding/removing attributes (second)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt
index 977eab756ab..1ee31cb4fda 100644
--- a/ext/simplexml/tests/015.phpt
+++ b/ext/simplexml/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: accessing singular subnode as array
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index 59b64e0b48e..26c87aba22b 100644
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: modifying attributes of singular subnode
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt
index 06dbfeb3036..69efc257cd7 100644
--- a/ext/simplexml/tests/016a.phpt
+++ b/ext/simplexml/tests/016a.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: concatenating attributes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/017.phpt b/ext/simplexml/tests/017.phpt
index 3b399149cd1..033f3b11c7f 100644
--- a/ext/simplexml/tests/017.phpt
+++ b/ext/simplexml/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: iteration through subnodes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt
index b6b07d4d395..68b8b785dfa 100644
--- a/ext/simplexml/tests/018.phpt
+++ b/ext/simplexml/tests/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: iteration through subnodes and attributes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt
index 47bb9aa5719..05bf10eb600 100644
--- a/ext/simplexml/tests/019.phpt
+++ b/ext/simplexml/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach with children()
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/020.phpt b/ext/simplexml/tests/020.phpt
index 028b917f047..4bf9f7fb19c 100644
--- a/ext/simplexml/tests/020.phpt
+++ b/ext/simplexml/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attribute compared to string
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/021.phpt b/ext/simplexml/tests/021.phpt
index ac5a589e9b0..c1cd2a1146a 100644
--- a/ext/simplexml/tests/021.phpt
+++ b/ext/simplexml/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Element check
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt
index de4663fd418..ed3752c297e 100644
--- a/ext/simplexml/tests/022.phpt
+++ b/ext/simplexml/tests/022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attributes inside foreach
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt
index 59ea90dc02e..d388313ba66 100644
--- a/ext/simplexml/tests/023.phpt
+++ b/ext/simplexml/tests/023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attributes with entities
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/024.phpt b/ext/simplexml/tests/024.phpt
index 2c52ddbc91e..26e5d170b25 100644
--- a/ext/simplexml/tests/024.phpt
+++ b/ext/simplexml/tests/024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: XPath and attributes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/025.phpt b/ext/simplexml/tests/025.phpt
index a4acdc7331b..a2aa9883577 100644
--- a/ext/simplexml/tests/025.phpt
+++ b/ext/simplexml/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: getting namespaces
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt
index d93cd1fe791..13fc2e54c1d 100644
--- a/ext/simplexml/tests/026.phpt
+++ b/ext/simplexml/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: getName()
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/027.phpt b/ext/simplexml/tests/027.phpt
index 4cb60d7793d..7bdf11bf3eb 100644
--- a/ext/simplexml/tests/027.phpt
+++ b/ext/simplexml/tests/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Adding an elements
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt
index 4199d368047..6a517f8ca3b 100644
--- a/ext/simplexml/tests/028.phpt
+++ b/ext/simplexml/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Adding an elements without text
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt
index 2b9193bc4ba..95d6b59b01c 100644
--- a/ext/simplexml/tests/029.phpt
+++ b/ext/simplexml/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: foreach and count
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/030.phpt b/ext/simplexml/tests/030.phpt
index 7bd8a034910..fe8a2bb5af6 100644
--- a/ext/simplexml/tests/030.phpt
+++ b/ext/simplexml/tests/030.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: isset and unset by offset
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt
index c370f9ad188..bec635d4929 100644
--- a/ext/simplexml/tests/031.phpt
+++ b/ext/simplexml/tests/031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: addChild and addAttribute
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt
index d09281d057c..810091f283b 100644
--- a/ext/simplexml/tests/032.phpt
+++ b/ext/simplexml/tests/032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: comparing instances
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/033.phpt b/ext/simplexml/tests/033.phpt
index 437af7d41fd..6fd52750ee0 100644
--- a/ext/simplexml/tests/033.phpt
+++ b/ext/simplexml/tests/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: casting instances
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/034.phpt b/ext/simplexml/tests/034.phpt
index 3d52a60a0c2..09b26fe43fd 100644
--- a/ext/simplexml/tests/034.phpt
+++ b/ext/simplexml/tests/034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: cast to array
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $string = '<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/035.phpt b/ext/simplexml/tests/035.phpt
index f6e911962c4..0ba6f324662 100644
--- a/ext/simplexml/tests/035.phpt
+++ b/ext/simplexml/tests/035.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: __toString
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $string = '<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/036.phpt b/ext/simplexml/tests/036.phpt
index acd67c01c61..9c54994eedd 100644
--- a/ext/simplexml/tests/036.phpt
+++ b/ext/simplexml/tests/036.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: overridden count() method
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 class SXE extends SimpleXmlElement {
diff --git a/ext/simplexml/tests/037.phpt b/ext/simplexml/tests/037.phpt
index b18b7fec412..607264a89fa 100644
--- a/ext/simplexml/tests/037.phpt
+++ b/ext/simplexml/tests/037.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: implement Countable
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/038.phpt b/ext/simplexml/tests/038.phpt
index 75d016a5ddf..62334ea859a 100644
--- a/ext/simplexml/tests/038.phpt
+++ b/ext/simplexml/tests/038.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Property assignment return value
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
index 8c512c62522..c5c740afbd5 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXMLElement->addAttribute()
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
     $simple = simplexml_load_file(__DIR__."/book.xml");
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
index 50928ff55e5..8969cf0751d 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt
@@ -3,8 +3,8 @@ SimpleXMLElement: Test to ensure that the required attribute name correctly is g
 --CREDITS--
 Havard Eide <nucleuz@gmail.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) { echo "skip extension not available"; } ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $a = new SimpleXMLElement("<php>testfest</php>");
diff --git a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
index 77abe3301dc..1a0021a09af 100644
--- a/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_getDocNamespaces.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing getDocNamespaces() with invalid XML
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = @new SimpleXMLElement("X",1);
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index cb66922d703..8af58ec2a0a 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing xpath() with invalid XML
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 // gracefully recover from parsing of invalid XML; not available in PHP
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
index bcff7db2db0..b111b0bfb34 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Testing xpath() with invalid XML
+--EXTENSIONS--
+simplexml
 --SKIPIF--
 <?php
-if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded');
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
 --FILE--
diff --git a/ext/simplexml/tests/bug24392.phpt b/ext/simplexml/tests/bug24392.phpt
index 0a0c16b9a94..1a6a245bcfc 100644
--- a/ext/simplexml/tests/bug24392.phpt
+++ b/ext/simplexml/tests/bug24392.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #24392 (empty namespaces causing confusion)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $s = simplexml_load_file(__DIR__.'/bug24392.xml');
diff --git a/ext/simplexml/tests/bug26976.phpt b/ext/simplexml/tests/bug26976.phpt
index 657c229737d..c539e7350f0 100644
--- a/ext/simplexml/tests/bug26976.phpt
+++ b/ext/simplexml/tests/bug26976.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26976 (Can not access array elements using array indices)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug27010.phpt b/ext/simplexml/tests/bug27010.phpt
index e512fbd7b2f..d39a0056eb0 100644
--- a/ext/simplexml/tests/bug27010.phpt
+++ b/ext/simplexml/tests/bug27010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27010 (segfault and node text not displayed when returned from children())
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug35785.phpt b/ext/simplexml/tests/bug35785.phpt
index 420515bb030..6b8f3bbe353 100644
--- a/ext/simplexml/tests/bug35785.phpt
+++ b/ext/simplexml/tests/bug35785.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #35785 (SimpleXML memory read error)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt
index 672e11c750c..a257d5c2ac3 100644
--- a/ext/simplexml/tests/bug36611.phpt
+++ b/ext/simplexml/tests/bug36611.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36611 (assignment to SimpleXML object attribute changes argument type to string)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug37076.phpt b/ext/simplexml/tests/bug37076.phpt
index 41e2f9a4c29..ca732b2583b 100644
--- a/ext/simplexml/tests/bug37076.phpt
+++ b/ext/simplexml/tests/bug37076.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37076 (SimpleXML ignores .=)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = simplexml_load_string("<root><foo /></root>");
diff --git a/ext/simplexml/tests/bug37076_1.phpt b/ext/simplexml/tests/bug37076_1.phpt
index d002c93f085..ed7fecd104c 100644
--- a/ext/simplexml/tests/bug37076_1.phpt
+++ b/ext/simplexml/tests/bug37076_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug37386.phpt b/ext/simplexml/tests/bug37386.phpt
index 92e8cef48bc..6e8b03082ba 100644
--- a/ext/simplexml/tests/bug37386.phpt
+++ b/ext/simplexml/tests/bug37386.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39760 (autocreating element doesn't assign value to first node)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38347.phpt b/ext/simplexml/tests/bug38347.phpt
index 73bcd06e82b..aecf70e3817 100644
--- a/ext/simplexml/tests/bug38347.phpt
+++ b/ext/simplexml/tests/bug38347.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38347 (Segmentation fault when using foreach with an unknown/empty SimpleXMLElement)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt
index 9554280177e..04c928bdcb5 100644
--- a/ext/simplexml/tests/bug38354.phpt
+++ b/ext/simplexml/tests/bug38354.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38354 (Unwanted reformatting of XML when using AsXML)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt
index 7e20c7e7044..41f2df7aaf6 100644
--- a/ext/simplexml/tests/bug38406.phpt
+++ b/ext/simplexml/tests/bug38406.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38406 (crash when assigning objects to SimpleXML attributes)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug38424.phpt b/ext/simplexml/tests/bug38424.phpt
index 560b613c014..c491e5fe735 100644
--- a/ext/simplexml/tests/bug38424.phpt
+++ b/ext/simplexml/tests/bug38424.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38424 (Different attribute assignment if new or exists)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug39662.phpt b/ext/simplexml/tests/bug39662.phpt
index 343aeef7036..68d58af8735 100644
--- a/ext/simplexml/tests/bug39662.phpt
+++ b/ext/simplexml/tests/bug39662.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39662 (Segfault when calling asXML() of a cloned SimpleXMLElement)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug39760.phpt b/ext/simplexml/tests/bug39760.phpt
index 409b43a316a..261aa331404 100644
--- a/ext/simplexml/tests/bug39760.phpt
+++ b/ext/simplexml/tests/bug39760.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39760 (cloning fails on nested SimpleXML-Object)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug40451.phpt b/ext/simplexml/tests/bug40451.phpt
index 7cb01c031f1..646fc7fe067 100644
--- a/ext/simplexml/tests/bug40451.phpt
+++ b/ext/simplexml/tests/bug40451.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40451 (addAttribute() may crash when used with non-existent child node)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt
index 587eecd2650..2f887963d00 100644
--- a/ext/simplexml/tests/bug41175.phpt
+++ b/ext/simplexml/tests/bug41175.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41175 (addAttribute() fails to add an attribute with an empty value)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41582.phpt b/ext/simplexml/tests/bug41582.phpt
index b270f3b6399..f611310485d 100644
--- a/ext/simplexml/tests/bug41582.phpt
+++ b/ext/simplexml/tests/bug41582.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41582 (SimpleXML crashes when accessing newly created element)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41861.phpt b/ext/simplexml/tests/bug41861.phpt
index f87c0614494..c6ce686783f 100644
--- a/ext/simplexml/tests/bug41861.phpt
+++ b/ext/simplexml/tests/bug41861.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41861 (getNamespaces() returns the namespaces of a node's siblings)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41867.phpt b/ext/simplexml/tests/bug41867.phpt
index 4c0b3ac1b52..40aaf4c02d1 100644
--- a/ext/simplexml/tests/bug41867.phpt
+++ b/ext/simplexml/tests/bug41867.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41867 (getName is broken)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug41947.phpt b/ext/simplexml/tests/bug41947.phpt
index 69e1ed0283c..09bc259bf32 100644
--- a/ext/simplexml/tests/bug41947.phpt
+++ b/ext/simplexml/tests/bug41947.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41947 (addChild incorrectly registers empty strings as namespaces)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><root xmlns:myns="http://myns" />');
diff --git a/ext/simplexml/tests/bug42259.phpt b/ext/simplexml/tests/bug42259.phpt
index f817291cdd5..89592546016 100644
--- a/ext/simplexml/tests/bug42259.phpt
+++ b/ext/simplexml/tests/bug42259.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Bug #42259 (SimpleXMLIterator loses ancestry)
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) print 'skip';
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<EOF
diff --git a/ext/simplexml/tests/bug42369.phpt b/ext/simplexml/tests/bug42369.phpt
index 44781b76d38..d896d2f85f8 100644
--- a/ext/simplexml/tests/bug42369.phpt
+++ b/ext/simplexml/tests/bug42369.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42369 (Implicit conversion to string leaks memory)
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) echo 'skip simplexml extension is not loaded'; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
     $xml = '<?xml version="1.0" encoding="utf-8"?>';
diff --git a/ext/simplexml/tests/bug43221.phpt b/ext/simplexml/tests/bug43221.phpt
index a0ef582ec0d..4958829250a 100644
--- a/ext/simplexml/tests/bug43221.phpt
+++ b/ext/simplexml/tests/bug43221.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43221 (SimpleXML adding default namespace in addAttribute)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = simplexml_load_string('<?xml version="1.0" encoding="utf-8"?><root />');
diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt
index 013fceb2359..211db36a2db 100644
--- a/ext/simplexml/tests/bug44478.phpt
+++ b/ext/simplexml/tests/bug44478.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44478 (Inconsistent behaviour when assigning new nodes)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml_element = new simpleXMLElement('<root></root>');
diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt
index f4737bdc86c..34b87f7138e 100644
--- a/ext/simplexml/tests/bug45553.phpt
+++ b/ext/simplexml/tests/bug45553.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45553 (Using XPath to return values for attributes with a namespace does not work)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<XML
diff --git a/ext/simplexml/tests/bug46003.phpt b/ext/simplexml/tests/bug46003.phpt
index 619148e1084..ead0e32bba6 100644
--- a/ext/simplexml/tests/bug46003.phpt
+++ b/ext/simplexml/tests/bug46003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46003 (isset on nonexisting nodes return unexpected results)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml =<<<XML
diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt
index b8899a4312e..e1a7ffa6917 100644
--- a/ext/simplexml/tests/bug46047.phpt
+++ b/ext/simplexml/tests/bug46047.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46047 (SimpleXML converts empty nodes into object with nested array)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>',
diff --git a/ext/simplexml/tests/bug46048.phpt b/ext/simplexml/tests/bug46048.phpt
index 35a9a566256..ff8db4d3ef5 100644
--- a/ext/simplexml/tests/bug46048.phpt
+++ b/ext/simplexml/tests/bug46048.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46048 (SimpleXML top-level @attributes not part of iterator)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = '
diff --git a/ext/simplexml/tests/bug48601.phpt b/ext/simplexml/tests/bug48601.phpt
index 20d6060a365..606e875c36f 100644
--- a/ext/simplexml/tests/bug48601.phpt
+++ b/ext/simplexml/tests/bug48601.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48601 (xpath() returns FALSE for legitimate query)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt
index d5759b21fcc..b0ac921fead 100644
--- a/ext/simplexml/tests/bug51615.phpt
+++ b/ext/simplexml/tests/bug51615.phpt
@@ -1,9 +1,8 @@
 --TEST--
 Bug #51615 (PHP crash with wrong HTML in SimpleXML)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip";
- if (!extension_loaded("dom")) print "skip";
-?>
+--EXTENSIONS--
+simplexml
+dom
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug53033.phpt b/ext/simplexml/tests/bug53033.phpt
index 3da0dbc11ca..2247e9c76f8 100644
--- a/ext/simplexml/tests/bug53033.phpt
+++ b/ext/simplexml/tests/bug53033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53033: Mathematical operations convert objects to integers
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug54973.phpt b/ext/simplexml/tests/bug54973.phpt
index 58891eb3fed..5c9f6ffaca2 100644
--- a/ext/simplexml/tests/bug54973.phpt
+++ b/ext/simplexml/tests/bug54973.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54973: SimpleXML casts integers wrong
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) die('skip simplexml extension not loaded'); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = simplexml_load_string("<xml><number>9223372036854775808</number></xml>");
diff --git a/ext/simplexml/tests/bug61335.phpt b/ext/simplexml/tests/bug61335.phpt
index d2b9477cebf..fc04a8edca2 100644
--- a/ext/simplexml/tests/bug61335.phpt
+++ b/ext/simplexml/tests/bug61335.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #61335 - Access to array node returns wrong truth value
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $rec1 = simplexml_load_string("<foo><bar>aa</bar>\n</foo>");
diff --git a/ext/simplexml/tests/bug62328.phpt b/ext/simplexml/tests/bug62328.phpt
index 64f097136e1..00ab90d0d9f 100644
--- a/ext/simplexml/tests/bug62328.phpt
+++ b/ext/simplexml/tests/bug62328.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62328 (implementing __toString and a cast to string fails)
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 class UberSimpleXML extends SimpleXMLElement {
diff --git a/ext/simplexml/tests/bug62639.phpt b/ext/simplexml/tests/bug62639.phpt
index 8d161836c3d..286e6c5d8fd 100644
--- a/ext/simplexml/tests/bug62639.phpt
+++ b/ext/simplexml/tests/bug62639.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #62639 (XML structure broken)
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug63575.phpt b/ext/simplexml/tests/bug63575.phpt
index 0947ea677de..315d9b9a0f8 100644
--- a/ext/simplexml/tests/bug63575.phpt
+++ b/ext/simplexml/tests/bug63575.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #63575 (Root elements are not properly cloned)
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $xml = '<a><b></b></a>';
diff --git a/ext/simplexml/tests/bug66084_0.phpt b/ext/simplexml/tests/bug66084_0.phpt
index 35f4daf8766..075e244f29a 100644
--- a/ext/simplexml/tests/bug66084_0.phpt
+++ b/ext/simplexml/tests/bug66084_0.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66084 simplexml_load_string() mangles empty node name, var_dump variant
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml not available"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 echo var_dump(simplexml_load_string('<a><b/><c><x/></c></a>')), "\n";
diff --git a/ext/simplexml/tests/bug66084_1.phpt b/ext/simplexml/tests/bug66084_1.phpt
index 794c9c7e9a8..0ff6ec20b65 100644
--- a/ext/simplexml/tests/bug66084_1.phpt
+++ b/ext/simplexml/tests/bug66084_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66084 simplexml_load_string() mangles empty node name, json variant
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml not available"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 echo json_encode(simplexml_load_string('<a><b/><c><x/></c></a>')->c), "\n";
diff --git a/ext/simplexml/tests/bug67116.phpt b/ext/simplexml/tests/bug67116.phpt
index 774e43c99bc..7d58f517581 100644
--- a/ext/simplexml/tests/bug67116.phpt
+++ b/ext/simplexml/tests/bug67116.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #67116 (Inconsistent parsing of Nodes w/o linefeed)
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug67572.phpt b/ext/simplexml/tests/bug67572.phpt
index 4631f161425..57f9db93074 100644
--- a/ext/simplexml/tests/bug67572.phpt
+++ b/ext/simplexml/tests/bug67572.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #67572 - SimpleXMLElement not parsing \n correctly
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $foo = 'bar';
diff --git a/ext/simplexml/tests/bug69169.phpt b/ext/simplexml/tests/bug69169.phpt
index ff0d0e9410e..37d5b53bcec 100644
--- a/ext/simplexml/tests/bug69169.phpt
+++ b/ext/simplexml/tests/bug69169.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #69169 (simplexml_load_string parse wrongly when xml given in one row)
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $a = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/simplexml/tests/bug69491.phpt b/ext/simplexml/tests/bug69491.phpt
index b48a40bf955..aeb29d30c73 100644
--- a/ext/simplexml/tests/bug69491.phpt
+++ b/ext/simplexml/tests/bug69491.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #69491 (simplexml doesn't correctly parse empty nodes on same line as another node)
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 var_dump(simplexml_load_string('<a>
diff --git a/ext/simplexml/tests/bug72588.phpt b/ext/simplexml/tests/bug72588.phpt
index 1f176950547..0cabe95fbc4 100644
--- a/ext/simplexml/tests/bug72588.phpt
+++ b/ext/simplexml/tests/bug72588.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72588 (Using global var doesn't work while accessing SimpleXML element)
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug72957.phpt b/ext/simplexml/tests/bug72957.phpt
index 29ca69fa761..12da2c69621 100644
--- a/ext/simplexml/tests/bug72957.phpt
+++ b/ext/simplexml/tests/bug72957.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72957: Null coalescing operator doesn't behave as expected with SimpleXMLElement
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug72971.phpt b/ext/simplexml/tests/bug72971.phpt
index ff7ded02efa..f59db07f2b6 100644
--- a/ext/simplexml/tests/bug72971.phpt
+++ b/ext/simplexml/tests/bug72971.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72971: SimpleXML isset/unset do not respect namespace
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug72971_2.phpt b/ext/simplexml/tests/bug72971_2.phpt
index aa6e09438c5..302191a71e8 100644
--- a/ext/simplexml/tests/bug72971_2.phpt
+++ b/ext/simplexml/tests/bug72971_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72971 (2): SimpleXML property write does not respect namespace
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/bug74950.phpt b/ext/simplexml/tests/bug74950.phpt
index 86fb2f0f728..cd8a0fca355 100644
--- a/ext/simplexml/tests/bug74950.phpt
+++ b/ext/simplexml/tests/bug74950.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #74950 (null pointer deref in zim_simplexml_element_getDocNamespaces)
+--EXTENSIONS--
+simplexml
 --SKIPIF--
 <?php
-if (!extension_loaded("simplexml")) die("skip SimpleXML not available");
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
 --FILE--
diff --git a/ext/simplexml/tests/bug75245.phpt b/ext/simplexml/tests/bug75245.phpt
index fa795ff6857..e0c6ed9852e 100644
--- a/ext/simplexml/tests/bug75245.phpt
+++ b/ext/simplexml/tests/bug75245.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #75245 Don't set content of elements with only whitespaces
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) die('skip simplexml not available');
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 var_dump(simplexml_load_string('<test1><test2>    </test2><test3></test3></test1>'));
diff --git a/ext/simplexml/tests/bug76712.phpt b/ext/simplexml/tests/bug76712.phpt
index 44bc0be0688..4f864b31a7b 100644
--- a/ext/simplexml/tests/bug76712.phpt
+++ b/ext/simplexml/tests/bug76712.phpt
@@ -1,9 +1,7 @@
 --TEST--
 BUg #76712 (Assignment of empty string creates extraneous text node)
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) die('skip simplexml not available');
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $sxe = new SimpleXMLElement('<foo></foo>');
diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt
index bef8e2a9b89..46b2a20919c 100644
--- a/ext/simplexml/tests/feature55218.phpt
+++ b/ext/simplexml/tests/feature55218.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Bug #55218 getDocNamespaces from current element and not root
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/foreach_by_reference.phpt b/ext/simplexml/tests/foreach_by_reference.phpt
index 070a3cf2cdb..c66014c019f 100644
--- a/ext/simplexml/tests/foreach_by_reference.phpt
+++ b/ext/simplexml/tests/foreach_by_reference.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXml: foreach by reference
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile01.phpt b/ext/simplexml/tests/profile01.phpt
index f9628fd52ba..a92187439c7 100644
--- a/ext/simplexml/tests/profile01.phpt
+++ b/ext/simplexml/tests/profile01.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a simple node
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile02.phpt b/ext/simplexml/tests/profile02.phpt
index 1ec0894d3b4..80abd7dc3b7 100644
--- a/ext/simplexml/tests/profile02.phpt
+++ b/ext/simplexml/tests/profile02.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an array of subnodes
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile03.phpt b/ext/simplexml/tests/profile03.phpt
index 6215ec57b01..b48dcff5ecd 100644
--- a/ext/simplexml/tests/profile03.phpt
+++ b/ext/simplexml/tests/profile03.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an attribute
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile04.phpt b/ext/simplexml/tests/profile04.phpt
index 95907e8e65c..680282725f7 100644
--- a/ext/simplexml/tests/profile04.phpt
+++ b/ext/simplexml/tests/profile04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced element
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 $root = simplexml_load_string('<?xml version="1.0"?>
diff --git a/ext/simplexml/tests/profile05.phpt b/ext/simplexml/tests/profile05.phpt
index f69622118a1..edac419ab5f 100644
--- a/ext/simplexml/tests/profile05.phpt
+++ b/ext/simplexml/tests/profile05.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an aliased namespaced element
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile06.phpt b/ext/simplexml/tests/profile06.phpt
index e519fa9d642..69297c83737 100644
--- a/ext/simplexml/tests/profile06.phpt
+++ b/ext/simplexml/tests/profile06.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced attribute
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile07.phpt b/ext/simplexml/tests/profile07.phpt
index c8a42692743..808a039326d 100644
--- a/ext/simplexml/tests/profile07.phpt
+++ b/ext/simplexml/tests/profile07.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing an aliased namespaced attribute
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile08.phpt b/ext/simplexml/tests/profile08.phpt
index bbb69b75a8c..9e889c6e10c 100644
--- a/ext/simplexml/tests/profile08.phpt
+++ b/ext/simplexml/tests/profile08.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced attribute without a namespace
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile09.phpt b/ext/simplexml/tests/profile09.phpt
index 627ad20b8f5..357eab4f4a3 100644
--- a/ext/simplexml/tests/profile09.phpt
+++ b/ext/simplexml/tests/profile09.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing a namespaced element without a namespace
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile10.phpt b/ext/simplexml/tests/profile10.phpt
index 6ef7456c51e..95b2ad737a9 100644
--- a/ext/simplexml/tests/profile10.phpt
+++ b/ext/simplexml/tests/profile10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing two attributes with the same name, but different namespaces
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile11.phpt b/ext/simplexml/tests/profile11.phpt
index 7d95f44a091..e94940d325f 100644
--- a/ext/simplexml/tests/profile11.phpt
+++ b/ext/simplexml/tests/profile11.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing two elements with the same name, but different namespaces
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);
diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt
index 973508d777c..0e3c125207d 100644
--- a/ext/simplexml/tests/profile12.phpt
+++ b/ext/simplexml/tests/profile12.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing namespaced root and non namespaced children
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/profile13.phpt b/ext/simplexml/tests/profile13.phpt
index 80aad0f4538..8c441654c8b 100644
--- a/ext/simplexml/tests/profile13.phpt
+++ b/ext/simplexml/tests/profile13.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML [profile]: Accessing by namespace prefix
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/simplexml_import_dom.phpt b/ext/simplexml/tests/simplexml_import_dom.phpt
index 82c80e81bc3..3ac15aad0cb 100644
--- a/ext/simplexml/tests/simplexml_import_dom.phpt
+++ b/ext/simplexml/tests/simplexml_import_dom.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SimpleXML [interop]: simplexml_import_dom
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
-<?php if (!extension_loaded("dom")) die("skip dom extension not loaded"); ?>
+--EXTENSIONS--
+simplexml
+dom
 --FILE--
 <?php
 $dom = new domDocument;
diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt
index 80a2a09550b..74056915e42 100644
--- a/ext/simplexml/tests/simplexml_load_file.phpt
+++ b/ext/simplexml/tests/simplexml_load_file.phpt
@@ -1,7 +1,7 @@
 --TEST--
 simplexml_load_file()
---SKIPIF--
-<?php if (!extension_loaded("simplexml")) die("skip"); ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
     $simple = simplexml_load_file(__DIR__."/book.xml");
diff --git a/ext/simplexml/tests/simplexml_uninitialized.phpt b/ext/simplexml/tests/simplexml_uninitialized.phpt
index 0c6cfd1e1e0..ade8b809b7a 100644
--- a/ext/simplexml/tests/simplexml_uninitialized.phpt
+++ b/ext/simplexml/tests/simplexml_uninitialized.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Incorrectly initialized SimpleXmlElement
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/sxe_001.phpt b/ext/simplexml/tests/sxe_001.phpt
index 2c1edd01008..87c463136ca 100644
--- a/ext/simplexml/tests/sxe_001.phpt
+++ b/ext/simplexml/tests/sxe_001.phpt
@@ -1,10 +1,8 @@
 --TEST--
 SPL: SimpleXMLIterator
---SKIPIF--
-<?php
-if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
+libxml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/sxe_002.phpt b/ext/simplexml/tests/sxe_002.phpt
index b3f1b242df5..17dc6347331 100644
--- a/ext/simplexml/tests/sxe_002.phpt
+++ b/ext/simplexml/tests/sxe_002.phpt
@@ -1,10 +1,8 @@
 --TEST--
 SPL: SimpleXMLIterator and recursion
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) print 'skip';
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
+libxml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt
index 0705919b692..5876a1437c5 100644
--- a/ext/simplexml/tests/sxe_003.phpt
+++ b/ext/simplexml/tests/sxe_003.phpt
@@ -1,10 +1,8 @@
 --TEST--
 SPL: SimpleXMLIterator and getChildren()
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) print 'skip';
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
+libxml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt
index 5e103cba5bd..5e6499b018f 100644
--- a/ext/simplexml/tests/sxe_004.phpt
+++ b/ext/simplexml/tests/sxe_004.phpt
@@ -1,10 +1,8 @@
 --TEST--
 SPL: SimpleXMLIterator and overridden iterator methods()
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) print 'skip';
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
+libxml
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/sxe_005.phpt b/ext/simplexml/tests/sxe_005.phpt
index 59fe1d2f9cf..1f25c9ecfde 100644
--- a/ext/simplexml/tests/sxe_005.phpt
+++ b/ext/simplexml/tests/sxe_005.phpt
@@ -1,10 +1,8 @@
 --TEST--
 SPL: SimpleXMLIterator and overridden count()
---SKIPIF--
-<?php
-if (!extension_loaded('simplexml')) print 'skip';
-if (!extension_loaded("libxml")) print "skip LibXML not present";
-?>
+--EXTENSIONS--
+simplexml
+libxml
 --FILE--
 <?php
 
diff --git a/ext/skeleton/tests/001.phpt b/ext/skeleton/tests/001.phpt
index db06b6e09ae..f771be554ba 100644
--- a/ext/skeleton/tests/001.phpt
+++ b/ext/skeleton/tests/001.phpt
@@ -1,11 +1,7 @@
 --TEST--
 Check if %EXTNAME% is loaded
---SKIPIF--
-<?php
-if (!extension_loaded('%EXTNAME%')) {
-    echo 'skip';
-}
-?>
+--EXTENSIONS--
+%EXTNAME%
 --FILE--
 <?php
 echo 'The extension "%EXTNAME%" is available';
diff --git a/ext/skeleton/tests/002.phpt b/ext/skeleton/tests/002.phpt
index 6b42a28db3d..a2e2fe95629 100644
--- a/ext/skeleton/tests/002.phpt
+++ b/ext/skeleton/tests/002.phpt
@@ -1,11 +1,7 @@
 --TEST--
 test1() Basic test
---SKIPIF--
-<?php
-if (!extension_loaded('%EXTNAME%')) {
-    echo 'skip';
-}
-?>
+--EXTENSIONS--
+%EXTNAME%
 --FILE--
 <?php
 $ret = test1();
diff --git a/ext/skeleton/tests/003.phpt b/ext/skeleton/tests/003.phpt
index 0aca2155b55..c6378ac9020 100644
--- a/ext/skeleton/tests/003.phpt
+++ b/ext/skeleton/tests/003.phpt
@@ -1,11 +1,7 @@
 --TEST--
 %EXTNAME%_test2() Basic test
---SKIPIF--
-<?php
-if (!extension_loaded('%EXTNAME%')) {
-    echo 'skip';
-}
-?>
+--EXTENSIONS--
+%EXTNAME%
 --FILE--
 <?php
 var_dump(%EXTNAME%_test2());
diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt
index af9696bf517..489c6c8872c 100644
--- a/ext/soap/tests/any.phpt
+++ b/ext/soap/tests/any.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP handling of <any>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/bug46760.phpt b/ext/soap/tests/bug46760.phpt
index f591e1b3d6a..7ff70861284 100644
--- a/ext/soap/tests/bug46760.phpt
+++ b/ext/soap/tests/bug46760.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46760 (SoapClient doRequest fails when proxy is used)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug47021.phpt b/ext/soap/tests/bug47021.phpt
index b05505dd19e..d3bd9dfdd69 100644
--- a/ext/soap/tests/bug47021.phpt
+++ b/ext/soap/tests/bug47021.phpt
@@ -2,9 +2,10 @@
 Bug #47021 SoapClient (SoapClient stumbles over WSDL delivered with "Transfer-Encoding: chunked")
 --INI--
 soap.wsdl_cache_enabled=0
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-require 'skipif.inc';
 require __DIR__.'/../../standard/tests/http/server.inc';
 http_server_skipif();
 --FILE--
diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt
index e4c4e893423..5c5671d240c 100644
--- a/ext/soap/tests/bug48557.phpt
+++ b/ext/soap/tests/bug48557.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48557 (Numeric string keys in Apache Hashmaps are not cast to integers)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/ext/soap/tests/bug49898.phpt b/ext/soap/tests/bug49898.phpt
index eea4ea490a9..70e8912188e 100644
--- a/ext/soap/tests/bug49898.phpt
+++ b/ext/soap/tests/bug49898.phpt
@@ -2,8 +2,8 @@
 Test for bug #49898: SoapClient::__getCookies() implementation
 --CREDITS--
 Boro Sitnikovski <buritomath@yahoo.com>
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(null, array('uri' => 'mo:http://www.w3.org/', 'location' => 'http://some.url'));
diff --git a/ext/soap/tests/bug68361.phpt b/ext/soap/tests/bug68361.phpt
index 6dbba8a4259..e34ab4bc5d4 100644
--- a/ext/soap/tests/bug68361.phpt
+++ b/ext/soap/tests/bug68361.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68361 Segmentation fault on SoapClient::__getTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug68996.phpt b/ext/soap/tests/bug68996.phpt
index 5168e1fcfc6..edae5c953d3 100644
--- a/ext/soap/tests/bug68996.phpt
+++ b/ext/soap/tests/bug68996.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #68996 (Invalid free of CG(interned_empty_string))
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
 if (getenv("USE_ZEND_ALLOC") !== "0")
diff --git a/ext/soap/tests/bug69137.phpt b/ext/soap/tests/bug69137.phpt
index d34ba13e3e0..c58a782c8a3 100644
--- a/ext/soap/tests/bug69137.phpt
+++ b/ext/soap/tests/bug69137.phpt
@@ -1,8 +1,9 @@
 --TEST--
 SOAP Bug #69137 - Peer verification fails when using a proxy with SoapClient
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (getenv("SKIP_ONLINE_TESTS")) { die("skip test requiring internet connection"); }
 if (!getenv('http_proxy')) { die("skip test unless an HTTP/HTTPS proxy server is specified in http_proxy environment variable"); }
 ?>
diff --git a/ext/soap/tests/bug69668.phpt b/ext/soap/tests/bug69668.phpt
index 59b3aa648fc..88785ca7993 100644
--- a/ext/soap/tests/bug69668.phpt
+++ b/ext/soap/tests/bug69668.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #69668 (SOAP: special XML characters in namespace URIs not encoded)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class MySoapClient extends SoapClient {
diff --git a/ext/soap/tests/bug70211.phpt b/ext/soap/tests/bug70211.phpt
index bd1f94ecef4..d17c43a7fbd 100644
--- a/ext/soap/tests/bug70211.phpt
+++ b/ext/soap/tests/bug70211.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free)
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug70388.phpt b/ext/soap/tests/bug70388.phpt
index fc67de1142a..4415daabd23 100644
--- a/ext/soap/tests/bug70388.phpt
+++ b/ext/soap/tests/bug70388.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70388 (SOAP serialize_function_call() type confusion / RCE)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $dummy = unserialize('O:10:"SoapClient":3:{s:3:"uri";s:1:"X";s:8:"location";s:22:"http://localhost/a.xml";s:17:"__default_headers";a:1:{i:1;s:1337:"'.str_repeat("X", 1337).'";}}');
diff --git a/ext/soap/tests/bug70875.phpt b/ext/soap/tests/bug70875.phpt
index 86a16697ce3..5ae48a39339 100644
--- a/ext/soap/tests/bug70875.phpt
+++ b/ext/soap/tests/bug70875.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Bug #70875 - Segmentation fault if wsdl has no targetNamespace attribute
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bug71610.phpt b/ext/soap/tests/bug71610.phpt
index f88124d50c0..92491d05769 100644
--- a/ext/soap/tests/bug71610.phpt
+++ b/ext/soap/tests/bug71610.phpt
@@ -1,8 +1,9 @@
 --TEST--
 SOAP Bug #71610 - Type Confusion Vulnerability - SOAP / make_http_soap_request()
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 ?>
 --FILE--
diff --git a/ext/soap/tests/bug71711.phpt b/ext/soap/tests/bug71711.phpt
index ec3930c6a50..61e89fd049d 100644
--- a/ext/soap/tests/bug71711.phpt
+++ b/ext/soap/tests/bug71711.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71711: Soap Server Member variables reference bug
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug71996.phpt b/ext/soap/tests/bug71996.phpt
index 9f341fbc5e9..5924aa2dfad 100644
--- a/ext/soap/tests/bug71996.phpt
+++ b/ext/soap/tests/bug71996.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71996: Using references in arrays doesn't work like expected
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt
index 8060575bd88..4cf46eb373a 100644
--- a/ext/soap/tests/bug73037.phpt
+++ b/ext/soap/tests/bug73037.phpt
@@ -1,12 +1,10 @@
 --TEST--
 Bug #73037 SoapServer reports Bad Request when gzipped, var 0
+--EXTENSIONS--
+soap
+zlib
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
-    if (!extension_loaded("zlib")) {
-        echo "skip zlib is required for this test";
-    }
-
     if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
         echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
     }
diff --git a/ext/soap/tests/bug73452.phpt b/ext/soap/tests/bug73452.phpt
index 75f8c270168..57a5786a3f3 100644
--- a/ext/soap/tests/bug73452.phpt
+++ b/ext/soap/tests/bug73452.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73452 Segfault (Regression for #69152)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug77088.phpt b/ext/soap/tests/bug77088.phpt
index b402ef88966..6171cac746f 100644
--- a/ext/soap/tests/bug77088.phpt
+++ b/ext/soap/tests/bug77088.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77088 (Segfault when using SoapClient with null options)
---SKIPIF--
-<?php
-    require_once('skipif.inc');
-?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug77410.phpt b/ext/soap/tests/bug77410.phpt
index 4c36e6e9da4..5319a8f4173 100644
--- a/ext/soap/tests/bug77410.phpt
+++ b/ext/soap/tests/bug77410.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77410: Segmentation Fault when executing method with an empty parameter
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug79357.phpt b/ext/soap/tests/bug79357.phpt
index da3cce5dc26..65a1c77fc9b 100644
--- a/ext/soap/tests/bug79357.phpt
+++ b/ext/soap/tests/bug79357.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79357: SOAP request segfaults when any request parameter is missing
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bug79536.phpt b/ext/soap/tests/bug79536.phpt
index b1cbb8de77f..19f38f35f8b 100644
--- a/ext/soap/tests/bug79536.phpt
+++ b/ext/soap/tests/bug79536.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #79536 (zend_clear_exception prevent exception's destructor to be called)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bug80672.phpt b/ext/soap/tests/bug80672.phpt
index 71e2b1d8410..1ae0c32556d 100644
--- a/ext/soap/tests/bug80672.phpt
+++ b/ext/soap/tests/bug80672.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #80672 Null Dereference in SoapClient
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 try {
diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt
index 847c09286c0..3315b714018 100644
--- a/ext/soap/tests/bugs/bug27722.phpt
+++ b/ext/soap/tests/bugs/bug27722.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27722 (Segfault on schema without targetNamespace)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --GET--
 wsdl
 --INI--
diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt
index adc4fe582e8..02b27dc0144 100644
--- a/ext/soap/tests/bugs/bug27742.phpt
+++ b/ext/soap/tests/bugs/bug27742.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #27742 (WDSL SOAP Parsing Schema bug)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --GET--
 wsdl
 --INI--
diff --git a/ext/soap/tests/bugs/bug28751.phpt b/ext/soap/tests/bugs/bug28751.phpt
index 4b64b62a064..a61b10a79c0 100644
--- a/ext/soap/tests/bugs/bug28751.phpt
+++ b/ext/soap/tests/bugs/bug28751.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #28751 (SoapServer does not call _autoload())
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 spl_autoload_register(function ($className) {
diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt
index 56c55382231..37c81cac78b 100644
--- a/ext/soap/tests/bugs/bug28969.phpt
+++ b/ext/soap/tests/bugs/bug28969.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #28969 (Wrong data encoding of special characters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/bugs/bug28985.phpt b/ext/soap/tests/bugs/bug28985.phpt
index 0c3f1432aac..4b8bd423e32 100644
--- a/ext/soap/tests/bugs/bug28985.phpt
+++ b/ext/soap/tests/bugs/bug28985.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #28985 (__getTypes() returning nothing on complex WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt
index 7cefe449954..50aec20a840 100644
--- a/ext/soap/tests/bugs/bug29061.phpt
+++ b/ext/soap/tests/bugs/bug29061.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29061 (soap extension segfaults)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt
index 969783ca29a..e480b3d42f1 100644
--- a/ext/soap/tests/bugs/bug29109.phpt
+++ b/ext/soap/tests/bugs/bug29109.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29109 (Uncaught SoapFault exception: [WSDL] Out of memory)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt
index f1d7b0e10fb..7457a362a1e 100644
--- a/ext/soap/tests/bugs/bug29236.phpt
+++ b/ext/soap/tests/bugs/bug29236.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29236 (memory error when wsdl-cache is enabled)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=1
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt
index 38d4da3a8d0..109bc37f5ab 100644
--- a/ext/soap/tests/bugs/bug29795.phpt
+++ b/ext/soap/tests/bugs/bug29795.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29795 (SegFault with Soap and Amazon's Web Services)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=1
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29830.phpt b/ext/soap/tests/bugs/bug29830.phpt
index adbbd7ffa55..25640f9738b 100644
--- a/ext/soap/tests/bugs/bug29830.phpt
+++ b/ext/soap/tests/bugs/bug29830.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29844 (SoapServer::setClass() should not export non-public methods)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
index 3d2bcfbfc2f..ff479592fd3 100644
--- a/ext/soap/tests/bugs/bug29839.phpt
+++ b/ext/soap/tests/bugs/bug29839.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29839 (incorrect convert (xml:lang to lang))
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt
index 3e86c26840e..87faf9fc698 100644
--- a/ext/soap/tests/bugs/bug29844.phpt
+++ b/ext/soap/tests/bugs/bug29844.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29844 (SOAP doesn't return the result of a valid SOAP request)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt
index 63fbadc639c..3c2a0b85865 100644
--- a/ext/soap/tests/bugs/bug30045.phpt
+++ b/ext/soap/tests/bugs/bug30045.phpt
@@ -1,10 +1,8 @@
 --TEST--
 Bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests)
---SKIPIF--
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-  if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
-?>
+--EXTENSIONS--
+soap
+simplexml
 --INI--
 soap.wsdl_cache_enabled=1
 --FILE--
diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
index 96709d6aa3b..40f2fa173ad 100644
--- a/ext/soap/tests/bugs/bug30106.phpt
+++ b/ext/soap/tests/bugs/bug30106.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30106 (SOAP cannot not parse 'ref' element. Causes Uncaught SoapFault exception)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled", 0);
diff --git a/ext/soap/tests/bugs/bug30175.phpt b/ext/soap/tests/bugs/bug30175.phpt
index 9af18bc34d9..396d554def4 100644
--- a/ext/soap/tests/bugs/bug30175.phpt
+++ b/ext/soap/tests/bugs/bug30175.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30175 (SOAP results aren't parsed correctly)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt
index 81079efbb72..181d4a88b03 100644
--- a/ext/soap/tests/bugs/bug30799.phpt
+++ b/ext/soap/tests/bugs/bug30799.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30799 (SoapServer doesn't handle private or protected properties)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class foo {
diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
index 89b61cc019d..ba9ba15dc9c 100644
--- a/ext/soap/tests/bugs/bug30928.phpt
+++ b/ext/soap/tests/bugs/bug30928.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30928 (When Using WSDL, SoapServer doesn't handle private or protected properties)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled", 0);
diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt
index d91783cfd07..5eeb9476f6f 100644
--- a/ext/soap/tests/bugs/bug30994.phpt
+++ b/ext/soap/tests/bugs/bug30994.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30994 (SOAP server unable to handle request with references)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt
index a7d3efcdb68..cce7d2aa0f1 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #31422 (No Error-Logging on SoapServer-Side)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+soap
 --INI--
 log_errors=1
 error_log=
diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
index abf4168c307..62345827eab 100644
--- a/ext/soap/tests/bugs/bug31695.phpt
+++ b/ext/soap/tests/bugs/bug31695.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #31695 (Cannot redefine endpoint when using WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled", 0);
diff --git a/ext/soap/tests/bugs/bug31755.phpt b/ext/soap/tests/bugs/bug31755.phpt
index aff600e39ae..dcd9aa1d338 100644
--- a/ext/soap/tests/bugs/bug31755.phpt
+++ b/ext/soap/tests/bugs/bug31755.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #31422 (No Error-Logging on SoapServer-Side)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client=new SOAPClient(null, array('location' => 'http://localhost',
diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
index 978dce877d6..257cb50e992 100644
--- a/ext/soap/tests/bugs/bug32776.phpt
+++ b/ext/soap/tests/bugs/bug32776.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #32776 (SOAP doesn't support one-way operations)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt
index 59bd06992b2..dda282edfc7 100644
--- a/ext/soap/tests/bugs/bug32941.phpt
+++ b/ext/soap/tests/bugs/bug32941.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #32941 (Sending structured exception kills a php)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt
index f4aa222477c..8cb246e5e5b 100644
--- a/ext/soap/tests/bugs/bug34449.phpt
+++ b/ext/soap/tests/bugs/bug34449.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34449 (ext/soap: XSD_ANYXML functionality not exposed)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
index cdaadd5c735..eaf7968398e 100644
--- a/ext/soap/tests/bugs/bug34453.phpt
+++ b/ext/soap/tests/bugs/bug34453.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #29839 (incorrect convert (xml:lang to lang))
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt
index a4acfa35d63..651027b1b17 100644
--- a/ext/soap/tests/bugs/bug34643.phpt
+++ b/ext/soap/tests/bugs/bug34643.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34643 (wsdl default value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt
index ddf5d2fee00..11a121fc894 100644
--- a/ext/soap/tests/bugs/bug34657.phpt
+++ b/ext/soap/tests/bugs/bug34657.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #34657 (If you get a communication problem when loading the WSDL, it fatal's)
---SKIPIF--
-<?php
-require_once('skipif.inc');
-?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 try {
diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
index 840dc8e9a8a..9bc4e308701 100644
--- a/ext/soap/tests/bugs/bug35142.phpt
+++ b/ext/soap/tests/bugs/bug35142.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #35142 (SOAP Client/Server Complex Object Support)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt
index 72c44adbb32..c2839ed793b 100644
--- a/ext/soap/tests/bugs/bug35273.phpt
+++ b/ext/soap/tests/bugs/bug35273.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #35273 (Error in mapping soap - java types)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36226-2.phpt b/ext/soap/tests/bugs/bug36226-2.phpt
index bc9b05a856b..3b77bb36f1f 100644
--- a/ext/soap/tests/bugs/bug36226-2.phpt
+++ b/ext/soap/tests/bugs/bug36226-2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36226 (Inconsistent handling when passing nillable arrays)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
index 5bb3db9fe73..eec034438c8 100644
--- a/ext/soap/tests/bugs/bug36226.phpt
+++ b/ext/soap/tests/bugs/bug36226.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36226 (SOAP Inconsistent handling when passing potential arrays)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36575.phpt b/ext/soap/tests/bugs/bug36575.phpt
index dd5a5d99f1f..b215ebc0fa8 100644
--- a/ext/soap/tests/bugs/bug36575.phpt
+++ b/ext/soap/tests/bugs/bug36575.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36575 (Incorrect complex type instantiation with hierarchies)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36614.phpt b/ext/soap/tests/bugs/bug36614.phpt
index 86d312dfe47..0be0cb440cd 100644
--- a/ext/soap/tests/bugs/bug36614.phpt
+++ b/ext/soap/tests/bugs/bug36614.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36614 (Segfault when using Soap)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36629.phpt b/ext/soap/tests/bugs/bug36629.phpt
index 2096da26a65..3b90ba6f45c 100644
--- a/ext/soap/tests/bugs/bug36629.phpt
+++ b/ext/soap/tests/bugs/bug36629.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36629 (SoapServer::handle() exits on SOAP faults)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test1() {
diff --git a/ext/soap/tests/bugs/bug36908.phpt b/ext/soap/tests/bugs/bug36908.phpt
index cc3f75847df..c6e9e8a9fc6 100644
--- a/ext/soap/tests/bugs/bug36908.phpt
+++ b/ext/soap/tests/bugs/bug36908.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #36908 (wsdl default value overrides value in soap request)
---SKIPIF--
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt
index c9d03f57bdd..150cdad6a15 100644
--- a/ext/soap/tests/bugs/bug36999.phpt
+++ b/ext/soap/tests/bugs/bug36999.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #36999 (xsd:long values clamped to LONG_MAX instead of using double)
---SKIPIF--
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug37013.phpt b/ext/soap/tests/bugs/bug37013.phpt
index 492242d7d56..99486413ee8 100644
--- a/ext/soap/tests/bugs/bug37013.phpt
+++ b/ext/soap/tests/bugs/bug37013.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #37013 (server hangs when returning circular object references)
---SKIPIF--
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt
index 89b808eaa13..55a6278078d 100644
--- a/ext/soap/tests/bugs/bug37083.phpt
+++ b/ext/soap/tests/bugs/bug37083.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37083 (Frequent crashs in SOAP extension with new WSDL caching code in multithread WS)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache=3
 --FILE--
diff --git a/ext/soap/tests/bugs/bug37278.phpt b/ext/soap/tests/bugs/bug37278.phpt
index f3fd7c17b4e..0d0ef5ae7ee 100644
--- a/ext/soap/tests/bugs/bug37278.phpt
+++ b/ext/soap/tests/bugs/bug37278.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37278 (SOAP not respecting uri in __soapCall)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $options = array(
diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt
index 81b8ffc5035..1113ae73a4c 100644
--- a/ext/soap/tests/bugs/bug38004.phpt
+++ b/ext/soap/tests/bugs/bug38004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38004 (Parameters in SoapServer are decoded twice)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt
index 6219141ab97..0efa8e03954 100644
--- a/ext/soap/tests/bugs/bug38005.phpt
+++ b/ext/soap/tests/bugs/bug38005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38005 (SoapFault faultstring doesn't follow encoding rules)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt
index df97e1034d4..5a9c1d5d36a 100644
--- a/ext/soap/tests/bugs/bug38055.phpt
+++ b/ext/soap/tests/bugs/bug38055.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38055 (Wrong interpretation of boolean parameters)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt
index 0b935f30c24..a5f4a055697 100644
--- a/ext/soap/tests/bugs/bug38067.phpt
+++ b/ext/soap/tests/bugs/bug38067.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38067 (Parameters are not decoded from utf-8 when using encoding option)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug38536.phpt b/ext/soap/tests/bugs/bug38536.phpt
index bbd166de42b..59b432ab46d 100644
--- a/ext/soap/tests/bugs/bug38536.phpt
+++ b/ext/soap/tests/bugs/bug38536.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38536 (SOAP returns an array of values instead of an object)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug39121.phpt b/ext/soap/tests/bugs/bug39121.phpt
index caa7f6cce99..d4256092af0 100644
--- a/ext/soap/tests/bugs/bug39121.phpt
+++ b/ext/soap/tests/bugs/bug39121.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39121 (Incorrect return array handling in non-wsdl soap client)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt
index cc5977b5817..c67614a7972 100644
--- a/ext/soap/tests/bugs/bug39815.phpt
+++ b/ext/soap/tests/bugs/bug39815.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not locale-independent)
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-require_once('skipif.inc');
 if (!@setlocale(LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE locale not available');
 if (!@setlocale(LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US locale not available');
 ?>
diff --git a/ext/soap/tests/bugs/bug39832.phpt b/ext/soap/tests/bugs/bug39832.phpt
index a4c4639f492..f5742c70984 100644
--- a/ext/soap/tests/bugs/bug39832.phpt
+++ b/ext/soap/tests/bugs/bug39832.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39832 (SOAP Server: parameter not matching the WSDL specified type are set to 0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug40609.phpt b/ext/soap/tests/bugs/bug40609.phpt
index ab07536c312..72172fc437c 100644
--- a/ext/soap/tests/bugs/bug40609.phpt
+++ b/ext/soap/tests/bugs/bug40609.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #40609 (Segfaults when using more than one SoapVar in a request)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt
index 442e147bbc6..03e20e6bbf1 100644
--- a/ext/soap/tests/bugs/bug41004.phpt
+++ b/ext/soap/tests/bugs/bug41004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41004 (minOccurs="0" and null class member variable)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set('soap.wsdl_cache_enabled', false);
diff --git a/ext/soap/tests/bugs/bug41097.phpt b/ext/soap/tests/bugs/bug41097.phpt
index a9cfd14140f..8712f8a2451 100644
--- a/ext/soap/tests/bugs/bug41097.phpt
+++ b/ext/soap/tests/bugs/bug41097.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41097 (ext/soap returning associative array as indexed without using WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test($soap, $array) {
diff --git a/ext/soap/tests/bugs/bug41337.phpt b/ext/soap/tests/bugs/bug41337.phpt
index 5a4586afe12..5143a04ca92 100644
--- a/ext/soap/tests/bugs/bug41337.phpt
+++ b/ext/soap/tests/bugs/bug41337.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41337 (WSDL parsing doesn't ignore non soap bindings)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled",0);
diff --git a/ext/soap/tests/bugs/bug41337_2.phpt b/ext/soap/tests/bugs/bug41337_2.phpt
index 61863d364cb..379ecb8d93e 100644
--- a/ext/soap/tests/bugs/bug41337_2.phpt
+++ b/ext/soap/tests/bugs/bug41337_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41337 (WSDL parsing doesn't ignore non soap bindings)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled",0);
diff --git a/ext/soap/tests/bugs/bug41566.phpt b/ext/soap/tests/bugs/bug41566.phpt
index bbf61ce04ef..909be76c81c 100644
--- a/ext/soap/tests/bugs/bug41566.phpt
+++ b/ext/soap/tests/bugs/bug41566.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41566 (SOAP Server not properly generating href attributes)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt
index 0d4d30486fc..4f51c0af9db 100644
--- a/ext/soap/tests/bugs/bug42086.phpt
+++ b/ext/soap/tests/bugs/bug42086.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug42151.phpt b/ext/soap/tests/bugs/bug42151.phpt
index f945a8753e5..6f5c0c42077 100644
--- a/ext/soap/tests/bugs/bug42151.phpt
+++ b/ext/soap/tests/bugs/bug42151.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42151 (__destruct functions not called after catching a SoapFault exception)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class foo {
diff --git a/ext/soap/tests/bugs/bug42183.phpt b/ext/soap/tests/bugs/bug42183.phpt
index f78cac0e568..c9ea99d1195 100644
--- a/ext/soap/tests/bugs/bug42183.phpt
+++ b/ext/soap/tests/bugs/bug42183.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42183 (classmap cause crash in non-wsdl mode )
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class PHPObject {
diff --git a/ext/soap/tests/bugs/bug42214.phpt b/ext/soap/tests/bugs/bug42214.phpt
index 64cd631bc7c..171a927023f 100644
--- a/ext/soap/tests/bugs/bug42214.phpt
+++ b/ext/soap/tests/bugs/bug42214.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42214 (SoapServer sends clients internal PHP errors)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $request = <<<EOF
diff --git a/ext/soap/tests/bugs/bug42326.phpt b/ext/soap/tests/bugs/bug42326.phpt
index 1eabaa14da3..5324c0a7a17 100644
--- a/ext/soap/tests/bugs/bug42326.phpt
+++ b/ext/soap/tests/bugs/bug42326.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42326 (SoapServer crash)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug42359.phpt b/ext/soap/tests/bugs/bug42359.phpt
index 0dff8918032..0cb4f75c69b 100644
--- a/ext/soap/tests/bugs/bug42359.phpt
+++ b/ext/soap/tests/bugs/bug42359.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42326 (SoapServer crash)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug42488.phpt b/ext/soap/tests/bugs/bug42488.phpt
index e7edc79f9ef..992a5d3db6c 100644
--- a/ext/soap/tests/bugs/bug42488.phpt
+++ b/ext/soap/tests/bugs/bug42488.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42488 (SoapServer reports an encoding error and the error itself breaks)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug42692.phpt b/ext/soap/tests/bugs/bug42692.phpt
index 0a1310ab9e2..42869ad7eec 100644
--- a/ext/soap/tests/bugs/bug42692.phpt
+++ b/ext/soap/tests/bugs/bug42692.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #42692 (Procedure 'int1' not present with doc/lit SoapServer)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set('soap.wsdl_cache_enabled','0');
diff --git a/ext/soap/tests/bugs/bug43045.phpt b/ext/soap/tests/bugs/bug43045.phpt
index 4271410b0c4..4f696c21bd4 100644
--- a/ext/soap/tests/bugs/bug43045.phpt
+++ b/ext/soap/tests/bugs/bug43045.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43045i (SOAP encoding violation on "INF" for type double/float)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test($x) {
diff --git a/ext/soap/tests/bugs/bug44686.phpt b/ext/soap/tests/bugs/bug44686.phpt
index 81ed1cf6ec8..70261ab5b36 100644
--- a/ext/soap/tests/bugs/bug44686.phpt
+++ b/ext/soap/tests/bugs/bug44686.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44686 (SOAP-ERROR: Parsing WSDL with references)
---SKIPIF--
-<?php require_once 'skipif.inc'; ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug44811.phpt b/ext/soap/tests/bugs/bug44811.phpt
index 08e06041008..4fee5e9ec4c 100644
--- a/ext/soap/tests/bugs/bug44811.phpt
+++ b/ext/soap/tests/bugs/bug44811.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Bug #44811 (Improve error messages when creating new SoapClient which contains invalid data)
+--EXTENSIONS--
+soap
 --SKIPIF--
-<?php require_once 'skipif.inc'; ?>
 <?php if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?>
 --INI--
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/bugs/bug44882.phpt b/ext/soap/tests/bugs/bug44882.phpt
index 8357b0c979b..b8b375ceb2e 100644
--- a/ext/soap/tests/bugs/bug44882.phpt
+++ b/ext/soap/tests/bugs/bug44882.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44882 (SOAP extension object decoding bug)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug46419.phpt b/ext/soap/tests/bugs/bug46419.phpt
index d5f9751ed54..7f7eb839e3e 100644
--- a/ext/soap/tests/bugs/bug46419.phpt
+++ b/ext/soap/tests/bugs/bug46419.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46419 (Elements of associative arrays with NULL value are lost)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function bar() {
diff --git a/ext/soap/tests/bugs/bug46427.phpt b/ext/soap/tests/bugs/bug46427.phpt
index 3d0b1a4d512..edf1ed542d5 100644
--- a/ext/soap/tests/bugs/bug46427.phpt
+++ b/ext/soap/tests/bugs/bug46427.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46427 (SoapClient() stumbles over its "stream_context" parameter)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bugs/bug47049.phpt b/ext/soap/tests/bugs/bug47049.phpt
index 7ffc15d0cd0..0716c49ff91 100644
--- a/ext/soap/tests/bugs/bug47049.phpt
+++ b/ext/soap/tests/bugs/bug47049.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47049 (SoapClient::__soapCall causes a segmentation fault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt
index a393b701ab5..d6bcfb6ef9a 100644
--- a/ext/soap/tests/bugs/bug47273.phpt
+++ b/ext/soap/tests/bugs/bug47273.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #47273 (Encoding bug in SoapServer->fault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $request1 = <<<EOF
diff --git a/ext/soap/tests/bugs/bug50675.phpt b/ext/soap/tests/bugs/bug50675.phpt
index 5ff2ee06234..51cf4942bda 100644
--- a/ext/soap/tests/bugs/bug50675.phpt
+++ b/ext/soap/tests/bugs/bug50675.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50675 SoapClient can't handle object references correctly.
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bugs/bug50698_1.phpt b/ext/soap/tests/bugs/bug50698_1.phpt
index 064ef1eea88..8b1f9cfa9ff 100644
--- a/ext/soap/tests/bugs/bug50698_1.phpt
+++ b/ext/soap/tests/bugs/bug50698_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Request #50698_1 (SoapClient should handle wsdls with some incompatible endpoints)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug50698_2.phpt b/ext/soap/tests/bugs/bug50698_2.phpt
index ac2214e8306..9420bc21f39 100644
--- a/ext/soap/tests/bugs/bug50698_2.phpt
+++ b/ext/soap/tests/bugs/bug50698_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Request #50698_2 (SoapClient should handle wsdls with some incompatible endpoints -- EDGECASE: Large mix of compatible and incompatible endpoints.)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug50698_3.phpt b/ext/soap/tests/bugs/bug50698_3.phpt
index b29ab2b9c8e..6c75a21c009 100644
--- a/ext/soap/tests/bugs/bug50698_3.phpt
+++ b/ext/soap/tests/bugs/bug50698_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Request #50698_3 (SoapClient should handle wsdls with some incompatible endpoints -- EDGECASE: Large set of endpoints all incompatible.)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug50698_4.phpt b/ext/soap/tests/bugs/bug50698_4.phpt
index aea3204661c..0fd32eb4f01 100644
--- a/ext/soap/tests/bugs/bug50698_4.phpt
+++ b/ext/soap/tests/bugs/bug50698_4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Request #50698_4 (SoapClient should handle wsdls with some incompatible endpoints)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug50762.phpt b/ext/soap/tests/bugs/bug50762.phpt
index d8ed9ce5445..c54de7deeff 100644
--- a/ext/soap/tests/bugs/bug50762.phpt
+++ b/ext/soap/tests/bugs/bug50762.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50762 (in WSDL mode Soap Header handler function only being called if defined in WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class testSoap {
diff --git a/ext/soap/tests/bugs/bug50997.phpt b/ext/soap/tests/bugs/bug50997.phpt
index 0508aaccdcb..8d5756a3671 100644
--- a/ext/soap/tests/bugs/bug50997.phpt
+++ b/ext/soap/tests/bugs/bug50997.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug54911.phpt b/ext/soap/tests/bugs/bug54911.phpt
index a974c22901b..217923fe965 100644
--- a/ext/soap/tests/bugs/bug54911.phpt
+++ b/ext/soap/tests/bugs/bug54911.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54911 (Access to a undefined member in inherit SoapClient may cause Segmentation Fault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
     class XSoapClient extends SoapClient {
diff --git a/ext/soap/tests/bugs/bug55323.phpt b/ext/soap/tests/bugs/bug55323.phpt
index fddb434f4aa..3358e4a93eb 100644
--- a/ext/soap/tests/bugs/bug55323.phpt
+++ b/ext/soap/tests/bugs/bug55323.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled",0);
diff --git a/ext/soap/tests/bugs/bug65018.phpt b/ext/soap/tests/bugs/bug65018.phpt
index 762f4f6ec44..f91e95d6a88 100644
--- a/ext/soap/tests/bugs/bug65018.phpt
+++ b/ext/soap/tests/bugs/bug65018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65018 (SoapHeader problems with SoapServer)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
     class Tool{
diff --git a/ext/soap/tests/bugs/bug66112.phpt b/ext/soap/tests/bugs/bug66112.phpt
index 7dd067d614e..d0a353be866 100644
--- a/ext/soap/tests/bugs/bug66112.phpt
+++ b/ext/soap/tests/bugs/bug66112.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66112 (Use after free condition in SOAP extension)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug69085.phpt b/ext/soap/tests/bugs/bug69085.phpt
index 468b9bb5acb..b23eb4426ac 100644
--- a/ext/soap/tests/bugs/bug69085.phpt
+++ b/ext/soap/tests/bugs/bug69085.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69085 (SoapClient's __call() type confusion through unserialize())
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug69462.phpt b/ext/soap/tests/bugs/bug69462.phpt
index 003d62e495c..da9375ae80c 100644
--- a/ext/soap/tests/bugs/bug69462.phpt
+++ b/ext/soap/tests/bugs/bug69462.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69462 (__soapCall with a SoapVar that has a namespace but no name crashes)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $namespace = "http://example.com/ns";
diff --git a/ext/soap/tests/bugs/bug70469.phpt b/ext/soap/tests/bugs/bug70469.phpt
index b3f4ba01a79..738409b2603 100644
--- a/ext/soap/tests/bugs/bug70469.phpt
+++ b/ext/soap/tests/bugs/bug70469.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70469 (SoapClient should not generate E_ERROR if exceptions enabled)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 try {
diff --git a/ext/soap/tests/bugs/bug73237.phpt b/ext/soap/tests/bugs/bug73237.phpt
index cbff30e612e..e9d7c19edb0 100644
--- a/ext/soap/tests/bugs/bug73237.phpt
+++ b/ext/soap/tests/bugs/bug73237.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73237 "Any" data missing when result includes a struct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/bug73538.phpt b/ext/soap/tests/bugs/bug73538.phpt
index 1bf0372419d..fbaf9a220be 100644
--- a/ext/soap/tests/bugs/bug73538.phpt
+++ b/ext/soap/tests/bugs/bug73538.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP: SoapClient::__setHeaders array overrides previous headers
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bugs/bug75502.phpt b/ext/soap/tests/bugs/bug75502.phpt
index d9630ed658e..553ab56f5b1 100644
--- a/ext/soap/tests/bugs/bug75502.phpt
+++ b/ext/soap/tests/bugs/bug75502.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #75502 (Segmentation fault in zend_string_release)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=1
 soap.wsdl_cache=2
diff --git a/ext/soap/tests/bugs/bug76348.phpt b/ext/soap/tests/bugs/bug76348.phpt
index 3049880dce6..f5fdd2e8729 100644
--- a/ext/soap/tests/bugs/bug76348.phpt
+++ b/ext/soap/tests/bugs/bug76348.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #76348 (WSDL_CACHE_MEMORY causes Segmentation fault)
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-if (!extension_loaded('soap')) die('skip soap extension not available');
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 ?>
 --FILE--
diff --git a/ext/soap/tests/bugs/bug77141.phpt b/ext/soap/tests/bugs/bug77141.phpt
index 268e3e049c5..f438328b0c4 100644
--- a/ext/soap/tests/bugs/bug77141.phpt
+++ b/ext/soap/tests/bugs/bug77141.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77141 (Signedness issue in SOAP when precision=-1)
---SKIPIF--
-<?php
-if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $soap = new \SoapClient(
diff --git a/ext/soap/tests/bugs/bug77945.phpt b/ext/soap/tests/bugs/bug77945.phpt
index 5800330542f..ccf1ad3250a 100644
--- a/ext/soap/tests/bugs/bug77945.phpt
+++ b/ext/soap/tests/bugs/bug77945.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77945: Segmentation fault when constructing SoapClient with WSDL_CACHE_BOTH
---SKIPIF--
-<?php
-if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/bugs/multiport.phpt b/ext/soap/tests/bugs/multiport.phpt
index 549a5b3c726..abdbc6d6f78 100644
--- a/ext/soap/tests/bugs/multiport.phpt
+++ b/ext/soap/tests/bugs/multiport.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Proper binding selection
---SKIPIF--
-<?php require_once 'skipif.inc'; ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/bugs/skipif.inc b/ext/soap/tests/bugs/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/bugs/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt
index c3f5301f461..5bac9306877 100644
--- a/ext/soap/tests/classmap001.phpt
+++ b/ext/soap/tests/classmap001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Classmap 1: SoapServer support for classmap
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt
index cf3dd78e3f1..3d78ea37534 100644
--- a/ext/soap/tests/classmap002.phpt
+++ b/ext/soap/tests/classmap002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Classmap 2: SoapClient support for classmap
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt
index c7ea7a02ddf..f33434107f8 100644
--- a/ext/soap/tests/classmap003.phpt
+++ b/ext/soap/tests/classmap003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Classmap 3: encoding of inherited objects
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled",0);
diff --git a/ext/soap/tests/classmap004.phpt b/ext/soap/tests/classmap004.phpt
index f2aad0175a0..f1069a9f390 100644
--- a/ext/soap/tests/classmap004.phpt
+++ b/ext/soap/tests/classmap004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Classmap 4: encoding of objects with __get()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 ini_set("soap.wsdl_cache_enabled",0);
diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt
index 9172d3d6ca4..b8bc8c98701 100644
--- a/ext/soap/tests/custom_content_type.phpt
+++ b/ext/soap/tests/custom_content_type.phpt
@@ -1,9 +1,9 @@
 --TEST--
 SOAP customized Content-Type, eg. SwA use case
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
-    require_once('skipif.inc');
-
     if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
         echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
     }
diff --git a/ext/soap/tests/fault001.phpt b/ext/soap/tests/fault001.phpt
index 221641dc093..7a300518c33 100644
--- a/ext/soap/tests/fault001.phpt
+++ b/ext/soap/tests/fault001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 is_soap_fault 1: test against null
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 var_dump(is_soap_fault(null));
diff --git a/ext/soap/tests/fault_warning.phpt b/ext/soap/tests/fault_warning.phpt
index c74934d7b90..2a9d99fb5db 100644
--- a/ext/soap/tests/fault_warning.phpt
+++ b/ext/soap/tests/fault_warning.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SoapFault class: Invalid Fault code warning given? Can't be an empty string, an array of not 2 elements etc.
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt
index f88cdddbf06..b5935df2b74 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_001p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 001 (php/direct): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt
index a25eea52c3f..aedb9fb8cbc 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_001s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 001 (soap/direct): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt
index 4845155a333..7c18a7035cc 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt
index a5c62425dff..0e688cb7dd1 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_002p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 002 (php/direct): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt
index 3a256241a1b..a289ee37d30 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_002s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 002 (soap/direct): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt
index ca36526947d..070314a998f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 002 (php/wsdl): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
index fb900e8b11f..15bd49cf984 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 003 (php/direct): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
index d4c41cd21f0..c3e62afb87d 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 003 (soap/direct): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
index be9307ea70c..328be0bcd11 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 003 (php/wsdl): echoString(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt
index cb56ce67196..1bc04a80d96 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_004p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 004 (php/direct): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt
index 20c899e7eb0..6f4f3c117ab 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_004s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 004 (soap/direct): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt
index 1ee282352c6..40a4c18686a 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 004 (php/wsdl): echoString(entities)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
index d8f91d328e2..f61bc2393b0 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 005 (php/direct): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
index 116e14faac0..9dbfbb8bf7e 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
index a629ab9b2b4..0252ebcffe0 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt
index a85d3c481ae..b561955e12f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_006p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 006 (php/direct): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt
index 8ea498a5c64..84cdf040565 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_006s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 006 (soap/direct): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param =  new SoapParam(new SoapVar(array(
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt
index 4425ec9502f..b936d05500f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 006 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt
index bfa5e1c7252..8a4b314e028 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_007p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 007 (php/direct): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt
index 6d46588a378..5886802bf5c 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_007s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 007 (soap/direct): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param =  new SoapParam(new SoapVar(array(
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt
index 3f669045a3e..1905c4fbbe8 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 007 (php/wsdl): echoStringArray(one)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt
index 21125586b14..376d8c25637 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_008p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 008 (php/direct): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt
index 2bae84505f5..743299ff831 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_008s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 008 (soap/direct): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param =  new SoapParam(new SoapVar(array(
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt
index df71a912c86..234a56defe4 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 008 (php/wsdl): echoStringArray(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt
index bee2f796349..063bf93dc42 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_009p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 009 (php/direct): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt
index 6aec611fb8d..6d5a36c19c4 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_009s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 009 (soap/direct): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param =  new SoapParam(new SoapVar(NULL, SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd"), "inputStringArray");
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt
index 7edc3207d2a..502c414ea70 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 009 (php/wsdl): echoStringArray(NULL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt
index 9c2aa0ff4c3..5e335547293 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_010p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 010 (php/direct): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt
index 1f012cae9f3..6047f6e909a 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_010s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 010 (soap/direct): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt
index 5dc4652a320..3271bf35745 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 010 (php/wsdl): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt
index 739ded994d1..bbbba365f0a 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_011p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 011 (php/direct): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt
index d7699e2ea6c..73fb6bc973e 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_011s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 011 (soap/direct): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param =  new SoapParam(new SoapVar(array(
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt
index ebdef98cd71..04a5b4d49da 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 011 (php/wsdl): echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt
index 7cee31910b0..0b364930229 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_012p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 012 (php/direct): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt
index e0043394099..cd25a7b5ca2 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_012s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 012 (soap/direct): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt
index 2badc6f6f45..8e778fd32c8 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 012 (php/wsdl): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt
index c68018204a5..d88ec52b10f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_013p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 013 (php/direct): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt
index 9ebc29470a1..1e546f40ab0 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_013s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 013 (soap/direct): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt
index 437119c1cf8..6245fe83698 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 013 (php/wsdl): echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt
index b78142d44ea..23f44ac6e81 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_014p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 014 (php/direct): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt
index f81a0c13f47..520e6b4d188 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 014 (soap/direct): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt
index 49f64584e7d..e48e151551c 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 014 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
index bb532f46d02..e206f3f0615 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_015p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 015 (php/direct): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
index c167556f12a..a14d9cf1264 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 015 (soap/direct): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
index 4723a182164..4ee706ffbb8 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 015 (php/wsdl): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt
index 0c3a028f1ee..611b0f7235d 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_016p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 016 (php/direct): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt
index 24cd42b0de2..6d56e994670 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_016s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 016 (soap/direct): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt
index 2bc07cc695a..740c68d07d4 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 016 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt
index 5f6b3c31430..9e56079784c 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_017p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 017 (php/direct): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt
index 3e3c6e12720..3017c218028 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_017s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 017 (soap/direct): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt
index 2467fb57d40..37587b59bf3 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 017 (php/wsdl): echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt
index 3738148c190..e0b593b41a5 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_018p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 018 (php/direct): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt
index a531069388c..b025a1918d6 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_018s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 018 (soap/direct): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt
index 4d7f4d0f0a1..52fdd92fa49 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 018 (php/wsdl): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt
index a767301d67b..80f29f0bd48 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_019p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 019 (php/direct): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt
index 56bea8b4e84..f4b81287319 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_019s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 019 (soap/direct): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt
index 6153a01386b..4997308dafa 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 019 (php/wsdl): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt
index 4afe922e85b..71acc642478 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_020p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 020 (php/direct): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt
index 6ced7482adf..e33943bee9f 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_020s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 020 (soap/direct): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt
index 4383f732ee6..2bb80c75a93 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 020 (php/wsdl): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt
index 69edf346d91..ad967845916 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_021p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 021 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt
index 8f2a66fc50b..1af84ff3b85 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_021s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 021 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt
index 843b23301e5..33e06331b88 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 021 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt
index 07322b9876e..e5da6fe4c27 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_022p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 022 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt
index 9f4309cc31b..1aef099eda1 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_022s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 022 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt
index bbc1ef6892e..02374c8972d 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 022 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt
index 65dcad2733e..6ad2cc60825 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_023p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 023 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt
index 8985f38f4ac..6c70508e292 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_023s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 023 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt
index 6699243a60a..e5cfe76d713 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 023 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt
index f55f095019d..37118aeaa12 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_024p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 024 (php/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt
index f10e7629abf..3d122818779 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_024s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 024 (soap/direct): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0));
diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt
index 323fbeedfa1..1c474704b3e 100644
--- a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt
+++ b/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 base 024 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/Base/skipif.inc b/ext/soap/tests/interop/Round2/Base/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round2/Base/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt
index 88080cf297a..b5a0d814af0 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 001 (php/direct): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt
index 3f5920077b9..45498981cbd 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 001 (soap/direct): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt
index 747614f74ee..2686128aaf3 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 001 (php/wsdl): echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt
index 3dba3343d9d..a9e731a7d28 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 002 (php/direct): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt
index bda5baab701..fc7dd9e10b6 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 002 (soap/direct): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt
index e990789bfbb..221628e47d6 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 002 (php/wsdl): echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt
index 417ae10a418..74d1309ece9 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 003 (php/direct): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param = array(
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt
index 59f213414c6..6647e6e9ff8 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 003 (soap/direct): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $param = new SoapParam(new SoapVar(array(
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt
index aa216da8023..0b53b3ded0a 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 003 (php/wsdl): echo2DStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt
index fb5f485f425..ce8368fd4e3 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 004 (php/direct): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt
index fe9d90c5090..6a84a7ef18c 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 004 (soap/direct): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt
index 6a42867c6e6..6d74e5e4e80 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 004 (php/wsdl): echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt
index 3dd17e60225..e19a973f323 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005p.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 005 (php/direct): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt
index 20d1d1426b4..b07ee043cee 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 005 (soap/direct): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt
index a772e140111..ebc886c3a2e 100644
--- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt
+++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round2 groupB 005 (php/wsdl): echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round2/GroupB/skipif.inc b/ext/soap/tests/interop/Round2/GroupB/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round2/GroupB/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt
index 243c1bc34ed..353741948f1 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Compound1 001 (php/wsdl): echoPerson
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt
index 91dcf5c80b0..c647593603f 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Compound1 002 (php/wsdl): echoDocument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt
index 2feb31661c9..aec35c98475 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Compound1 003 (php/wsdl): echoDocument
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
index 43c6f8e0075..44ff8346ff3 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Compound2 001 (php/wsdl): echoEmployee
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt
index 3cd78f46644..476de336d6a 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt
index 0d1cb99c3e5..b3dd6e08520 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt
index a81219e744b..8c6e3af3c20 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt
index 28f0e9c90f5..6f5d745b92b 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt
index 0541cce622e..b38ac8e20a0 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit Parameters 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt
index 1b347ff4db4..b216acf0460 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit Parameters 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt
index f9d721fc608..c22e990fb1a 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit Parameters 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt
index 8c22336aeb3..4f63550d54b 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Doc Lit Parameters 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt
index 6504d2dcbaf..212a212f08f 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD EmptySA 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt
index 3bbc0cbe55c..0823b1c2414 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Import1 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt
index 756c49deb14..eab06d57657 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Import2 001 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt
index 4fca5b8169f..01654c6dc5c 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Import3 001 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
index 3f05d4159e2..cac0dcab803 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD Import3 002 (php/wsdl): echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt
index 7fe35b0529c..548fa5bc475 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD RPC Encoded 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt
index 638ce766001..dd8745ecb07 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD RPC Encoded 002 (php/wsdl): echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt
index 5db899cc230..2867d1f9c26 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD RPC Encoded 003 (php/wsdl): echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt
index 6c919b796ea..69aa465eacd 100644
--- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupD RPC Encoded 004 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupD/skipif.inc b/ext/soap/tests/interop/Round3/GroupD/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round3/GroupD/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt
index df576c4205e..8dfbc01ba72 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 001 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt
index 13341e06ebf..12b13c345b3 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 002 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt
index 3e84283d691..bd83ba07166 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 003 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt
index 57e649a5fe3..e2e261df4c6 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 004 (php/wsdl): echoLinkedList
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
index 68047e46451..723ed89d391 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 005 (php/wsdl): echoLinkedList (cyclic)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
index ee74830b31c..3c82f325726 100644
--- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupE List 006 (php/wsdl): echoLinkedList (cyclic)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupE/skipif.inc b/ext/soap/tests/interop/Round3/GroupE/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round3/GroupE/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt
index e1425d58c6d..5e454d47214 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Extensibility 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt
index fa75ade9120..e47323f15af 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Extensibility Required 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt
index 2920fa8526e..e999a621fbb 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Headers 001 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt
index 131a4cb3d0e..b0427e35cf3 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Headers 002 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt
index eb9745dec18..834f26dfbaa 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Headers 003 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt
index 2861def5428..8059f5ecac7 100644
--- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt
+++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round3 GroupF Headers 004 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round3/GroupF/skipif.inc b/ext/soap/tests/interop/Round3/GroupF/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round3/GroupF/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupG/skipif.inc b/ext/soap/tests/interop/Round4/GroupG/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round4/GroupG/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt
index e3b4615a6ba..df5074bacae 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 001 (php/wsdl): echoSOAPStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt
index 61cf4ea0780..a9902a851b1 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 002 (php/wsdl): echoBaseStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt
index aafd26787a4..eed61a52e05 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 003 (php/wsdl): echoExtendedStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt
index 16ff9d703e7..515770713e6 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt
index d62f33264ff..af96c1d0b53 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt
index 5d280e1c3d9..ea13c5e0fd4 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt
index eda7e18f688..27ef31622f9 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 007 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt
index 154736e75bf..be7ee1be5fa 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 008 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt
index f1d56f055c8..d703ff9febc 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 009 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt
index caa70d53ad4..ee368eb2f29 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex Doc Lit 010 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt
index 25814f6bc76..5fced6f1a5a 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 001 (php/wsdl): echoSOAPStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt
index ad8d2d81474..369243af1b5 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 002 (php/wsdl): echoBaseStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt
index 76859d4e183..8a093e8a7da 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 003 (php/wsdl): echoExtendedStructFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt
index 13cf2dfe7f0..1a59813da23 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt
index f092a7c5b9a..cdb73625a29 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt
index eabe960f914..8fa40c50512 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt
index cdd19b82231..68106a36481 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 007 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt
index c0fcefd538e..e081ec3b369 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 008 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt
index 75ceb24368a..272b64d1ef0 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 009 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt
index a4f51a041ca..a0139e3bdf1 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Complex RPC Enc 010 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt
index 5e2bbbc3bb8..43597971d2e 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 001 (php/wsdl): echoEmptyFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt
index deb67b3ba62..0996ffc2f13 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 002 (php/wsdl): echoStringFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt
index 7933409d50c..d96d739fafc 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 003 (php/wsdl): echoIntArrayFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt
index 3a1b49cc42b..e316cea812a 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt
index fc58dfa67f6..5a9eb5e3ea1 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt
index 465bd19d991..9116e58d7e0 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt
index 69d78fe9201..fc422481534 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 007 (php/wsdl): echoMultipleFaults1(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt
index 1443812a2c1..8938fde5d54 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 008 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt
index a4d4280925c..c9a3fddce6c 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 009 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt
index fc66a7fb89a..8e8d21a8043 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 010 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt
index 8b62ff3badb..fc6ec524c75 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 011 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt
index 49594bfb202..900b5cef0e0 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 012 (php/wsdl): echoMultipleFaults3(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt
index 4f6851a73c0..1a2a8859261 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 013 (php/wsdl): echoMultipleFaults3(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt
index c87ac861d8d..3760221e8a9 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 014 (php/wsdl): echoMultipleFaults3(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt
index 13316d4cfa4..feada9274a8 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 015 (php/wsdl): echoMultipleFaults4(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt
index 03e5afd8df4..ec72de989a1 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 016 (php/wsdl): echoMultipleFaults4(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt
index c6e67049e12..b97d278fb70 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple Doc Lit 017 (php/wsdl): echoMultipleFaults4(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt
index 457e6fdcf20..a98081f8cc0 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 001 (php/wsdl): echoEmptyFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt
index 55bde2cdb72..43ed1b8fb31 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 002 (php/wsdl): echoStringFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt
index 2d4f3da6a4f..4fa3e83d747 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 003 (php/wsdl): echoIntArrayFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt
index 6b03648b0a8..8c9f414614f 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 004 (php/wsdl): echoMultipleFaults1(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt
index 8b30f552fe4..450097fae39 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 005 (php/wsdl): echoMultipleFaults1(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt
index a02b785e6d1..8aa99e87577 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 006 (php/wsdl): echoMultipleFaults1(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt
index 4e827700ecb..ad4fcd76122 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 007 (php/wsdl): echoMultipleFaults1(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt
index 170434bae1a..17f8c93bcda 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 008 (php/wsdl): echoMultipleFaults2(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt
index 412e50b55a8..c6a3983dcb4 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 009 (php/wsdl): echoMultipleFaults2(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt
index 410a6833412..3c597368780 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 010 (php/wsdl): echoMultipleFaults2(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt
index 4d13ee9e123..155de2f56b8 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 011 (php/wsdl): echoMultipleFaults2(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt
index 48aad38d228..eadfa49bed8 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 012 (php/wsdl): echoMultipleFaults3(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt
index a24ed8778a8..5bf679a8425 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 013 (php/wsdl): echoMultipleFaults3(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt
index 9c7902c3fbb..8869398537f 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 014 (php/wsdl): echoMultipleFaults3(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt
index f24c90e259d..28f117f8042 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 015 (php/wsdl): echoMultipleFaults4(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt
index 49235700f57..7ebb5bb9332 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 016 (php/wsdl): echoMultipleFaults4(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt
index 5b52cceb239..4d41d516272 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH Simple RPC Enc 017 (php/wsdl): echoMultipleFaults4(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt
index 77ed867fb86..0f54418a735 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH SoapFault 001 (php/wsdl): echoVersionMismatchFault(SOAP 1.1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt
index af90e15c790..4bcb6d391b1 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH SoapFault 002 (php/wsdl): echoVersionMismatchFault(SOAP 1.2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt
index ffed23b5b41..777efcf8b40 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH SoapFault 003 (php/wsdl): echoVersionMismatchFault(unknown version)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt
index 31ca13ee1a4..5c50cbc8403 100644
--- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupH SoapFault 004 (php/wsdl): echoMustUnderstandFault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupH/skipif.inc b/ext/soap/tests/interop/Round4/GroupH/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round4/GroupH/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt
index 77b8c8e7b36..632ca3a7ddb 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 001 (php/wsdl): echoVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt
index 9f1ee78d77c..b0da17903a1 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 002 (php/wsdl): echoInteger
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt
index f161268eac5..62f009cbdd3 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 003 (php/wsdl): echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt
index f36c3baa5c0..735a0f304f4 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 004 (php/wsdl): echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt
index f27bb8b455a..ddcfafb6fc9 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 005 (php/wsdl): echoString(empty)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt
index 2a863f469d0..6652ee36e78 100644
Binary files a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt and b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt differ
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt
index 615fa43c39d..97ab55154af 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 007 (php/wsdl): echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt
index 0930f87001b..17b9760a3ca 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 008 (php/wsdl): echoComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt
index 884ea173871..0ec0923bbad 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 009 (php/wsdl): echoComplexType(minOccur=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt
index b185b931f36..72b0c291c7c 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 010 (php/wsdl): echoIntegerMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt
index 930542708c9..d5775e92fd8 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 011 (php/wsdl): echoFloatMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt
index 8f7a616f490..775513ff4b6 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 012 (php/wsdl): echoStringMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt
index c44c5472ffc..83b8b5a132b 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 013 (php/wsdl): echoStringMultiOccurs(nil)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
index 6d3b3444481..ef0b7286371 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 014 (php/wsdl): echoComplexTypeMultiOccurs(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
index 239045c5642..3f3345db99c 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 015 (php/wsdl): echoComplexTypeMultiOccurs(nil)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt
index bc78b3d5c83..28917382611 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 016 (php/wsdl): echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt
index 18bc7bd23cd..87e3ad8a6db 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 017 (php/wsdl): echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt
index 2be7297ce06..539f3333a3c 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 018 (php/wsdl): echoHexBinary
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt
index aecfe79a9de..8cf4dfec193 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 019 (php/wsdl): echoComplexTypeAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt
index 9fc63c6dd38..13ca8d044fb 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 020 (php/wsdl): echoComplexTypeAsSimpleTypes(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt
index 3e9ee065eed..fd460b71309 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 021 (php/wsdl): echoSimpleTypesAsComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt
index 86523bd1ed8..0ad6888f784 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 022 (php/wsdl): echoSimpleTypesAsComplexType(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt
index b9c2a3bd05c..c2f814252db 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 023 (php/wsdl): echoNestedComplexType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt
index 4af5375fed2..57fa06af286 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 024 (php/wsdl): echoNestedComplexType(minOccurs=0)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt
index b4bf0519a8c..29ce5837399 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 025 (php/wsdl): echoNestedMultiOccurs
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt
index 89e40e0d0ff..77b374236ab 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 026 (php/wsdl): echoChoice
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt
index ff9ad3abfba..df4e0081d36 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 027 (php/wsdl): echoEnum
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt
index 41e5da71e3b..c0346d81179 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 028 (php/wsdl): echoAnyType
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt
index ad69b2f136b..52f9dee604a 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 029 (php/wsdl): echoAnyElement
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt
index 58e359788a5..1812b775119 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 030 (php/wsdl): echoVoidSoapHeader(1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt
index 67da316d565..2b89e057e99 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 031 (php/wsdl): echoVoidSoapHeader(2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt
index aa37a913b2b..508f3c0a325 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 032 (php/wsdl): echoVoidSoapHeader(3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt
index 2433a90b6b8..c2b47eeaa69 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 033 (php/wsdl): echoVoidSoapHeader(4)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt
index 0a3bec4c68f..2804699a389 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 034 (php/wsdl): echoVoidSoapHeader(5)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt
index 670b0b116bf..75eb891533b 100644
--- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt
+++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Interop Round4 GroupI XSD 035 (php/wsdl): echoVoidSoapHeader(6)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 soap.wsdl_cache_enabled=0
diff --git a/ext/soap/tests/interop/Round4/GroupI/skipif.inc b/ext/soap/tests/interop/Round4/GroupI/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/interop/Round4/GroupI/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/schema/schema001.phpt b/ext/soap/tests/schema/schema001.phpt
index cb031e6ac6f..e54cd55688b 100644
--- a/ext/soap/tests/schema/schema001.phpt
+++ b/ext/soap/tests/schema/schema001.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 1: simpleType/restriction
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema002.phpt b/ext/soap/tests/schema/schema002.phpt
index 66485aa205c..e53fde60ac2 100644
--- a/ext/soap/tests/schema/schema002.phpt
+++ b/ext/soap/tests/schema/schema002.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 2: simpleType/restriction (reference to type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema003.phpt b/ext/soap/tests/schema/schema003.phpt
index d32dd2434e4..1ee680e2e94 100644
--- a/ext/soap/tests/schema/schema003.phpt
+++ b/ext/soap/tests/schema/schema003.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 3: simpleType/restriction (reference to type, that is not defined yet)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema004.phpt b/ext/soap/tests/schema/schema004.phpt
index b930e40b4c9..e1dc33490de 100644
--- a/ext/soap/tests/schema/schema004.phpt
+++ b/ext/soap/tests/schema/schema004.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 4: simpleType/restriction (reference to undefined type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema005.phpt b/ext/soap/tests/schema/schema005.phpt
index ddfa92555bf..4d75094ee7f 100644
--- a/ext/soap/tests/schema/schema005.phpt
+++ b/ext/soap/tests/schema/schema005.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 5: simpleType/restriction (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema006.phpt b/ext/soap/tests/schema/schema006.phpt
index 9255626581e..7fe8b65b894 100644
--- a/ext/soap/tests/schema/schema006.phpt
+++ b/ext/soap/tests/schema/schema006.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 6: simpleType/restriction (referenced by ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema007.phpt b/ext/soap/tests/schema/schema007.phpt
index bf088e7b2dc..3e9abaa85b0 100644
--- a/ext/soap/tests/schema/schema007.phpt
+++ b/ext/soap/tests/schema/schema007.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 7: simpleType/restriction (referenced by ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema008.phpt b/ext/soap/tests/schema/schema008.phpt
index 3a9b998580a..fce3fe734c0 100644
--- a/ext/soap/tests/schema/schema008.phpt
+++ b/ext/soap/tests/schema/schema008.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 8: simpleType/restriction (anonymous, inside an ellement)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema009.phpt b/ext/soap/tests/schema/schema009.phpt
index 2de815f4556..3bc46e1a8a1 100644
--- a/ext/soap/tests/schema/schema009.phpt
+++ b/ext/soap/tests/schema/schema009.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 9: simpleType/list (as string)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema010.phpt b/ext/soap/tests/schema/schema010.phpt
index b50a5eeb970..2161792415c 100644
--- a/ext/soap/tests/schema/schema010.phpt
+++ b/ext/soap/tests/schema/schema010.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 10: simpleType/list (as array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema011.phpt b/ext/soap/tests/schema/schema011.phpt
index fca39291f3d..e1248485e3b 100644
--- a/ext/soap/tests/schema/schema011.phpt
+++ b/ext/soap/tests/schema/schema011.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 11: simpleType/list (inline type) (as string)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema012.phpt b/ext/soap/tests/schema/schema012.phpt
index d947980c00a..a7c194e83e1 100644
--- a/ext/soap/tests/schema/schema012.phpt
+++ b/ext/soap/tests/schema/schema012.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 12: simpleType/list (inline type) (as array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema013.phpt b/ext/soap/tests/schema/schema013.phpt
index 9c93ae4d2e8..90a007c9e95 100644
--- a/ext/soap/tests/schema/schema013.phpt
+++ b/ext/soap/tests/schema/schema013.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 13: simpleType/union
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema014.phpt b/ext/soap/tests/schema/schema014.phpt
index b2639fc1e2d..d2084e76993 100644
--- a/ext/soap/tests/schema/schema014.phpt
+++ b/ext/soap/tests/schema/schema014.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 14: simpleType/union
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema015.phpt b/ext/soap/tests/schema/schema015.phpt
index 6f280e78a97..a9605890239 100644
--- a/ext/soap/tests/schema/schema015.phpt
+++ b/ext/soap/tests/schema/schema015.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 15: simpleType/union (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema016.phpt b/ext/soap/tests/schema/schema016.phpt
index 4878b710c50..33284299ef3 100644
--- a/ext/soap/tests/schema/schema016.phpt
+++ b/ext/soap/tests/schema/schema016.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 16: simpleType/union (inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema017.phpt b/ext/soap/tests/schema/schema017.phpt
index 25a1da054a4..c627b110c95 100644
--- a/ext/soap/tests/schema/schema017.phpt
+++ b/ext/soap/tests/schema/schema017.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 17: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema018.phpt b/ext/soap/tests/schema/schema018.phpt
index 8b85ea8af39..5486963d539 100644
--- a/ext/soap/tests/schema/schema018.phpt
+++ b/ext/soap/tests/schema/schema018.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 18: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema019.phpt b/ext/soap/tests/schema/schema019.phpt
index afcae9b1b6b..12bccd2cefa 100644
--- a/ext/soap/tests/schema/schema019.phpt
+++ b/ext/soap/tests/schema/schema019.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 19: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema020.phpt b/ext/soap/tests/schema/schema020.phpt
index e8ebf500e12..660c3d2cf7f 100644
--- a/ext/soap/tests/schema/schema020.phpt
+++ b/ext/soap/tests/schema/schema020.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 20: union with list
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema021.phpt b/ext/soap/tests/schema/schema021.phpt
index 18e1394775c..eb7eb343522 100644
--- a/ext/soap/tests/schema/schema021.phpt
+++ b/ext/soap/tests/schema/schema021.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 21: list of unions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema022.phpt b/ext/soap/tests/schema/schema022.phpt
index 45bcd29c6ee..4fcbcb72c2c 100644
--- a/ext/soap/tests/schema/schema022.phpt
+++ b/ext/soap/tests/schema/schema022.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 22: list of unions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema023.phpt b/ext/soap/tests/schema/schema023.phpt
index 31bfe9ae6fe..3c981fa5804 100644
--- a/ext/soap/tests/schema/schema023.phpt
+++ b/ext/soap/tests/schema/schema023.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 23: SOAP 1.1 Array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema024.phpt b/ext/soap/tests/schema/schema024.phpt
index cd58f7efb54..b414f9fb290 100644
--- a/ext/soap/tests/schema/schema024.phpt
+++ b/ext/soap/tests/schema/schema024.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 24: SOAP 1.1 Array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema025.phpt b/ext/soap/tests/schema/schema025.phpt
index 5237e8979e0..d19c4fc0a27 100644
--- a/ext/soap/tests/schema/schema025.phpt
+++ b/ext/soap/tests/schema/schema025.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 25: SOAP 1.2 Array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema026.phpt b/ext/soap/tests/schema/schema026.phpt
index 983ee8e5efd..99b47cafc63 100644
--- a/ext/soap/tests/schema/schema026.phpt
+++ b/ext/soap/tests/schema/schema026.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 26: SOAP 1.2 Array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema027.phpt b/ext/soap/tests/schema/schema027.phpt
index 39ca3dc3cd4..c19f3abbba5 100644
--- a/ext/soap/tests/schema/schema027.phpt
+++ b/ext/soap/tests/schema/schema027.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 27: SOAP 1.1 Multidimensional array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema028.phpt b/ext/soap/tests/schema/schema028.phpt
index 84a059b6025..5de61b84e5e 100644
--- a/ext/soap/tests/schema/schema028.phpt
+++ b/ext/soap/tests/schema/schema028.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 28: SOAP 1.2 Multidimensional array
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema029.phpt b/ext/soap/tests/schema/schema029.phpt
index 70f1b21e914..b9fd0206de9 100644
--- a/ext/soap/tests/schema/schema029.phpt
+++ b/ext/soap/tests/schema/schema029.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 29: SOAP 1.2 Multidimensional array (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema030.phpt b/ext/soap/tests/schema/schema030.phpt
index 10471192958..bfed6f0dda4 100644
--- a/ext/soap/tests/schema/schema030.phpt
+++ b/ext/soap/tests/schema/schema030.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 30: Structure (sequence)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema031.phpt b/ext/soap/tests/schema/schema031.phpt
index 4b033583721..61ef0595158 100644
--- a/ext/soap/tests/schema/schema031.phpt
+++ b/ext/soap/tests/schema/schema031.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 31: Structure (all)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema032.phpt b/ext/soap/tests/schema/schema032.phpt
index 397636083cc..0b42058ffb4 100644
--- a/ext/soap/tests/schema/schema032.phpt
+++ b/ext/soap/tests/schema/schema032.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 32: Structure (choice)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema033.phpt b/ext/soap/tests/schema/schema033.phpt
index 7c1ce0fc8a0..c129eb8b63f 100644
--- a/ext/soap/tests/schema/schema033.phpt
+++ b/ext/soap/tests/schema/schema033.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 33: Nested complex types
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema034.phpt b/ext/soap/tests/schema/schema034.phpt
index 42536d89c39..91b477d7f1f 100644
--- a/ext/soap/tests/schema/schema034.phpt
+++ b/ext/soap/tests/schema/schema034.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 34: Nested complex types (element ref)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema035.phpt b/ext/soap/tests/schema/schema035.phpt
index d62dfbc98e6..4896432fa19 100644
--- a/ext/soap/tests/schema/schema035.phpt
+++ b/ext/soap/tests/schema/schema035.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 35: Nested complex types (element ref + anonymous type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema036.phpt b/ext/soap/tests/schema/schema036.phpt
index 12c5c40e0ba..38f2c25391c 100644
--- a/ext/soap/tests/schema/schema036.phpt
+++ b/ext/soap/tests/schema/schema036.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 36: Nested complex types (inline)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema037.phpt b/ext/soap/tests/schema/schema037.phpt
index dbc5dc38c89..9158d6cb239 100644
--- a/ext/soap/tests/schema/schema037.phpt
+++ b/ext/soap/tests/schema/schema037.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 37: Structure with attributes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema038.phpt b/ext/soap/tests/schema/schema038.phpt
index 70b5b207eee..c39371b7d36 100644
--- a/ext/soap/tests/schema/schema038.phpt
+++ b/ext/soap/tests/schema/schema038.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 38: Structure with attributes (ref)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema039.phpt b/ext/soap/tests/schema/schema039.phpt
index 5b3f454bf91..439a6620e38 100644
--- a/ext/soap/tests/schema/schema039.phpt
+++ b/ext/soap/tests/schema/schema039.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 39: Structure with attributes (attributeGroup)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema040.phpt b/ext/soap/tests/schema/schema040.phpt
index 51bcd776e13..5a8fcc50f5a 100644
--- a/ext/soap/tests/schema/schema040.phpt
+++ b/ext/soap/tests/schema/schema040.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 40: Structure with attributes (inline types)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema041.phpt b/ext/soap/tests/schema/schema041.phpt
index 4613f157295..9d9b209e061 100644
--- a/ext/soap/tests/schema/schema041.phpt
+++ b/ext/soap/tests/schema/schema041.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 41: Structure (group)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema042.phpt b/ext/soap/tests/schema/schema042.phpt
index c0a938aa270..88d6bb7907a 100644
--- a/ext/soap/tests/schema/schema042.phpt
+++ b/ext/soap/tests/schema/schema042.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 42: Extension of simple type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema043.phpt b/ext/soap/tests/schema/schema043.phpt
index cc628eefea2..b53d25fb9c1 100644
--- a/ext/soap/tests/schema/schema043.phpt
+++ b/ext/soap/tests/schema/schema043.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 43: Extension of simple type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema044.phpt b/ext/soap/tests/schema/schema044.phpt
index 3158d46049a..076169fb6f1 100644
--- a/ext/soap/tests/schema/schema044.phpt
+++ b/ext/soap/tests/schema/schema044.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 44: Restriction of simple type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema045.phpt b/ext/soap/tests/schema/schema045.phpt
index 8055b39914a..2dc8d18947c 100644
--- a/ext/soap/tests/schema/schema045.phpt
+++ b/ext/soap/tests/schema/schema045.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 45: Restriction of simple type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema046.phpt b/ext/soap/tests/schema/schema046.phpt
index 9f3efd79ca5..284267371da 100644
--- a/ext/soap/tests/schema/schema046.phpt
+++ b/ext/soap/tests/schema/schema046.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 46: Extension of complex type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema047.phpt b/ext/soap/tests/schema/schema047.phpt
index a67973eeb08..2c1f1ea3ab8 100644
--- a/ext/soap/tests/schema/schema047.phpt
+++ b/ext/soap/tests/schema/schema047.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 47: Extension of complex type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema048.phpt b/ext/soap/tests/schema/schema048.phpt
index c2a372e1d1f..005b518cd5a 100644
--- a/ext/soap/tests/schema/schema048.phpt
+++ b/ext/soap/tests/schema/schema048.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 48: Restriction of complex type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema049.phpt b/ext/soap/tests/schema/schema049.phpt
index 84b22fe5e71..b939b9e60d5 100644
--- a/ext/soap/tests/schema/schema049.phpt
+++ b/ext/soap/tests/schema/schema049.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 49: Restriction of complex type (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema050.phpt b/ext/soap/tests/schema/schema050.phpt
index 0bb3d35dc92..90ad92612ba 100644
--- a/ext/soap/tests/schema/schema050.phpt
+++ b/ext/soap/tests/schema/schema050.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 50: Array in complex type (maxOccurs > 1, one value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema051.phpt b/ext/soap/tests/schema/schema051.phpt
index 0f5ad8b7188..0659da78a76 100644
--- a/ext/soap/tests/schema/schema051.phpt
+++ b/ext/soap/tests/schema/schema051.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 51: Array in complex type (maxOccurs > 1, array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema052.phpt b/ext/soap/tests/schema/schema052.phpt
index 5e30c8287ef..0830a358f1d 100644
--- a/ext/soap/tests/schema/schema052.phpt
+++ b/ext/soap/tests/schema/schema052.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 52: Array in complex type (maxOccurs > 1, array with one value)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema053.phpt b/ext/soap/tests/schema/schema053.phpt
index f276978a4c6..13e295bc7b3 100644
--- a/ext/soap/tests/schema/schema053.phpt
+++ b/ext/soap/tests/schema/schema053.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 52: Array in complex type (maxOccurs > 1, empty array)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema054.phpt b/ext/soap/tests/schema/schema054.phpt
index 5adf2f588a2..117b717c5e8 100644
--- a/ext/soap/tests/schema/schema054.phpt
+++ b/ext/soap/tests/schema/schema054.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 54: Apache Map
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema055.phpt b/ext/soap/tests/schema/schema055.phpt
index 1a23e2fa6e4..75a69545646 100644
--- a/ext/soap/tests/schema/schema055.phpt
+++ b/ext/soap/tests/schema/schema055.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 55: Apache Map (extension)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema056.phpt b/ext/soap/tests/schema/schema056.phpt
index d2aac098d01..4a32bf68fe2 100644
--- a/ext/soap/tests/schema/schema056.phpt
+++ b/ext/soap/tests/schema/schema056.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 56: SOAP 1.1 Array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema057.phpt b/ext/soap/tests/schema/schema057.phpt
index 13521b2a605..b4a9aa35abe 100644
--- a/ext/soap/tests/schema/schema057.phpt
+++ b/ext/soap/tests/schema/schema057.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 57: SOAP 1.1 Array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema058.phpt b/ext/soap/tests/schema/schema058.phpt
index aee0a961111..64041bf4a3a 100644
--- a/ext/soap/tests/schema/schema058.phpt
+++ b/ext/soap/tests/schema/schema058.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 58: SOAP 1.2 Array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema059.phpt b/ext/soap/tests/schema/schema059.phpt
index bbed854fbb3..d2344414ba4 100644
--- a/ext/soap/tests/schema/schema059.phpt
+++ b/ext/soap/tests/schema/schema059.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 59: SOAP 1.2 Array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema060.phpt b/ext/soap/tests/schema/schema060.phpt
index 9029a470e49..bd30e1694cc 100644
--- a/ext/soap/tests/schema/schema060.phpt
+++ b/ext/soap/tests/schema/schema060.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 60: SOAP 1.2 Multidimensional array (literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema061.phpt b/ext/soap/tests/schema/schema061.phpt
index 73cf1546d90..af7acaf4430 100644
--- a/ext/soap/tests/schema/schema061.phpt
+++ b/ext/soap/tests/schema/schema061.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 61: SOAP 1.2 Multidimensional array (second way, literal encoding)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema062.phpt b/ext/soap/tests/schema/schema062.phpt
index ae26c7b1cdf..0cbc24ab2cf 100644
--- a/ext/soap/tests/schema/schema062.phpt
+++ b/ext/soap/tests/schema/schema062.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 62: NULL with attributes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema063.phpt b/ext/soap/tests/schema/schema063.phpt
index 7fda578d959..b0e97fe0dde 100644
--- a/ext/soap/tests/schema/schema063.phpt
+++ b/ext/soap/tests/schema/schema063.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 63: standard unsignedLong type
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt
index b52a0519f63..4809e95fad3 100644
--- a/ext/soap/tests/schema/schema064.phpt
+++ b/ext/soap/tests/schema/schema064.phpt
@@ -1,11 +1,14 @@
 --TEST--
 SOAP XML Schema 64: standard date/time types
+--EXTENSIONS--
+soap
+xml
 --SKIPIF--
 <?php
 if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
     die('skip, windows has different TZ format');
 }
-require_once('skipif.inc'); ?>
+?>
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema065.phpt b/ext/soap/tests/schema/schema065.phpt
index 0e5a66cd3f7..9fd7f07bd26 100644
--- a/ext/soap/tests/schema/schema065.phpt
+++ b/ext/soap/tests/schema/schema065.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 65: Attribute with default value
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema066.phpt b/ext/soap/tests/schema/schema066.phpt
index c6692535a60..54d3873c7d2 100644
--- a/ext/soap/tests/schema/schema066.phpt
+++ b/ext/soap/tests/schema/schema066.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 66: Attribute with fixed value (1)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema067.phpt b/ext/soap/tests/schema/schema067.phpt
index 7fb7eff233d..d1445312272 100644
--- a/ext/soap/tests/schema/schema067.phpt
+++ b/ext/soap/tests/schema/schema067.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 67: Attribute with fixed value (2)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema068.phpt b/ext/soap/tests/schema/schema068.phpt
index 4372cdfa23e..8cd81b730f8 100644
--- a/ext/soap/tests/schema/schema068.phpt
+++ b/ext/soap/tests/schema/schema068.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 68: Attribute with fixed value (3)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema069.phpt b/ext/soap/tests/schema/schema069.phpt
index d944765e320..6c2662980e0 100644
--- a/ext/soap/tests/schema/schema069.phpt
+++ b/ext/soap/tests/schema/schema069.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 69: Attribute with default value (reference)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema070.phpt b/ext/soap/tests/schema/schema070.phpt
index 3135183398a..271a654b22f 100644
--- a/ext/soap/tests/schema/schema070.phpt
+++ b/ext/soap/tests/schema/schema070.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 70: Attribute with default value (attributeGroup)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema071.phpt b/ext/soap/tests/schema/schema071.phpt
index 65ea47bf9ec..8fb4509d53e 100644
--- a/ext/soap/tests/schema/schema071.phpt
+++ b/ext/soap/tests/schema/schema071.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 71: SOAP 1.1 Array (document style)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema072.phpt b/ext/soap/tests/schema/schema072.phpt
index cbf08db00bc..39823e3460c 100644
--- a/ext/soap/tests/schema/schema072.phpt
+++ b/ext/soap/tests/schema/schema072.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 72: SOAP 1.1 Array (document style, element with inline type)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema073.phpt b/ext/soap/tests/schema/schema073.phpt
index 3338684a9b2..32a529c66b5 100644
--- a/ext/soap/tests/schema/schema073.phpt
+++ b/ext/soap/tests/schema/schema073.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 73: SOAP 1.1 Array (document style, element with type ref)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema074.phpt b/ext/soap/tests/schema/schema074.phpt
index 4735957bfa3..fa1e4d8e95e 100644
--- a/ext/soap/tests/schema/schema074.phpt
+++ b/ext/soap/tests/schema/schema074.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 74: Structure with attributes and qualified elements
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema075.phpt b/ext/soap/tests/schema/schema075.phpt
index eb3729a9b2f..afd66e9208c 100644
--- a/ext/soap/tests/schema/schema075.phpt
+++ b/ext/soap/tests/schema/schema075.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 75: Attributes form qualified/unqualified (attributeFormDefault="qualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema076.phpt b/ext/soap/tests/schema/schema076.phpt
index d4940deb6bf..283ade5ce5a 100644
--- a/ext/soap/tests/schema/schema076.phpt
+++ b/ext/soap/tests/schema/schema076.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 76: Attributes form qualified/unqualified (attributeFormDefault="unqualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema077.phpt b/ext/soap/tests/schema/schema077.phpt
index 7da8b4a1a24..aef821566a4 100644
--- a/ext/soap/tests/schema/schema077.phpt
+++ b/ext/soap/tests/schema/schema077.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 77: Attributes form qualified/unqualified (attributeFormDefault - default)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema078.phpt b/ext/soap/tests/schema/schema078.phpt
index a051acd8f26..ec605383527 100644
--- a/ext/soap/tests/schema/schema078.phpt
+++ b/ext/soap/tests/schema/schema078.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 78: Element form qualified/unqualified (elementFormDefault="qualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema079.phpt b/ext/soap/tests/schema/schema079.phpt
index de1a4480fea..efca8f37270 100644
--- a/ext/soap/tests/schema/schema079.phpt
+++ b/ext/soap/tests/schema/schema079.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 79: Element form qualified/unqualified (elementFormDefault="unqualified")
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema080.phpt b/ext/soap/tests/schema/schema080.phpt
index 926bc8ae22a..53849872887 100644
--- a/ext/soap/tests/schema/schema080.phpt
+++ b/ext/soap/tests/schema/schema080.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 80: Element form qualified/unqualified (elementFormDefault - default)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema081.phpt b/ext/soap/tests/schema/schema081.phpt
index 976d95baf81..442a633a79c 100644
--- a/ext/soap/tests/schema/schema081.phpt
+++ b/ext/soap/tests/schema/schema081.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 81: SOAP 1.1 Array with SOAP_USE_XSI_ARRAY_TYPE
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema082.phpt b/ext/soap/tests/schema/schema082.phpt
index 229e566afcb..308ea40378c 100644
--- a/ext/soap/tests/schema/schema082.phpt
+++ b/ext/soap/tests/schema/schema082.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 82: SOAP 1.1 Array with SOAP_USE_XSI_ARRAY_TYPE (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema083.phpt b/ext/soap/tests/schema/schema083.phpt
index 8bcf6023050..9aa79d6fb0e 100644
--- a/ext/soap/tests/schema/schema083.phpt
+++ b/ext/soap/tests/schema/schema083.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 83: SOAP 1.2 Array with SOAP_USE_XSI_ARRAY_TYPE
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema084.phpt b/ext/soap/tests/schema/schema084.phpt
index 62804c9cccd..4649d71b0db 100644
--- a/ext/soap/tests/schema/schema084.phpt
+++ b/ext/soap/tests/schema/schema084.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 84: SOAP 1.2 Array with SOAP_USE_XSI_ARRAY_TYPE (second way)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/schema085.phpt b/ext/soap/tests/schema/schema085.phpt
index 206553bb515..4e066262376 100644
--- a/ext/soap/tests/schema/schema085.phpt
+++ b/ext/soap/tests/schema/schema085.phpt
@@ -1,7 +1,8 @@
 --TEST--
 SOAP XML Schema 85: Extension of complex type (elements order)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
+xml
 --FILE--
 <?php
 include "test_schema.inc";
diff --git a/ext/soap/tests/schema/skipif.inc b/ext/soap/tests/schema/skipif.inc
deleted file mode 100644
index 878088736eb..00000000000
--- a/ext/soap/tests/schema/skipif.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-  /* xml parser is required by test_schema.inc */
-  if (!extension_loaded('xml'))  die('skip xml extension not available');
-?>
diff --git a/ext/soap/tests/server001.phpt b/ext/soap/tests/server001.phpt
index 649e01365c7..90a09aea480 100644
--- a/ext/soap/tests/server001.phpt
+++ b/ext/soap/tests/server001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 1: new/addfunction/handle
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server002.phpt b/ext/soap/tests/server002.phpt
index d0a53b8cc08..a331fb1f2ae 100644
--- a/ext/soap/tests/server002.phpt
+++ b/ext/soap/tests/server002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 2: function with parameters and result
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Add($x,$y) {
diff --git a/ext/soap/tests/server003.phpt b/ext/soap/tests/server003.phpt
index a808c6f3e1e..fb3e0d1b77c 100644
--- a/ext/soap/tests/server003.phpt
+++ b/ext/soap/tests/server003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 3: all functions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $server = new soapserver(null,array('uri'=>"http://testuri.org"));
diff --git a/ext/soap/tests/server004.phpt b/ext/soap/tests/server004.phpt
index 5d98d3f5e4b..87176219f70 100644
--- a/ext/soap/tests/server004.phpt
+++ b/ext/soap/tests/server004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 4: addfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Add($x,$y) {
diff --git a/ext/soap/tests/server005.phpt b/ext/soap/tests/server005.phpt
index 9536771be14..0a367933e9b 100644
--- a/ext/soap/tests/server005.phpt
+++ b/ext/soap/tests/server005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 5: setclass
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server006.phpt b/ext/soap/tests/server006.phpt
index 0c94fb29933..65783aba624 100644
--- a/ext/soap/tests/server006.phpt
+++ b/ext/soap/tests/server006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 6: setclass with constructor
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server007.phpt b/ext/soap/tests/server007.phpt
index 676aa56c44f..9ee8edc45d4 100644
--- a/ext/soap/tests/server007.phpt
+++ b/ext/soap/tests/server007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 7: addfunction and getfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Add($x,$y) {
diff --git a/ext/soap/tests/server008.phpt b/ext/soap/tests/server008.phpt
index d299a3ae9b0..20309da1cf2 100644
--- a/ext/soap/tests/server008.phpt
+++ b/ext/soap/tests/server008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 8: setclass and getfunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server009.phpt b/ext/soap/tests/server009.phpt
index c8367f1b624..f91d3eecfd1 100644
--- a/ext/soap/tests/server009.phpt
+++ b/ext/soap/tests/server009.phpt
@@ -1,12 +1,8 @@
 --TEST--
 SOAP Server 9: setclass and setpersistence(SOAP_PERSISTENCE_SESSION)
---SKIPIF--
-<?php
-    require_once('skipif.inc');
-    if (!extension_loaded('session')) {
-        die('skip this test needs session extension');
-    }
-?>
+--EXTENSIONS--
+soap
+session
 --INI--
 session.auto_start=1
 session.save_handler=files
diff --git a/ext/soap/tests/server010.phpt b/ext/soap/tests/server010.phpt
index bac16d29025..dcfcd5a1de1 100644
--- a/ext/soap/tests/server010.phpt
+++ b/ext/soap/tests/server010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 10: setclass and setpersistence(SOAP_PERSISTENCE_REQUEST)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class foo {
diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt
index 53c65213144..ad4a626c790 100644
--- a/ext/soap/tests/server011.phpt
+++ b/ext/soap/tests/server011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 11: bind
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --GET--
 wsdl
 --INI--
diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt
index 9a41de9d504..230108e2b92 100644
--- a/ext/soap/tests/server012.phpt
+++ b/ext/soap/tests/server012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 12: WSDL generation
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --GET--
 WSDL
 --FILE--
diff --git a/ext/soap/tests/server013.phpt b/ext/soap/tests/server013.phpt
index 68c48011184..d1b6de2b129 100644
--- a/ext/soap/tests/server013.phpt
+++ b/ext/soap/tests/server013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 13: array handling
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Sum($a) {
diff --git a/ext/soap/tests/server014.phpt b/ext/soap/tests/server014.phpt
index d248c355bde..9e95569509a 100644
--- a/ext/soap/tests/server014.phpt
+++ b/ext/soap/tests/server014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 14: fault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Add($x,$y) {
diff --git a/ext/soap/tests/server015.phpt b/ext/soap/tests/server015.phpt
index ea538e84eb4..78d02ed1019 100644
--- a/ext/soap/tests/server015.phpt
+++ b/ext/soap/tests/server015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 15: passing request to handle()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server016.phpt b/ext/soap/tests/server016.phpt
index acef045a462..29448e76f1c 100644
--- a/ext/soap/tests/server016.phpt
+++ b/ext/soap/tests/server016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 16: user fault
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server017.phpt b/ext/soap/tests/server017.phpt
index a6350657501..f072a99b344 100644
--- a/ext/soap/tests/server017.phpt
+++ b/ext/soap/tests/server017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 17: user fault (through return)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server018.phpt b/ext/soap/tests/server018.phpt
index 2c379d85dd2..5dd9e3afe5a 100644
--- a/ext/soap/tests/server018.phpt
+++ b/ext/soap/tests/server018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 18: user fault (through throw)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server019.phpt b/ext/soap/tests/server019.phpt
index 7838a824bc3..7f92a1b84c6 100644
--- a/ext/soap/tests/server019.phpt
+++ b/ext/soap/tests/server019.phpt
@@ -1,10 +1,11 @@
 --TEST--
 SOAP Server 19: compressed request (gzip)
+--EXTENSIONS--
+soap
+zlib
 --SKIPIF--
 <?php
     if (php_sapi_name()=='cli') echo 'skip';
-    require_once('skipif.inc');
-    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
 precision=14
diff --git a/ext/soap/tests/server020.phpt b/ext/soap/tests/server020.phpt
index c98517edeac..d98f7fdd1f8 100644
--- a/ext/soap/tests/server020.phpt
+++ b/ext/soap/tests/server020.phpt
@@ -1,10 +1,11 @@
 --TEST--
 SOAP Server 20: compressed request (deflate)
+--EXTENSIONS--
+soap
+zlib
 --SKIPIF--
 <?php
     if (php_sapi_name()=='cli') echo 'skip';
-    require_once('skipif.inc');
-    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
 precision=14
diff --git a/ext/soap/tests/server021.phpt b/ext/soap/tests/server021.phpt
index 245c464433c..d7bdef7a01a 100644
--- a/ext/soap/tests/server021.phpt
+++ b/ext/soap/tests/server021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 21: SoapServer::setClass and __call()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server022.phpt b/ext/soap/tests/server022.phpt
index 82270f8eefb..4fdc21292da 100644
--- a/ext/soap/tests/server022.phpt
+++ b/ext/soap/tests/server022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 22: user fault (through throw of subclass)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class MyFault extends SoapFault {
diff --git a/ext/soap/tests/server023.phpt b/ext/soap/tests/server023.phpt
index 07f3aea5549..fec253f798a 100644
--- a/ext/soap/tests/server023.phpt
+++ b/ext/soap/tests/server023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 23: Send SOAP headers those were not received
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function test() {
diff --git a/ext/soap/tests/server024.phpt b/ext/soap/tests/server024.phpt
index 63cf06cd023..4cee7c85b24 100644
--- a/ext/soap/tests/server024.phpt
+++ b/ext/soap/tests/server024.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 24: Send SOAP headers those were not received
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class TestHeader1 extends SoapHeader {
diff --git a/ext/soap/tests/server025.phpt b/ext/soap/tests/server025.phpt
index 871134f9356..6d310a8ecfb 100644
--- a/ext/soap/tests/server025.phpt
+++ b/ext/soap/tests/server025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 25: One-way SOAP headers encoding using WSDL
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/server026.phpt b/ext/soap/tests/server026.phpt
index 720ade86c19..7d69aa3f17c 100644
--- a/ext/soap/tests/server026.phpt
+++ b/ext/soap/tests/server026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 26: setObject
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server027.phpt b/ext/soap/tests/server027.phpt
index 188b94f10ed..f1d09343e0a 100644
--- a/ext/soap/tests/server027.phpt
+++ b/ext/soap/tests/server027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 27: setObject and getFunctions
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server028.phpt b/ext/soap/tests/server028.phpt
index 4bea8ebd78c..717682a9a72 100644
--- a/ext/soap/tests/server028.phpt
+++ b/ext/soap/tests/server028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 28: SoapServer::setObject and __call()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 class Foo {
diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt
index 7a75a2fec3d..db693b3df92 100644
--- a/ext/soap/tests/server029.phpt
+++ b/ext/soap/tests/server029.phpt
@@ -12,10 +12,11 @@ SOAP Server 29-CGI: new/addfunction/handle
     <ns1:test xmlns:ns1="http://testuri.org" />
   </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
+--EXTENSIONS--
+soap
 --SKIPIF--
 <?php
     if (php_sapi_name()=='cli') echo 'skip';
-    require_once('skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/soap/tests/server030.phpt b/ext/soap/tests/server030.phpt
index bafb01f575c..0b531b0a0c4 100644
--- a/ext/soap/tests/server030.phpt
+++ b/ext/soap/tests/server030.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 30: Handling classes which extend the SPL ArrayObject or ArrayIterator as arrays in wsdl mode
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/server031.phpt b/ext/soap/tests/server031.phpt
index 987ad4ab596..0faa667fdc4 100644
--- a/ext/soap/tests/server031.phpt
+++ b/ext/soap/tests/server031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Server 31: Handling classes which implements Iterator
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/setheaders.phpt b/ext/soap/tests/setheaders.phpt
index cb90d372d14..c7cf75d252a 100644
--- a/ext/soap/tests/setheaders.phpt
+++ b/ext/soap/tests/setheaders.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP: SoapClient::__setHeaders
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $client = new SoapClient(NULL, array("location"=>"test://","uri"=>"test://",
diff --git a/ext/soap/tests/skipif.inc b/ext/soap/tests/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/soap12/T01.phpt b/ext/soap/tests/soap12/T01.phpt
index 45aadbad861..64456c97f8b 100644
--- a/ext/soap/tests/soap12/T01.phpt
+++ b/ext/soap/tests/soap12/T01.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T01 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T02.phpt b/ext/soap/tests/soap12/T02.phpt
index d7f9880143f..242033185dc 100644
--- a/ext/soap/tests/soap12/T02.phpt
+++ b/ext/soap/tests/soap12/T02.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T02 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T03.phpt b/ext/soap/tests/soap12/T03.phpt
index 1d7aa3b0d31..fee9b2985c9 100644
--- a/ext/soap/tests/soap12/T03.phpt
+++ b/ext/soap/tests/soap12/T03.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T03 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T04.phpt b/ext/soap/tests/soap12/T04.phpt
index 2bef7626d86..8a4f47d05e0 100644
--- a/ext/soap/tests/soap12/T04.phpt
+++ b/ext/soap/tests/soap12/T04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T04 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T05.phpt b/ext/soap/tests/soap12/T05.phpt
index c5e0054eb3c..8e254e1e4ee 100644
--- a/ext/soap/tests/soap12/T05.phpt
+++ b/ext/soap/tests/soap12/T05.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T05 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T10.phpt b/ext/soap/tests/soap12/T10.phpt
index 6c2a3ea4177..c8e7ac64241 100644
--- a/ext/soap/tests/soap12/T10.phpt
+++ b/ext/soap/tests/soap12/T10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T10 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T11.phpt b/ext/soap/tests/soap12/T11.phpt
index d805596bede..06212fb94d0 100644
--- a/ext/soap/tests/soap12/T11.phpt
+++ b/ext/soap/tests/soap12/T11.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T11 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T12.phpt b/ext/soap/tests/soap12/T12.phpt
index 7a1cc56becc..d3f21ca6014 100644
--- a/ext/soap/tests/soap12/T12.phpt
+++ b/ext/soap/tests/soap12/T12.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T12 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T13.phpt b/ext/soap/tests/soap12/T13.phpt
index 2d7fec07578..011409b189a 100644
--- a/ext/soap/tests/soap12/T13.phpt
+++ b/ext/soap/tests/soap12/T13.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T13 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T14.phpt b/ext/soap/tests/soap12/T14.phpt
index 1bed2aa2d04..30916455a47 100644
--- a/ext/soap/tests/soap12/T14.phpt
+++ b/ext/soap/tests/soap12/T14.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T14 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T15.phpt b/ext/soap/tests/soap12/T15.phpt
index d68d43c097e..a59d7380f6a 100644
--- a/ext/soap/tests/soap12/T15.phpt
+++ b/ext/soap/tests/soap12/T15.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T15 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T19.phpt b/ext/soap/tests/soap12/T19.phpt
index 2f5e132f01b..00eddbf3373 100644
--- a/ext/soap/tests/soap12/T19.phpt
+++ b/ext/soap/tests/soap12/T19.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T19 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T22.phpt b/ext/soap/tests/soap12/T22.phpt
index 2976bc577ab..bafff9b67a7 100644
--- a/ext/soap/tests/soap12/T22.phpt
+++ b/ext/soap/tests/soap12/T22.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T22 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T23.phpt b/ext/soap/tests/soap12/T23.phpt
index 095e5e725fd..1df101db6aa 100644
--- a/ext/soap/tests/soap12/T23.phpt
+++ b/ext/soap/tests/soap12/T23.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T23 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T24.phpt b/ext/soap/tests/soap12/T24.phpt
index 97bd56cf47e..a5b304d9843 100644
--- a/ext/soap/tests/soap12/T24.phpt
+++ b/ext/soap/tests/soap12/T24.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T24 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T25.phpt b/ext/soap/tests/soap12/T25.phpt
index ac5e1a0efd5..1993d6723a3 100644
--- a/ext/soap/tests/soap12/T25.phpt
+++ b/ext/soap/tests/soap12/T25.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T25 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T26.phpt b/ext/soap/tests/soap12/T26.phpt
index 8b23ba7b636..c19530bce66 100644
--- a/ext/soap/tests/soap12/T26.phpt
+++ b/ext/soap/tests/soap12/T26.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T26 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T27.phpt b/ext/soap/tests/soap12/T27.phpt
index 3cb42940be4..097a0f63530 100644
--- a/ext/soap/tests/soap12/T27.phpt
+++ b/ext/soap/tests/soap12/T27.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T27 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T28.phpt b/ext/soap/tests/soap12/T28.phpt
index 019cabcdb97..23deba54acd 100644
--- a/ext/soap/tests/soap12/T28.phpt
+++ b/ext/soap/tests/soap12/T28.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T28 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T29.phpt b/ext/soap/tests/soap12/T29.phpt
index 85a3a61ae1e..21c61c16976 100644
--- a/ext/soap/tests/soap12/T29.phpt
+++ b/ext/soap/tests/soap12/T29.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T29 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T30.phpt b/ext/soap/tests/soap12/T30.phpt
index c2e008ed4aa..0c531079fe4 100644
--- a/ext/soap/tests/soap12/T30.phpt
+++ b/ext/soap/tests/soap12/T30.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T30 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt
index 689f62bd009..3610ded1479 100644
--- a/ext/soap/tests/soap12/T31.phpt
+++ b/ext/soap/tests/soap12/T31.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T31 returnVoid
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T32.phpt b/ext/soap/tests/soap12/T32.phpt
index 7d9dc1006ad..c55c067b111 100644
--- a/ext/soap/tests/soap12/T32.phpt
+++ b/ext/soap/tests/soap12/T32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T32 echoHeader
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T33.phpt b/ext/soap/tests/soap12/T33.phpt
index 76f90bce1bc..bd9667186a0 100644
--- a/ext/soap/tests/soap12/T33.phpt
+++ b/ext/soap/tests/soap12/T33.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T33 nonexistentMethod
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T34.phpt b/ext/soap/tests/soap12/T34.phpt
index 873013cbc8f..ac474e6a5b9 100644
--- a/ext/soap/tests/soap12/T34.phpt
+++ b/ext/soap/tests/soap12/T34.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T34 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T35.phpt b/ext/soap/tests/soap12/T35.phpt
index b6511e8e80f..a2d6436b7b2 100644
--- a/ext/soap/tests/soap12/T35.phpt
+++ b/ext/soap/tests/soap12/T35.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T35 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T36.phpt b/ext/soap/tests/soap12/T36.phpt
index b1efaeaf90f..86501ff7404 100644
--- a/ext/soap/tests/soap12/T36.phpt
+++ b/ext/soap/tests/soap12/T36.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T36 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T37.phpt b/ext/soap/tests/soap12/T37.phpt
index 848c0a4aa44..7d9b3f53b9f 100644
--- a/ext/soap/tests/soap12/T37.phpt
+++ b/ext/soap/tests/soap12/T37.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T37 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T38_1.phpt b/ext/soap/tests/soap12/T38_1.phpt
index 8bc8cf185be..7e5fec6e663 100644
--- a/ext/soap/tests/soap12/T38_1.phpt
+++ b/ext/soap/tests/soap12/T38_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T38.1 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T38_2.phpt b/ext/soap/tests/soap12/T38_2.phpt
index 8408ab783f8..54cd4659de5 100644
--- a/ext/soap/tests/soap12/T38_2.phpt
+++ b/ext/soap/tests/soap12/T38_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T38.2 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T39.phpt b/ext/soap/tests/soap12/T39.phpt
index f4ddcc9d204..735e4882a6f 100644
--- a/ext/soap/tests/soap12/T39.phpt
+++ b/ext/soap/tests/soap12/T39.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T39 unknownHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T40.phpt b/ext/soap/tests/soap12/T40.phpt
index 28143093211..18b2bac48e5 100644
--- a/ext/soap/tests/soap12/T40.phpt
+++ b/ext/soap/tests/soap12/T40.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T40 echoOK
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T41.phpt b/ext/soap/tests/soap12/T41.phpt
index f874adc895b..c246c93826e 100644
--- a/ext/soap/tests/soap12/T41.phpt
+++ b/ext/soap/tests/soap12/T41.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T41 echoStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T42.phpt b/ext/soap/tests/soap12/T42.phpt
index e45d42b8f73..ad897a18b4c 100644
--- a/ext/soap/tests/soap12/T42.phpt
+++ b/ext/soap/tests/soap12/T42.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T42 echoStructArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/soap12/T43.phpt b/ext/soap/tests/soap12/T43.phpt
index 7dd63161446..00675724d13 100644
--- a/ext/soap/tests/soap12/T43.phpt
+++ b/ext/soap/tests/soap12/T43.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T43 echoStructAsSimpleTypes
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T44.phpt b/ext/soap/tests/soap12/T44.phpt
index 3e307c13576..f22c1915c2e 100644
--- a/ext/soap/tests/soap12/T44.phpt
+++ b/ext/soap/tests/soap12/T44.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T44 echoSimpleTypesAsStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T45.phpt b/ext/soap/tests/soap12/T45.phpt
index 24db9416829..20e46577459 100644
--- a/ext/soap/tests/soap12/T45.phpt
+++ b/ext/soap/tests/soap12/T45.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T45 echoNestedStruct
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T46.phpt b/ext/soap/tests/soap12/T46.phpt
index fbbf543fdf2..03830969bd1 100644
--- a/ext/soap/tests/soap12/T46.phpt
+++ b/ext/soap/tests/soap12/T46.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T46 echoNestedArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T47.phpt b/ext/soap/tests/soap12/T47.phpt
index a449d2088fd..5a62e64fa0a 100644
--- a/ext/soap/tests/soap12/T47.phpt
+++ b/ext/soap/tests/soap12/T47.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T47 echoFloatArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 precision=14
 --FILE--
diff --git a/ext/soap/tests/soap12/T48.phpt b/ext/soap/tests/soap12/T48.phpt
index f7cf0fe3b8c..6f2956b8fbd 100644
--- a/ext/soap/tests/soap12/T48.phpt
+++ b/ext/soap/tests/soap12/T48.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T48 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T49.phpt b/ext/soap/tests/soap12/T49.phpt
index 01ac0e679f4..bf0bc7cde88 100644
--- a/ext/soap/tests/soap12/T49.phpt
+++ b/ext/soap/tests/soap12/T49.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T49 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T50.phpt b/ext/soap/tests/soap12/T50.phpt
index 66263abcb79..967b498c33a 100644
--- a/ext/soap/tests/soap12/T50.phpt
+++ b/ext/soap/tests/soap12/T50.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T50 echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T51.phpt b/ext/soap/tests/soap12/T51.phpt
index 97765763c19..df00fdab566 100644
--- a/ext/soap/tests/soap12/T51.phpt
+++ b/ext/soap/tests/soap12/T51.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T51 echoBase64
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T52.phpt b/ext/soap/tests/soap12/T52.phpt
index 7cd229b7419..287ff2be836 100644
--- a/ext/soap/tests/soap12/T52.phpt
+++ b/ext/soap/tests/soap12/T52.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T52 echoBoolean
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T53.phpt b/ext/soap/tests/soap12/T53.phpt
index 5bff2c775f4..2a0b154b82a 100644
--- a/ext/soap/tests/soap12/T53.phpt
+++ b/ext/soap/tests/soap12/T53.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T53 echoDate
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T54.phpt b/ext/soap/tests/soap12/T54.phpt
index ac33859a75a..733c4f90e8e 100644
--- a/ext/soap/tests/soap12/T54.phpt
+++ b/ext/soap/tests/soap12/T54.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T54 echoDecimal
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T55.phpt b/ext/soap/tests/soap12/T55.phpt
index 5e362854f93..e0be1ccad95 100644
--- a/ext/soap/tests/soap12/T55.phpt
+++ b/ext/soap/tests/soap12/T55.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T55 echoFloat
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T56.phpt b/ext/soap/tests/soap12/T56.phpt
index 7a773a8a3ec..7922bf78d18 100644
--- a/ext/soap/tests/soap12/T56.phpt
+++ b/ext/soap/tests/soap12/T56.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T56 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T57.phpt b/ext/soap/tests/soap12/T57.phpt
index ad3e9ef50f4..fa6b3b51613 100644
--- a/ext/soap/tests/soap12/T57.phpt
+++ b/ext/soap/tests/soap12/T57.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T57 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T58.phpt b/ext/soap/tests/soap12/T58.phpt
index 9878baeacf2..59a9eba0b61 100644
--- a/ext/soap/tests/soap12/T58.phpt
+++ b/ext/soap/tests/soap12/T58.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T58 echoIntegerArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T59.phpt b/ext/soap/tests/soap12/T59.phpt
index 4c0ec5a3821..44133017304 100644
--- a/ext/soap/tests/soap12/T59.phpt
+++ b/ext/soap/tests/soap12/T59.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T59 echoStringArray
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T60.phpt b/ext/soap/tests/soap12/T60.phpt
index 234ef4ccd43..47ded6e5c7d 100644
--- a/ext/soap/tests/soap12/T60.phpt
+++ b/ext/soap/tests/soap12/T60.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T60 countItems
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T61.phpt b/ext/soap/tests/soap12/T61.phpt
index b688a794ff0..79f5c1efff5 100644
--- a/ext/soap/tests/soap12/T61.phpt
+++ b/ext/soap/tests/soap12/T61.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T61 countItems
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T63.phpt b/ext/soap/tests/soap12/T63.phpt
index 72b9ca35f5f..4706241668d 100644
--- a/ext/soap/tests/soap12/T63.phpt
+++ b/ext/soap/tests/soap12/T63.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T63 validateCountryCode
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T64.phpt b/ext/soap/tests/soap12/T64.phpt
index 932c112d83c..8196644e047 100644
--- a/ext/soap/tests/soap12/T64.phpt
+++ b/ext/soap/tests/soap12/T64.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T64 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T65.phpt b/ext/soap/tests/soap12/T65.phpt
index e89ce995d81..0c6f3b953e4 100644
--- a/ext/soap/tests/soap12/T65.phpt
+++ b/ext/soap/tests/soap12/T65.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T65 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T66.phpt b/ext/soap/tests/soap12/T66.phpt
index 23586b8ee71..1b477d82c4e 100644
--- a/ext/soap/tests/soap12/T66.phpt
+++ b/ext/soap/tests/soap12/T66.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T66 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T67.phpt b/ext/soap/tests/soap12/T67.phpt
index dd197a1b82f..e59241f494b 100644
--- a/ext/soap/tests/soap12/T67.phpt
+++ b/ext/soap/tests/soap12/T67.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T67 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T68.phpt b/ext/soap/tests/soap12/T68.phpt
index 0dfa08ff16a..c096b163aec 100644
--- a/ext/soap/tests/soap12/T68.phpt
+++ b/ext/soap/tests/soap12/T68.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T68 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T69.phpt b/ext/soap/tests/soap12/T69.phpt
index 8a64745f959..44097d982e7 100644
--- a/ext/soap/tests/soap12/T69.phpt
+++ b/ext/soap/tests/soap12/T69.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T69 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T70.phpt b/ext/soap/tests/soap12/T70.phpt
index 9b665bf176e..7a9be2d3ecc 100644
--- a/ext/soap/tests/soap12/T70.phpt
+++ b/ext/soap/tests/soap12/T70.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T70 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T71.phpt b/ext/soap/tests/soap12/T71.phpt
index dffaf585d38..7bed55473d9 100644
--- a/ext/soap/tests/soap12/T71.phpt
+++ b/ext/soap/tests/soap12/T71.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T71 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T72.phpt b/ext/soap/tests/soap12/T72.phpt
index 3b4db8c3f3d..76ae9d57bf1 100644
--- a/ext/soap/tests/soap12/T72.phpt
+++ b/ext/soap/tests/soap12/T72.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T72 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T73.phpt b/ext/soap/tests/soap12/T73.phpt
index 9143e58179d..ca2eb9d7b78 100644
--- a/ext/soap/tests/soap12/T73.phpt
+++ b/ext/soap/tests/soap12/T73.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T73 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T74.phpt b/ext/soap/tests/soap12/T74.phpt
index 4f210b642eb..5340b221fb0 100644
--- a/ext/soap/tests/soap12/T74.phpt
+++ b/ext/soap/tests/soap12/T74.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T74 doubleHdr
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T75.phpt b/ext/soap/tests/soap12/T75.phpt
index cdee965db01..efc516c19ae 100644
--- a/ext/soap/tests/soap12/T75.phpt
+++ b/ext/soap/tests/soap12/T75.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T75 echoResolvedRef
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T76_1.phpt b/ext/soap/tests/soap12/T76_1.phpt
index 87f4c55f09b..4df588f0f4a 100644
--- a/ext/soap/tests/soap12/T76_1.phpt
+++ b/ext/soap/tests/soap12/T76_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T76.1 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T76_2.phpt b/ext/soap/tests/soap12/T76_2.phpt
index cc6ea0df958..eb40d6d5885 100644
--- a/ext/soap/tests/soap12/T76_2.phpt
+++ b/ext/soap/tests/soap12/T76_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T76.2 echoString
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T77_1.phpt b/ext/soap/tests/soap12/T77_1.phpt
index 3cf3f4358a7..90278e2029f 100644
--- a/ext/soap/tests/soap12/T77_1.phpt
+++ b/ext/soap/tests/soap12/T77_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T77.1 isNil
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T77_2.phpt b/ext/soap/tests/soap12/T77_2.phpt
index 4d18b374dc1..815429d04a9 100644
--- a/ext/soap/tests/soap12/T77_2.phpt
+++ b/ext/soap/tests/soap12/T77_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T77.2 isNil
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T77_3.phpt b/ext/soap/tests/soap12/T77_3.phpt
index 1242daf0ea9..2c907e606b6 100644
--- a/ext/soap/tests/soap12/T77_3.phpt
+++ b/ext/soap/tests/soap12/T77_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T77.3 isNul
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T78.phpt b/ext/soap/tests/soap12/T78.phpt
index 228a88ad430..f9ea9d12d78 100644
--- a/ext/soap/tests/soap12/T78.phpt
+++ b/ext/soap/tests/soap12/T78.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T78 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/T80.phpt b/ext/soap/tests/soap12/T80.phpt
index e987338ea8e..521c34651b6 100644
--- a/ext/soap/tests/soap12/T80.phpt
+++ b/ext/soap/tests/soap12/T80.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP 1.2: T80 echoOk
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/skipif.inc b/ext/soap/tests/soap12/skipif.inc
deleted file mode 100644
index fa8574e6a25..00000000000
--- a/ext/soap/tests/soap12/skipif.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  if (!extension_loaded('soap')) die('skip soap extension not available');
-?>
diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt
index a2733bd5dc3..6f3f4374ad0 100644
--- a/ext/soap/tests/transport001.phpt
+++ b/ext/soap/tests/transport001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Transport 1: Local transport using SoapClient::__doRequest
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --FILE--
 <?php
 function Add($x,$y) {
diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt
index 04c72eb836f..6775fd838c5 100644
--- a/ext/soap/tests/typemap001.phpt
+++ b/ext/soap/tests/typemap001.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SOAP typemap 1: SoapServer support for typemap's from_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('simplexml')) die("skip simplexml extension not available"); ?>
+--EXTENSIONS--
+soap
+simplexml
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt
index 551d8ee71f0..5eb629849ef 100644
--- a/ext/soap/tests/typemap002.phpt
+++ b/ext/soap/tests/typemap002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP typemap 2: SoapServer support for typemap's to_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt
index 2cd0ac64e4b..301ba257251 100644
--- a/ext/soap/tests/typemap003.phpt
+++ b/ext/soap/tests/typemap003.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SOAP Typemap 3: SoapClient support for typemap's from_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('simplexml')) die("skip simplexml extension not available"); ?>
+--EXTENSIONS--
+soap
+simplexml
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt
index bf0a643abe2..d6be88fb5da 100644
--- a/ext/soap/tests/typemap004.phpt
+++ b/ext/soap/tests/typemap004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Typemap 4: SoapClient support for typemap's to_xml()
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap005.phpt b/ext/soap/tests/typemap005.phpt
index 4a4c81c118b..a7fdeccea99 100644
--- a/ext/soap/tests/typemap005.phpt
+++ b/ext/soap/tests/typemap005.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SOAP typemap 5: SoapServer support for typemap's from_xml() (without WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('simplexml')) die("skip simplexml extension not available"); ?>
+--EXTENSIONS--
+soap
+simplexml
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap006.phpt b/ext/soap/tests/typemap006.phpt
index ca8c3351e81..c2d14c29f4c 100644
--- a/ext/soap/tests/typemap006.phpt
+++ b/ext/soap/tests/typemap006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP typemap 6: SoapServer support for typemap's to_xml() (without WSDL, using SoapVar)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt
index 5b7cbd10d73..5470cada58f 100644
--- a/ext/soap/tests/typemap007.phpt
+++ b/ext/soap/tests/typemap007.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SOAP Typemap 7: SoapClient support for typemap's from_xml() (without WSDL)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php if (!extension_loaded('simplexml')) die("skip simplexml extension not available"); ?>
+--EXTENSIONS--
+soap
+simplexml
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt
index c4bd649f511..b36ecdcb730 100644
--- a/ext/soap/tests/typemap008.phpt
+++ b/ext/soap/tests/typemap008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Typemap 8: SoapClient support for typemap's to_xml() (without WSDL, using SoapVar)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt
index a36a64136f1..d22e190cfa3 100644
--- a/ext/soap/tests/typemap009.phpt
+++ b/ext/soap/tests/typemap009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP typemap 9: SoapServer support for typemap's from_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt
index fde89a4603e..6beea95b47f 100644
--- a/ext/soap/tests/typemap010.phpt
+++ b/ext/soap/tests/typemap010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP typemap 10: SoapServer support for typemap's to_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt
index b0c75ce0c7c..29883f3f5c3 100644
--- a/ext/soap/tests/typemap011.phpt
+++ b/ext/soap/tests/typemap011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Typemap 11: SoapClient support for typemap's from_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt
index 039a4f9ba76..9978299ac34 100644
--- a/ext/soap/tests/typemap012.phpt
+++ b/ext/soap/tests/typemap012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP Typemap 12: SoapClient support for typemap's to_xml() (SoapFault)
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt
index f73a257d75d..0d592244410 100644
--- a/ext/soap/tests/typemap013.phpt
+++ b/ext/soap/tests/typemap013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP typemap 13: SoapServer support for typemap's to_xml() with default ns
---SKIPIF--
-<?php require_once('skipif.inc'); ?>
+--EXTENSIONS--
+soap
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--
diff --git a/ext/spl/tests/bug54971.phpt b/ext/spl/tests/bug54971.phpt
index 22cdfba27b2..32b829aeec7 100644
--- a/ext/spl/tests/bug54971.phpt
+++ b/ext/spl/tests/bug54971.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
---SKIPIF--
-<?php
-if (!extension_loaded('dom')) die("skip this test needs --enable-dom");
-?>
+--EXTENSIONS--
+dom
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt
index 78c597a795a..4282d347595 100644
--- a/ext/spl/tests/iterator_006.phpt
+++ b/ext/spl/tests/iterator_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: IteratorIterator and SimpleXMlElement
---SKIPIF--
-<?php if (!extension_loaded('simplexml')) print "skip SimpleXML required"; ?>
+--EXTENSIONS--
+simplexml
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug45798.phpt b/ext/sqlite3/tests/bug45798.phpt
index 7184d58d545..6e06c6b346d 100644
--- a/ext/sqlite3/tests/bug45798.phpt
+++ b/ext/sqlite3/tests/bug45798.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45798 (sqlite3 doesn't notice if variable was bound)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug47159.phpt b/ext/sqlite3/tests/bug47159.phpt
index 7d91e1a14e3..21db694e981 100644
--- a/ext/sqlite3/tests/bug47159.phpt
+++ b/ext/sqlite3/tests/bug47159.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #45798 (sqlite3 doesn't track unexecuted statements)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug53463.phpt b/ext/sqlite3/tests/bug53463.phpt
index 70715cf9357..823ba6d4499 100644
--- a/ext/sqlite3/tests/bug53463.phpt
+++ b/ext/sqlite3/tests/bug53463.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53463 (sqlite3 columnName() segfaults on bad column_number)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug63921-32bit.phpt b/ext/sqlite3/tests/bug63921-32bit.phpt
index 1eaa3496ed0..45a85869f96 100644
--- a/ext/sqlite3/tests/bug63921-32bit.phpt
+++ b/ext/sqlite3/tests/bug63921-32bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #63921 sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not loaded');
 if (PHP_INT_SIZE > 4) die('skip 32-bit only'); // skip for 64bit builds - there is another test for that
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/bug63921-64bit.phpt b/ext/sqlite3/tests/bug63921-64bit.phpt
index d6c539e185a..19637663088 100644
--- a/ext/sqlite3/tests/bug63921-64bit.phpt
+++ b/ext/sqlite3/tests/bug63921-64bit.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #63921 sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-if (!extension_loaded('sqlite3')) die('skip');
 if (PHP_INT_SIZE < 8) die('skip'); // skip for 32bit builds - there is another test for that
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/bug66550.phpt b/ext/sqlite3/tests/bug66550.phpt
index 244f358a5f0..60477a0b17a 100644
--- a/ext/sqlite3/tests/bug66550.phpt
+++ b/ext/sqlite3/tests/bug66550.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #66550 (SQLite prepared statement use-after-free)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug68760.phpt b/ext/sqlite3/tests/bug68760.phpt
index 7cc646780b8..c6cc9ed3b1e 100644
--- a/ext/sqlite3/tests/bug68760.phpt
+++ b/ext/sqlite3/tests/bug68760.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #68760 (Callback throws exception behaviour. Segfault in 5.6)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 function oopsFunction($a, $b) {
diff --git a/ext/sqlite3/tests/bug69972.phpt b/ext/sqlite3/tests/bug69972.phpt
index 539ebd26963..3c926a11ab5 100644
--- a/ext/sqlite3/tests/bug69972.phpt
+++ b/ext/sqlite3/tests/bug69972.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk())
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug70628.phpt b/ext/sqlite3/tests/bug70628.phpt
index 3d807baaa88..655749800ef 100644
--- a/ext/sqlite3/tests/bug70628.phpt
+++ b/ext/sqlite3/tests/bug70628.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #70628 (Clearing bindings on an SQLite3 statement doesn't work)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug71049.phpt b/ext/sqlite3/tests/bug71049.phpt
index 5c2843f3459..eb67f4c6dc4 100644
--- a/ext/sqlite3/tests/bug71049.phpt
+++ b/ext/sqlite3/tests/bug71049.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug72571.phpt b/ext/sqlite3/tests/bug72571.phpt
index 3ffde291c71..481906ac844 100644
--- a/ext/sqlite3/tests/bug72571.phpt
+++ b/ext/sqlite3/tests/bug72571.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug72668.phpt b/ext/sqlite3/tests/bug72668.phpt
index 6f566d2df10..40ede8883cc 100644
--- a/ext/sqlite3/tests/bug72668.phpt
+++ b/ext/sqlite3/tests/bug72668.phpt
@@ -1,8 +1,7 @@
 --TEST--
 Bug #72668 (Spurious warning when exception is thrown in user defined function)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 function my_udf_md5($string) {
diff --git a/ext/sqlite3/tests/bug73068.phpt b/ext/sqlite3/tests/bug73068.phpt
index df85dafe824..ce05e885edc 100644
--- a/ext/sqlite3/tests/bug73068.phpt
+++ b/ext/sqlite3/tests/bug73068.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #73068 SQLite3 may fail to DELETE
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-require_once(__DIR__ . '/skipif.inc');
 $version = SQLite3::version()['versionNumber'];
 if ($version >= 3011000 && $version < 3014002) die('skip libsqlite 3.11.0 to 3.14.1 exhibit erroneous behavior');
 ?>
diff --git a/ext/sqlite3/tests/bug73333.phpt b/ext/sqlite3/tests/bug73333.phpt
index f9521209e8a..4150a3b70d4 100644
--- a/ext/sqlite3/tests/bug73333.phpt
+++ b/ext/sqlite3/tests/bug73333.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #73333 (2147483647 is fetched as string)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 if (!defined('PHP_INT_MIN')) define('PHP_INT_MIN', -PHP_INT_MAX-1);
diff --git a/ext/sqlite3/tests/bug76665.phpt b/ext/sqlite3/tests/bug76665.phpt
index f56f358bae9..6a00f8fe2f0 100644
--- a/ext/sqlite3/tests/bug76665.phpt
+++ b/ext/sqlite3/tests/bug76665.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #76665 (SQLite3Stmt::bindValue() with SQLITE3_FLOAT doesn't juggle)
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/bug77051.phpt b/ext/sqlite3/tests/bug77051.phpt
index 10c51fe7f1f..7b44516b7fd 100644
--- a/ext/sqlite3/tests/bug77051.phpt
+++ b/ext/sqlite3/tests/bug77051.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77051 SQLite3::bindParam memory bug when missing ::reset call
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/bug79294.phpt b/ext/sqlite3/tests/bug79294.phpt
index 5538e3886b3..8596f09a004 100644
--- a/ext/sqlite3/tests/bug79294.phpt
+++ b/ext/sqlite3/tests/bug79294.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #79294 ()::columnType() may fail after SQLite3Stmt::reset())
---SKIPIF--
-<?php
-if (!extension_loaded('sqlite3')) die('sqlite3 extension not available');
-?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/exception_from_toString.phpt b/ext/sqlite3/tests/exception_from_toString.phpt
index 8fa97a2921c..549276eab35 100644
--- a/ext/sqlite3/tests/exception_from_toString.phpt
+++ b/ext/sqlite3/tests/exception_from_toString.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check that exceptions from __toString() are handled correctly
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/skipif.inc b/ext/sqlite3/tests/skipif.inc
deleted file mode 100644
index 0f930332ea1..00000000000
--- a/ext/sqlite3/tests/skipif.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (!extension_loaded('sqlite3')) {
-    die("skip sqlite3 extension not loaded");
-}
-
-?>
diff --git a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
index e77ba38a4bf..82f8256ac62 100644
--- a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
+++ b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::open/close tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_01_open.phpt b/ext/sqlite3/tests/sqlite3_01_open.phpt
index f5cc452f0f3..3dea5f5428b 100644
--- a/ext/sqlite3/tests/sqlite3_01_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_01_open.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::open/close tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_02_create.phpt b/ext/sqlite3/tests/sqlite3_02_create.phpt
index 913df09ad21..afe7dcf49d2 100644
--- a/ext/sqlite3/tests/sqlite3_02_create.phpt
+++ b/ext/sqlite3/tests/sqlite3_02_create.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query CREATE tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt
index db31587f68c..128e8c1b248 100644
--- a/ext/sqlite3/tests/sqlite3_02_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_02_open.phpt
@@ -3,8 +3,8 @@ SQLite3::open test, testing for function parameters
 --CREDITS--
 Felix De Vliegher
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_03_insert.phpt b/ext/sqlite3/tests/sqlite3_03_insert.phpt
index 60880de8805..190ec5fe880 100644
--- a/ext/sqlite3/tests/sqlite3_03_insert.phpt
+++ b/ext/sqlite3/tests/sqlite3_03_insert.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query INSERT tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_04_update.phpt b/ext/sqlite3/tests/sqlite3_04_update.phpt
index fe55464ef65..66077489040 100644
--- a/ext/sqlite3/tests/sqlite3_04_update.phpt
+++ b/ext/sqlite3/tests/sqlite3_04_update.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query UPDATE tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_05_delete.phpt b/ext/sqlite3/tests/sqlite3_05_delete.phpt
index 8768d0b575e..a256c38dc4c 100644
--- a/ext/sqlite3/tests/sqlite3_05_delete.phpt
+++ b/ext/sqlite3/tests/sqlite3_05_delete.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query DELETE tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
index 28fd2d264ab..611e4ea940c 100644
--- a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::prepare Bound Variable test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
index 393386fead5..380ffd9e73b 100644
--- a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::prepare Bound Value test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_08_udf.phpt b/ext/sqlite3/tests/sqlite3_08_udf.phpt
index 24862ddda88..896b2f192ee 100644
--- a/ext/sqlite3/tests/sqlite3_08_udf.phpt
+++ b/ext/sqlite3/tests/sqlite3_08_udf.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::createFunction
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
index 27497f74487..c1d07d12e77 100644
--- a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::prepare Bound Variable Blob test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
index f7bd34f3887..7e2b8779811 100644
--- a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
+++ b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::prepare Bound Value test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
index b6622dd25f2..29faea68f8e 100644
--- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt
+++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
@@ -1,7 +1,9 @@
 --TEST--
 SQLite3::prepare number of rows
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc');
+<?php
 // Create an instance of the ReflectionMethod class
 try {
     $method = new ReflectionMethod('sqlite3result', 'numRows');
diff --git a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
index 34af57128ab..67037e22695 100644
--- a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
+++ b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query Unfinalized statement tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt
index 0bced8c19aa..91659229040 100644
--- a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt
+++ b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query Skip all cleanup
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt
index 0c8aefb14f9..ffeeaafd788 100644
--- a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt
+++ b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::querySingle tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
index 4bdb9fade4b..73487da54c7 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
@@ -1,11 +1,12 @@
 --TEST--
 SQLite3::open error test
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
     die('skip windows only test');
 }
-require_once(__DIR__ . '/skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
index 219cb6051a9..a978c07f42c 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@ -1,12 +1,13 @@
 --TEST--
 SQLite3::open error test
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
     die('skip non windows test');
 }
-require_once(__DIR__ . '/skipif.inc');
-if (!function_exists('posix_geteui')) {
+if (!function_exists('posix_geteuid')) {
     die('SKIP posix_geteuid() not defined so cannot check if run as root');
 }
 if (posix_geteuid() == 0) {
diff --git a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
index 08fe5eeb242..ae0e98002a3 100644
--- a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
+++ b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::query SELECT with no results
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_17_version.phpt b/ext/sqlite3/tests/sqlite3_17_version.phpt
index 117358ecc1a..5d9c06f2814 100644
--- a/ext/sqlite3/tests/sqlite3_17_version.phpt
+++ b/ext/sqlite3/tests/sqlite3_17_version.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::version()
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 print_r(SQLite3::version());
diff --git a/ext/sqlite3/tests/sqlite3_18_changes.phpt b/ext/sqlite3/tests/sqlite3_18_changes.phpt
index 6515ce71dc6..de0baae695e 100644
--- a/ext/sqlite3/tests/sqlite3_18_changes.phpt
+++ b/ext/sqlite3/tests/sqlite3_18_changes.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::changes() tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
index 51017bb0bcd..3548de53423 100644
--- a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
+++ b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 columnType and columnName
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_20_error.phpt b/ext/sqlite3/tests/sqlite3_20_error.phpt
index 9b1579a83ec..f5fb9a890c0 100644
--- a/ext/sqlite3/tests/sqlite3_20_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_20_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 error functions
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt
index 407869b3f8f..c3a22654ce5 100644
--- a/ext/sqlite3/tests/sqlite3_21_security.phpt
+++ b/ext/sqlite3/tests/sqlite3_21_security.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 open_basedir checks
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --INI--
 open_basedir=.
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
index d4750b5f5e0..cdc7f4d4dc6 100644
--- a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
+++ b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
@@ -1,8 +1,9 @@
 --TEST--
 SQLite3 load extension
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-require_once(__DIR__ . '/skipif.inc');
 $r = new ReflectionClass("sqlite3");
 if (!$r->hasMethod("loadExtension")) {
     die("skip - sqlite3 doesn't have loadExtension enabled");
diff --git a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
index f91213ae644..44ce5b2194f 100644
--- a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::escapeString
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
index dd1225103d1..d52856c4a1b 100644
--- a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
+++ b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::lastInsertRowID tests
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
index c8a033e7387..a7c639a2b43 100644
--- a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
+++ b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::createAggregate() test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
index 39e9e486763..882d8f6b0be 100644
--- a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::reset prepared statement
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
index 6257d6483c7..26ed7bdbbee 100644
--- a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
+++ b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::reset prepared statement results
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
index 4472b878bc8..ed4a27c714f 100644
--- a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
+++ b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3_stmt::clear prepared statement results
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
index a280229832e..ef28b3b62de 100644
--- a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
+++ b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::createFunction - Basic test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
index 25d4a7abc2a..6937dcd927f 100644
--- a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
+++ b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::blobOpen stream test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_31_changes.phpt b/ext/sqlite3/tests/sqlite3_31_changes.phpt
index 4a63d1108b8..00059c47e8b 100644
--- a/ext/sqlite3/tests/sqlite3_31_changes.phpt
+++ b/ext/sqlite3/tests/sqlite3_31_changes.phpt
@@ -3,8 +3,8 @@ SQLite3::changes (parameters) tests
 --CREDITS--
 Ward Hus
 #@PHP TESTFEST 2009 (BELGIUM)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt
index cfa346c4e5e..3b5705cb98d 100644
--- a/ext/sqlite3/tests/sqlite3_31_open.phpt
+++ b/ext/sqlite3/tests/sqlite3_31_open.phpt
@@ -3,8 +3,8 @@ SQLite3::re-initialize object tests
 --CREDITS--
 Jelle Lampaert
 #Belgian Testfest 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
index f05e053b25a..497c54062dc 100644
--- a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
@@ -3,8 +3,8 @@ SQLite3::createAggregate() Test whether a supplied PHP function is valid when us
 --CREDITS--
 James Cauwelier
 # Belgium PHP TestFest (2009)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
index d8f59a5edb1..bb63e418c64 100644
--- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
@@ -5,10 +5,10 @@ Jelle Lampaert
 #Belgian Testfest 2009
 --INI--
 sqlite3.extension_dir="{TMP}"
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-require_once(__DIR__ . '/skipif.inc');
-
 if (!method_exists('SQLite3', 'loadExtension')) {
     die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
 }
diff --git a/ext/sqlite3/tests/sqlite3_33_reset.phpt b/ext/sqlite3/tests/sqlite3_33_reset.phpt
index 48abc829c7f..8ca20bd490e 100644
--- a/ext/sqlite3/tests/sqlite3_33_reset.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_reset.phpt
@@ -3,8 +3,8 @@ SQLite3:: reset
 --CREDITS--
 Ward Hus & James Cauwelier
 #@ PHP TESTFEST 2009 (BELGIUM)
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
index 7b0d5fea531..1135d1b702b 100644
--- a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
+++ b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
@@ -3,10 +3,10 @@ SQLite3::loadExtension with disabled extensions
 --CREDITS--
 Jelle Lampaert
 #Belgian Testfest 2009
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-require_once(__DIR__ . '/skipif.inc');
-
 if (!method_exists('SQLite3', 'loadExtension')) {
     die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
 }
diff --git a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
index 776e9af9333..49f029d5854 100644
--- a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
+++ b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
@@ -1,7 +1,9 @@
 --TEST--
 SQLite3_stmt::readOnly check
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc');
+<?php
 $version = SQLite3::version();
 if ($version['versionNumber'] < 3007004) {
   die("skip");
diff --git a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt
index 644ceb02c63..9153ac7192b 100644
--- a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt
+++ b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test SQLite3::createCollation() by adding strnatcmp() as an SQL COLLATE sequence
---SKIPIF--
-<?php require_once __DIR__ .  '/skipif.inc'; ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt
index bc195f7b943..4297d622e93 100644
--- a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt
+++ b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt
@@ -1,8 +1,9 @@
 --TEST--
 SQLite3::createFunction - Test with flags
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
 <?php
-require_once(__DIR__ . '/skipif.inc');
 if (!defined('SQLITE3_DETERMINISTIC')) die('skip system sqlite is too old');
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_38_backup.phpt b/ext/sqlite3/tests/sqlite3_38_backup.phpt
index 8ff5189fdc1..54ca9e95c23 100644
--- a/ext/sqlite3/tests/sqlite3_38_backup.phpt
+++ b/ext/sqlite3/tests/sqlite3_38_backup.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::backup test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
index 8c16889c53a..433e1efce04 100644
--- a/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_38_extended_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 extended error code Function
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
index 6c2240e3d76..135c1cdd109 100644
--- a/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
+++ b/ext/sqlite3/tests/sqlite3_39_toggleExtended.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 enable Extended Error Result Codes 
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
index 459beeca531..73fcc790c0f 100644
--- a/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
+++ b/ext/sqlite3/tests/sqlite3_40_setauthorizer.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 user authorizer callback
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt
index 179e04d35d2..6324d079fa2 100644
--- a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt
+++ b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68849 bindValue is not using the right data type
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
index de7edfbbacd..ef165607366 100644
--- a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
+++ b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::execute() with a resource bound for blob param
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt b/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
index c441b1bc4ae..8e5b1cd68eb 100644
--- a/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
+++ b/ext/sqlite3/tests/sqlite3_bound_value_at_name.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3::prepare Bound Value test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
index e27235a6af0..1a7bf1fcb0d 100644
--- a/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
+++ b/ext/sqlite3/tests/sqlite3_busyTimeout.phpt
@@ -2,8 +2,8 @@
 public bool SQLite3::busyTimeout ( int $msecs );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php require 'skipif.inc'; ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 require_once(__DIR__ . '/new_db.inc');
diff --git a/ext/sqlite3/tests/sqlite3_defensive.phpt b/ext/sqlite3/tests/sqlite3_defensive.phpt
index c8826af24f1..033e661d8a3 100644
--- a/ext/sqlite3/tests/sqlite3_defensive.phpt
+++ b/ext/sqlite3/tests/sqlite3_defensive.phpt
@@ -1,7 +1,9 @@
 --TEST--
 SQLite3 defensive mode ini setting
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc');
+<?php
 
 if (SQLite3::version()['versionNumber'] < 3026000) {
     die("skip: sqlite3 library version < 3.26: no support for defensive mode");
diff --git a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
index d921b99dd7a..0199b798e02 100644
--- a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
+++ b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
@@ -3,8 +3,8 @@ SQLite3::enableExceptions test
 --CREDITS--
 Thijs Feryn <thijs@feryn.eu>
 #TestFest PHPBelgium 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
index c1832694a71..92ec9c28120 100644
--- a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
@@ -3,8 +3,8 @@ SQLite3::open test with empty string argument via the constructor
 --CREDITS--
 Thijs Feryn <thijs@feryn.eu>
 #TestFest PHPBelgium 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3('');
diff --git a/ext/sqlite3/tests/sqlite3_prepare_001.phpt b/ext/sqlite3/tests/sqlite3_prepare_001.phpt
index f97eaab021f..94d984a980b 100644
--- a/ext/sqlite3/tests/sqlite3_prepare_001.phpt
+++ b/ext/sqlite3/tests/sqlite3_prepare_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3 - memory leak on SQLite3Result and SQLite3Stmt
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt
index 2793e5f746a..27a548a8aad 100644
--- a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt
+++ b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt
@@ -3,8 +3,8 @@ SQLite3::prepare test, testing for faulty statement
 --CREDITS--
 Michelangelo van Dam
 # Belgian PHP Testfest 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt
index ccd45e2360f..e2230db0fc3 100644
--- a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt
@@ -3,8 +3,8 @@ SQLite3::prepare test with empty string argument
 --CREDITS--
 Thijs Feryn <thijs@feryn.eu>
 #TestFest PHPBelgium 2009
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 $db = new SQLite3(':memory:');
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
index 76618de3b05..c45e724242d 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3Stmt::getSQL test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
index 0b677c73784..7ab3019f7bd 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
@@ -1,8 +1,9 @@
 --TEST--
 SQLite3Stmt::getSQL expanded test
+--EXTENSIONS--
+sqlite3
 --SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc');
-
+<?php
 if (SQLite3::version()['versionNumber'] < 3014000) {
     die('skip SQLite < 3.14 installed, requires SQLite >= 3.14');
 }
diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
index 81eae9e566c..e6148ce6112 100644
--- a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SQLite3Stmt::paramCount basic test
---SKIPIF--
-<?php require_once(__DIR__ . '/skipif.inc'); ?>
+--EXTENSIONS--
+sqlite3
 --FILE--
 <?php
 
diff --git a/ext/sysvmsg/tests/001.phpt b/ext/sysvmsg/tests/001.phpt
index 3dc95f00b31..2aa28294831 100644
--- a/ext/sysvmsg/tests/001.phpt
+++ b/ext/sysvmsg/tests/001.phpt
@@ -1,8 +1,7 @@
 --TEST--
 send/receive serialized message.
---SKIPIF--
-<?php
-if (!extension_loaded("sysvmsg")) print "skip"; ?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 $key = ftok(__DIR__ . "/001.phpt", "p");
diff --git a/ext/sysvmsg/tests/002.phpt b/ext/sysvmsg/tests/002.phpt
index ae85b4431a4..2cb153aa01f 100644
--- a/ext/sysvmsg/tests/002.phpt
+++ b/ext/sysvmsg/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 msg_receive() should return false when unserialize() failed
---SKIPIF--
-<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extensions is not available")?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 
diff --git a/ext/sysvmsg/tests/003.phpt b/ext/sysvmsg/tests/003.phpt
index 97ad32b2f39..33229334438 100644
--- a/ext/sysvmsg/tests/003.phpt
+++ b/ext/sysvmsg/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 msg_queue_exists()
---SKIPIF--
-<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extension is not available")?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 $id = ftok(__FILE__, 'r');
diff --git a/ext/sysvmsg/tests/004.phpt b/ext/sysvmsg/tests/004.phpt
index bae72ee0a38..360834b2e7e 100644
--- a/ext/sysvmsg/tests/004.phpt
+++ b/ext/sysvmsg/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 msg_set_queue() and msg_stat_queue()
---SKIPIF--
-<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extension is not available")?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 $id = ftok(__FILE__, 'r');
diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt
index ac3592a528b..ec36c85b75f 100644
--- a/ext/sysvmsg/tests/005.phpt
+++ b/ext/sysvmsg/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sysvmsg functions on non-existing queue
---SKIPIF--
-<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extension is not available")?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 
diff --git a/ext/sysvmsg/tests/006.phpt b/ext/sysvmsg/tests/006.phpt
index 479f66cee82..ae608c6c1fb 100644
--- a/ext/sysvmsg/tests/006.phpt
+++ b/ext/sysvmsg/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 msg_send() data types when not serializing
---SKIPIF--
-<?php if (!extension_loaded("sysvmsg")) die("skip sysvmsg extensions is not available")?>
+--EXTENSIONS--
+sysvmsg
 --FILE--
 <?php
 
diff --git a/ext/sysvsem/tests/nowait.phpt b/ext/sysvsem/tests/nowait.phpt
index ef2ba56cbb5..f388b3dd534 100644
--- a/ext/sysvsem/tests/nowait.phpt
+++ b/ext/sysvsem/tests/nowait.phpt
@@ -1,11 +1,8 @@
 --TEST--
 Test sem_acquire with nowait option
---SKIPIF--
-<?php
-if(!extension_loaded('sysvsem') || !extension_loaded('pcntl')) {
-    die("skip sysvsem and pcntl required");
-}
-?>
+--EXTENSIONS--
+sysvsem
+pcntl
 --FILE--
 <?php
 $P_SEMKEY = ftok(__FILE__, 'P');  //  Parent Semaphore key
diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt
index 0ed7b8a7685..c0c64022595 100644
--- a/ext/sysvsem/tests/sysv.phpt
+++ b/ext/sysvsem/tests/sysv.phpt
@@ -1,11 +1,8 @@
 --TEST--
 General semaphore and shared memory test
---SKIPIF--
-<?php
-if(!extension_loaded('sysvsem') || !extension_loaded('sysvshm')) {
-    die("skip Both sysvsem and sysvshm required");
-}
-?>
+--EXTENSIONS--
+sysvsem
+sysvshm
 --FILE--
 <?php
 $MEMSIZE = 512;  //  size of shared memory to allocate
diff --git a/ext/tidy/tests/001.phpt b/ext/tidy/tests/001.phpt
index 277fd03f5e8..b9c104ede7c 100644
--- a/ext/tidy/tests/001.phpt
+++ b/ext/tidy/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for tidy presence
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 echo "tidy extension is available";
diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt
index d276cfabed3..e92d7b2bff7 100644
--- a/ext/tidy/tests/002.phpt
+++ b/ext/tidy/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_string()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $a = tidy_parse_string("<HTML></HTML>");
diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index 43bd6729d77..8e4e3e2af90 100644
--- a/ext/tidy/tests/003.phpt
+++ b/ext/tidy/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_clean_repair()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index 0c73b6c687e..a00b920b8a0 100644
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_diagnose()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $a = tidy_parse_string('<HTML></HTML>');
diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt
index 7fc43d9f27b..fd48f6d3802 100644
--- a/ext/tidy/tests/005-mb.phpt
+++ b/ext/tidy/tests/005-mb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_file()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
     $a = tidy_parse_file(__DIR__."/005私はガラスを食べられます.html");
diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt
index 88d906e8962..130657ffdfd 100644
--- a/ext/tidy/tests/005.phpt
+++ b/ext/tidy/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_file()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
     $a = tidy_parse_file(__DIR__."/005.html");
diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt
index 5ca856075df..6197f6d3625 100644
--- a/ext/tidy/tests/006.phpt
+++ b/ext/tidy/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Verbose tidy_get_error_buffer()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
     $a = tidy_parse_string("<HTML><asd asdf></HTML>");
diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt
index 05239571103..63b566c4d9c 100644
--- a/ext/tidy/tests/007.phpt
+++ b/ext/tidy/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Verbose  tidy_getopt()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --INI--
 tidy.default_config=
 --FILE--
diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt
index f98f79954e4..b6cf26a521a 100644
--- a/ext/tidy/tests/008.phpt
+++ b/ext/tidy/tests/008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing the error buffer via $obj->error_buf...
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
     $a = tidy_parse_string("<HTML><asd asdf></HTML>");
diff --git a/ext/tidy/tests/009.phpt b/ext/tidy/tests/009.phpt
index b3e04d805fe..09217b7eb46 100644
--- a/ext/tidy/tests/009.phpt
+++ b/ext/tidy/tests/009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_doc object overloading
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt
index 42a8676ff6a..338d4047c89 100644
--- a/ext/tidy/tests/010.phpt
+++ b/ext/tidy/tests/010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing root, body, html, and head nodes..
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>", array('newline' => 'LF'));
diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt
index f664f69ebf5..989ba456e66 100644
--- a/ext/tidy/tests/011.phpt
+++ b/ext/tidy/tests/011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing attributes of a node
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>");
diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt
index 0cfa3ef8c6c..0e6cf42ccac 100644
--- a/ext/tidy/tests/012.phpt
+++ b/ext/tidy/tests/012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Accessing children nodes
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/013.phpt b/ext/tidy/tests/013.phpt
index a43a88d5855..89d3f64b9be 100644
--- a/ext/tidy/tests/013.phpt
+++ b/ext/tidy/tests/013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Parsing a file using constructor
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $tidy = new tidy(__DIR__."/013.html", array("show-body-only"=>true));
diff --git a/ext/tidy/tests/014.phpt b/ext/tidy/tests/014.phpt
index 70f85eae379..d4f7c110bfb 100644
--- a/ext/tidy/tests/014.phpt
+++ b/ext/tidy/tests/014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration options through tidy_parse_string().
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $text = "<B>testing</I>";
diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt
index ca00b5cb4de..c588e38fa61 100644
--- a/ext/tidy/tests/015.phpt
+++ b/ext/tidy/tests/015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration options through tidy_parse_file().
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $tidy = tidy_parse_file(__DIR__."/015.html", array('show-body-only'=>true));
diff --git a/ext/tidy/tests/016.phpt b/ext/tidy/tests/016.phpt
index 9b9718ec259..99778b576b5 100644
--- a/ext/tidy/tests/016.phpt
+++ b/ext/tidy/tests/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Passing configuration file through tidy_parse_file() (may fail with buggy libtidy)
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
         $tidy = tidy_parse_file(__DIR__."/016.html",
diff --git a/ext/tidy/tests/017.phpt b/ext/tidy/tests/017.phpt
index d27a42fe84c..f61a444a84a 100644
--- a/ext/tidy/tests/017.phpt
+++ b/ext/tidy/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 The Tidy Output Buffer Filter
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php ob_start("ob_tidyhandler"); ?>
 <B>testing</I>
diff --git a/ext/tidy/tests/018.phpt b/ext/tidy/tests/018.phpt
index 761257e7209..b07770eebb2 100644
--- a/ext/tidy/tests/018.phpt
+++ b/ext/tidy/tests/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 binary safety
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $x = tidy_repair_string("<p>abra\0cadabra</p>",
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt
index 2df1c967096..20a15c7018c 100644
--- a/ext/tidy/tests/019.phpt
+++ b/ext/tidy/tests/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_repair_*() and invalid parameters
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/020.phpt b/ext/tidy/tests/020.phpt
index 8ff1efbb689..236ff471f76 100644
--- a/ext/tidy/tests/020.phpt
+++ b/ext/tidy/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 OO API
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/021.phpt b/ext/tidy/tests/021.phpt
index 2c946b87c66..f4c2a99017f 100644
--- a/ext/tidy/tests/021.phpt
+++ b/ext/tidy/tests/021.phpt
@@ -1,7 +1,9 @@
 --TEST--
 tidy_get_opt_doc()
+--EXTENSIONS--
+tidy
 --SKIPIF--
-<?php if (!extension_loaded("tidy") || !function_exists('tidy_get_opt_doc')) print "skip"; ?>
+<?php if (!function_exists('tidy_get_opt_doc')) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/023.phpt b/ext/tidy/tests/023.phpt
index 1f7b02d56bd..d78a313b6e7 100644
--- a/ext/tidy/tests/023.phpt
+++ b/ext/tidy/tests/023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy and tidyNode OO
---SKIPIF--
-<?php if (!extension_loaded('tidy')) echo 'skip'; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/024.phpt b/ext/tidy/tests/024.phpt
index 6a258b30aad..141bd6470e4 100644
--- a/ext/tidy/tests/024.phpt
+++ b/ext/tidy/tests/024.phpt
@@ -1,10 +1,7 @@
 --TEST--
 libtidy handling of 'new-blocklevel-tags'
---SKIPIF--
-<?php
-if (!extension_loaded('tidy')) die('skip');
-if (strtotime(tidy_get_release()) < strtotime('20 january 2007')) die ('skip old libtidy');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/025.phpt b/ext/tidy/tests/025.phpt
index df9392eb2f5..eda79a98851 100644
--- a/ext/tidy/tests/025.phpt
+++ b/ext/tidy/tests/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidyNode tests
---SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/026.phpt b/ext/tidy/tests/026.phpt
index b46cd5464b9..922a4069183 100644
--- a/ext/tidy/tests/026.phpt
+++ b/ext/tidy/tests/026.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy.clean_output test
---SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+--EXTENSIONS--
+tidy
 --INI--
 tidy.clean_output=1
 --FILE--
diff --git a/ext/tidy/tests/027.phpt b/ext/tidy/tests/027.phpt
index fb26a70f861..059f129e36f 100644
--- a/ext/tidy/tests/027.phpt
+++ b/ext/tidy/tests/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug: tidy segfaults with markup=false
---SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/028.phpt b/ext/tidy/tests/028.phpt
index 01f3fd1e1a9..7de022b8a53 100644
--- a/ext/tidy/tests/028.phpt
+++ b/ext/tidy/tests/028.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidyNode::getParent()
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $x = tidy_parse_string("<body><div>Content</div></body>");
diff --git a/ext/tidy/tests/029.phpt b/ext/tidy/tests/029.phpt
index f28f52fba87..e2c9bcb7292 100644
--- a/ext/tidy/tests/029.phpt
+++ b/ext/tidy/tests/029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_get_body() crash
---SKIPIF--
-<?php if (!extension_loaded('tidy')) die('skip'); ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/030.phpt b/ext/tidy/tests/030.phpt
index f29d6ee01fe..a4cd669da80 100644
--- a/ext/tidy/tests/030.phpt
+++ b/ext/tidy/tests/030.phpt
@@ -2,10 +2,8 @@
 getConfig() method - basic test for getConfig()
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<html></html>';
diff --git a/ext/tidy/tests/031.phpt b/ext/tidy/tests/031.phpt
index cf6aed9cce9..e41d94be2f7 100644
--- a/ext/tidy/tests/031.phpt
+++ b/ext/tidy/tests/031.phpt
@@ -2,10 +2,8 @@
 tidy_config_count() function - basic test for tidy_config_count()
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<html></html>';
diff --git a/ext/tidy/tests/032.phpt b/ext/tidy/tests/032.phpt
index 23230b06506..e9159343259 100644
--- a/ext/tidy/tests/032.phpt
+++ b/ext/tidy/tests/032.phpt
@@ -2,10 +2,8 @@
 tidy_error_count() function - basic test for tidy_error_count()
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<img src="file.png" /><php>';
diff --git a/ext/tidy/tests/033.phpt b/ext/tidy/tests/033.phpt
index 2c4bb44d478..b29eaa5b40c 100644
--- a/ext/tidy/tests/033.phpt
+++ b/ext/tidy/tests/033.phpt
@@ -2,10 +2,8 @@
 tidy_warning_count() function - basic test for tidy_warning_count()
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<img src="file.png" /><php>';
diff --git a/ext/tidy/tests/034.phpt b/ext/tidy/tests/034.phpt
index 9780315239f..17136ea69e0 100644
--- a/ext/tidy/tests/034.phpt
+++ b/ext/tidy/tests/034.phpt
@@ -2,10 +2,8 @@
 tidy_access_count() function - basic test for tidy_access_count()
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<img src="file.png" /><php>';
diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt
index 720e095f75b..66b585dcb2e 100644
--- a/ext/tidy/tests/035.phpt
+++ b/ext/tidy/tests/035.phpt
@@ -1,9 +1,7 @@
 --TEST--
 tidyNode::__construct()
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 new tidyNode;
diff --git a/ext/tidy/tests/bug54682.phpt b/ext/tidy/tests/bug54682.phpt
index 174bbb37c42..983a33017e8 100644
--- a/ext/tidy/tests/bug54682.phpt
+++ b/ext/tidy/tests/bug54682.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Tidy::diagnose() NULL pointer dereference
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/bug77040.phpt b/ext/tidy/tests/bug77040.phpt
index a1af00bdfb7..417c5e5f892 100644
--- a/ext/tidy/tests/bug77040.phpt
+++ b/ext/tidy/tests/bug77040.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #77040 (tidyNode::isHtml() is completely broken)
---SKIPIF--
-<?php
-if (!extension_loaded('tidy')) die('skip tidy extension not available');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $tidy = new tidy;
diff --git a/ext/tidy/tests/bug77594.phpt b/ext/tidy/tests/bug77594.phpt
index 0d84a035f79..ef664a015d8 100644
--- a/ext/tidy/tests/bug77594.phpt
+++ b/ext/tidy/tests/bug77594.phpt
@@ -2,10 +2,8 @@
 Bug #77594 (ob_tidyhandler is never reset)
 --DESCRIPTION--
 Test is useful only with --repeat 2 (or more)
---SKIPIF--
-<?php
-if (!extension_loaded('tidy')) die('skip tidy extension not available');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 ob_start('ob_tidyhandler');
diff --git a/ext/tidy/tests/bug_50558.phpt b/ext/tidy/tests/bug_50558.phpt
index b37cb92196a..ec6b975ca65 100644
--- a/ext/tidy/tests/bug_50558.phpt
+++ b/ext/tidy/tests/bug_50558.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #50558 - Broken object model when extending tidy
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 class MyTidy extends tidy
diff --git a/ext/tidy/tests/tidy_error.phpt b/ext/tidy/tests/tidy_error.phpt
index f8aae96ef64..002cf0ac1de 100644
--- a/ext/tidy/tests/tidy_error.phpt
+++ b/ext/tidy/tests/tidy_error.phpt
@@ -2,10 +2,8 @@
 Ensure tidy_get_status() returns correct status
 --CREDITS--
 Stefan Priebsch
---SKIPIF--
-<?php
- if (!extension_loaded("tidy")) print "skip tidy extension not loaded";
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 
diff --git a/ext/tidy/tests/tidy_error1.phpt b/ext/tidy/tests/tidy_error1.phpt
index a25501352d5..e9ced390d7e 100644
--- a/ext/tidy/tests/tidy_error1.phpt
+++ b/ext/tidy/tests/tidy_error1.phpt
@@ -2,10 +2,8 @@
 Notice triggered by invalid configuration options
 --CREDITS--
 Christian Wenz <wenz@php.net>
---SKIPIF--
-<?php
-  if (!extension_loaded('tidy')) die ('skip tidy not present');
-?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php
 $buffer = '<html></html>';
diff --git a/ext/tidy/tests/uninitialized.phpt b/ext/tidy/tests/uninitialized.phpt
index 3533f0d3453..7793f9725b1 100644
--- a/ext/tidy/tests/uninitialized.phpt
+++ b/ext/tidy/tests/uninitialized.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Operations on uninitialized tidy object
---SKIPIF--
-<?php if (!extension_loaded("tidy")) print "skip"; ?>
+--EXTENSIONS--
+tidy
 --FILE--
 <?php