From 8567bc10c467c08d34b34e506ce69cb8a62c76be Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Jun 2021 13:57:47 +0200
Subject: [PATCH] Port curl, xml, xsql to use EXTENSIONS (#7140)

---
 ext/curl/tests/bug27023.phpt                           |  4 ++--
 ext/curl/tests/bug45161.phpt                           |  6 ++----
 ext/curl/tests/bug46739.phpt                           |  6 ++----
 ext/curl/tests/bug48203.phpt                           |  4 ++--
 ext/curl/tests/bug48203_multi.phpt                     |  6 ++----
 ext/curl/tests/bug48207.phpt                           |  4 ++--
 ext/curl/tests/bug54798-unix.phpt                      |  3 ++-
 ext/curl/tests/bug54798.phpt                           |  6 ++----
 ext/curl/tests/bug55767.phpt                           |  6 ++----
 ext/curl/tests/bug66109.phpt                           |  4 ++--
 ext/curl/tests/bug68089.phpt                           |  7 ++-----
 ext/curl/tests/bug68937.phpt                           |  6 ++----
 ext/curl/tests/bug68937_2.phpt                         |  6 ++----
 ext/curl/tests/bug69316.phpt                           |  4 ++--
 ext/curl/tests/bug69485.phpt                           |  4 ++--
 ext/curl/tests/bug70330.phpt                           |  4 ++--
 ext/curl/tests/bug71144.phpt                           |  3 ++-
 ext/curl/tests/bug72189.phpt                           |  6 ++----
 ext/curl/tests/bug76675.phpt                           |  3 ++-
 ext/curl/tests/bug77535.phpt                           |  3 ++-
 ext/curl/tests/bug77711.phpt                           |  4 ++--
 ext/curl/tests/bug79033.phpt                           |  4 ++--
 ext/curl/tests/bug80595.phpt                           |  4 ++--
 ext/curl/tests/curl_CURLOPT_READDATA.phpt              |  4 ++--
 ext/curl/tests/curl_basic_001.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_002.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_003.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_004.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_005.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_006.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_011.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_012.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_013.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_018.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_019.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_020.phpt                     |  4 ++--
 ext/curl/tests/curl_basic_021.phpt                     |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_001.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_002.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_004.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_005.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_006.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_007.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_basic_008.phpt         |  4 ++--
 ext/curl/tests/curl_copy_handle_variation3.phpt        |  4 ++--
 ext/curl/tests/curl_copy_handle_variation4.phpt        |  4 ++--
 ext/curl/tests/curl_copy_handle_variation5.phpt        |  4 ++--
 .../tests/curl_file_deleted_before_curl_close.phpt     |  4 ++--
 ext/curl/tests/curl_file_upload.phpt                   |  4 ++--
 ext/curl/tests/curl_file_upload_stream.phpt            |  3 ++-
 ext/curl/tests/curl_handle_clone.phpt                  |  4 ++--
 ext/curl/tests/curl_multi_getcontent_basic3.phpt       |  4 ++--
 ext/curl/tests/curl_setopt_array_basic.phpt            |  4 ++--
 ext/curl/tests/curl_setopt_basic002.phpt               |  4 ++--
 ext/curl/tests/curl_setopt_basic003.phpt               |  4 ++--
 ext/curl/tests/curl_setopt_basic004.phpt               |  4 ++--
 ext/curl/tests/curl_string_file_upload.phpt            |  4 ++--
 ext/curl/tests/curl_writeheader_callback.phpt          |  4 ++--
 ext/curl/tests/skipif.inc                              |  2 --
 ext/xml/tests/bug25666.phpt                            |  3 ++-
 ext/xml/tests/bug26528.phpt                            |  6 ++----
 ext/xml/tests/bug26614.phpt                            |  3 ++-
 ext/xml/tests/bug26614_libxml.phpt                     |  3 ++-
 ext/xml/tests/bug27908.phpt                            |  6 ++----
 ext/xml/tests/bug30266.phpt                            |  6 ++----
 ext/xml/tests/bug32001.phpt                            |  2 +-
 ext/xml/tests/bug32001b.phpt                           |  2 +-
 ext/xml/tests/bug35447.phpt                            |  3 ++-
 ext/xml/tests/bug46699.phpt                            |  3 ++-
 ext/xml/tests/bug50576.phpt                            |  6 ++----
 ext/xml/tests/bug65236.phpt                            |  6 ++----
 ext/xml/tests/bug72099.phpt                            |  6 ++----
 ext/xml/tests/bug72793.phpt                            |  4 ++--
 ext/xml/tests/bug76874.phpt                            |  4 ++--
 ext/xml/tests/bug78563.phpt                            |  4 ++--
 ext/xml/tests/bug78563_final.phpt                      |  4 ++--
 ext/xml/tests/bug78563_serialize.phpt                  |  4 ++--
 ext/xml/tests/skipif.inc                               | 10 ----------
 ext/xml/tests/xml001.phpt                              |  3 ++-
 ext/xml/tests/xml002.phpt                              |  3 ++-
 ext/xml/tests/xml003.phpt                              |  3 ++-
 ext/xml/tests/xml004.phpt                              |  4 ++--
 ext/xml/tests/xml007.phpt                              |  3 ++-
 ext/xml/tests/xml009.phpt                              |  3 ++-
 ext/xml/tests/xml010.phpt                              |  3 ++-
 ext/xml/tests/xml011.phpt                              |  6 ++----
 ext/xml/tests/xml_closures_001.phpt                    |  4 ++--
 ext/xsl/tests/bug26384.phpt                            |  4 ++--
 ext/xsl/tests/skipif.inc                               |  1 -
 ext/xsl/tests/xslt001.phpt                             |  4 ++--
 ext/xsl/tests/xslt002.phpt                             |  4 ++--
 ext/xsl/tests/xslt003.phpt                             |  4 ++--
 ext/xsl/tests/xslt004.phpt                             |  4 ++--
 ext/xsl/tests/xslt005.phpt                             |  4 ++--
 ext/xsl/tests/xslt006.phpt                             |  4 ++--
 ext/xsl/tests/xslt007.phpt                             |  4 ++--
 ext/xsl/tests/xslt008-mb.phpt                          |  5 +----
 ext/xsl/tests/xslt008.phpt                             |  5 +----
 ext/xsl/tests/xslt009.phpt                             |  5 +----
 ext/xsl/tests/xslt010.phpt                             |  3 ++-
 ext/xsl/tests/xslt010_gt10129.phpt                     |  3 ++-
 ext/xsl/tests/xslt011.phpt                             |  4 ++--
 ext/xsl/tests/xslt012.phpt                             |  4 ++--
 103 files changed, 195 insertions(+), 232 deletions(-)
 delete mode 100644 ext/curl/tests/skipif.inc
 delete mode 100644 ext/xml/tests/skipif.inc
 delete mode 100644 ext/xsl/tests/skipif.inc

diff --git a/ext/curl/tests/bug27023.phpt b/ext/curl/tests/bug27023.phpt
index f985c192b84..7d6850d75cc 100644
--- a/ext/curl/tests/bug27023.phpt
+++ b/ext/curl/tests/bug27023.phpt
@@ -2,8 +2,8 @@
 Bug #27023 (CURLOPT_POSTFIELDS does not parse content types for files)
 --INI--
 error_reporting = E_ALL & ~E_DEPRECATED
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index 5b8fe0d46c4..9ba8f5f9024 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #45161 (Reusing a curl handle leaks memory)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt
index bf9a5c20d34..3c01b4b8396 100644
--- a/ext/curl/tests/bug46739.phpt
+++ b/ext/curl/tests/bug46739.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #46739 (array returned by curl_getinfo should contain content_type key)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt
index 79c7d7f679d..1f1423cbee9 100644
--- a/ext/curl/tests/bug48203.phpt
+++ b/ext/curl/tests/bug48203.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48203 (Crash when CURLOPT_STDERR is set to regular file)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt
index 7b3d05e7132..19077147a61 100644
--- a/ext/curl/tests/bug48203_multi.phpt
+++ b/ext/curl/tests/bug48203_multi.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to curl are closed before calling curl_multi_exec)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug48207.phpt b/ext/curl/tests/bug48207.phpt
index 0cd5b141634..982744c7852 100644
--- a/ext/curl/tests/bug48207.phpt
+++ b/ext/curl/tests/bug48207.phpt
@@ -3,8 +3,8 @@ Test curl_setopt() CURLOPT_FILE readonly file handle
 --CREDITS--
 Mark van der Velden
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 /*
diff --git a/ext/curl/tests/bug54798-unix.phpt b/ext/curl/tests/bug54798-unix.phpt
index 5f07b64c6fe..6eb5099b31b 100644
--- a/ext/curl/tests/bug54798-unix.phpt
+++ b/ext/curl/tests/bug54798-unix.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec)
+--EXTENSIONS--
+curl
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
     die('skip not for Windows');
 }
diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt
index d2661fce8f7..4403b5212aa 100644
--- a/ext/curl/tests/bug54798.phpt
+++ b/ext/curl/tests/bug54798.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt
index f55660ba073..a57da6e6d88 100644
--- a/ext/curl/tests/bug55767.phpt
+++ b/ext/curl/tests/bug55767.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Test curl_opt() function with POST params from array with a numeric key
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/bug66109.phpt b/ext/curl/tests/bug66109.phpt
index 4a4ae30698b..48fcfb4beed 100644
--- a/ext/curl/tests/bug66109.phpt
+++ b/ext/curl/tests/bug66109.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66109 (Option CURLOPT_CUSTOMREQUEST can't be reset to default.)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug68089.phpt b/ext/curl/tests/bug68089.phpt
index a4a39ec6f5a..b8733c5066b 100644
--- a/ext/curl/tests/bug68089.phpt
+++ b/ext/curl/tests/bug68089.phpt
@@ -1,10 +1,7 @@
 --TEST--
 Bug #68089 (NULL byte injection - cURL lib)
---SKIPIF--
-<?php
-include 'skipif.inc';
-
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 $url = "file:///etc/passwd\0http://google.com";
diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt
index 9f281175949..7c42483f9fa 100644
--- a/ext/curl/tests/bug68937.phpt
+++ b/ext/curl/tests/bug68937.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug # #68937 (Segfault in curl_multi_exec)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt
index 1ce5b521142..596bbfa4b37 100644
--- a/ext/curl/tests/bug68937_2.phpt
+++ b/ext/curl/tests/bug68937_2.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug # #68937 (Segfault in curl_multi_exec)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug69316.phpt b/ext/curl/tests/bug69316.phpt
index d81175c2be5..3e0e049d08e 100644
--- a/ext/curl/tests/bug69316.phpt
+++ b/ext/curl/tests/bug69316.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   function hdr_callback($ch, $data) {
diff --git a/ext/curl/tests/bug69485.phpt b/ext/curl/tests/bug69485.phpt
index 274cdce5824..a82d22c2c02 100644
--- a/ext/curl/tests/bug69485.phpt
+++ b/ext/curl/tests/bug69485.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69485 (Double free on zend_list_dtor)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug70330.phpt b/ext/curl/tests/bug70330.phpt
index 570a451cdad..c284145074a 100644
--- a/ext/curl/tests/bug70330.phpt
+++ b/ext/curl/tests/bug70330.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70330 (Segmentation Fault with multiple "curl_copy_handle")
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 $t2 = curl_init();
diff --git a/ext/curl/tests/bug71144.phpt b/ext/curl/tests/bug71144.phpt
index 059cd63651f..0c6225271d9 100644
--- a/ext/curl/tests/bug71144.phpt
+++ b/ext/curl/tests/bug71144.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Bug #71144 (Sementation fault when using cURL with ZTS)
+--EXTENSIONS--
+curl
 --SKIPIF--
-<?php include 'skipif.inc'; ?>
 <?php if (!PHP_ZTS) { print "skip only for zts build"; } ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/bug72189.phpt b/ext/curl/tests/bug72189.phpt
index 2bd0ca37053..ad8d8640201 100644
--- a/ext/curl/tests/bug72189.phpt
+++ b/ext/curl/tests/bug72189.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Request #72189 (Add missing CURL_VERSION_* constants)
---SKIPIF--
-<?php
-include 'skipif.inc';
-?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt
index 5d36abfdd67..8f31aa5eed6 100644
--- a/ext/curl/tests/bug76675.phpt
+++ b/ext/curl/tests/bug76675.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #76675 (Segfault with H2 server push write/writeheader handlers)
+--EXTENSIONS--
+curl
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");
 }
diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt
index b1d8f4d4da5..ec86bf207b0 100644
--- a/ext/curl/tests/bug77535.phpt
+++ b/ext/curl/tests/bug77535.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #77535 (Invalid callback, h2 server push)
+--EXTENSIONS--
+curl
 --SKIPIF--
 <?php
-include 'skipif.inc';
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");
 }
diff --git a/ext/curl/tests/bug77711.phpt b/ext/curl/tests/bug77711.phpt
index dec53d0acb9..fee41e4274a 100644
--- a/ext/curl/tests/bug77711.phpt
+++ b/ext/curl/tests/bug77711.phpt
@@ -1,7 +1,7 @@
 --TEST--
 FR #77711 (CURLFile should support UNICODE filenames)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug79033.phpt b/ext/curl/tests/bug79033.phpt
index 1ba75ad0e62..6bd3331eb9e 100644
--- a/ext/curl/tests/bug79033.phpt
+++ b/ext/curl/tests/bug79033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #79033 (Curl timeout error with specific url and post)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/bug80595.phpt b/ext/curl/tests/bug80595.phpt
index 48137db4e6d..0b7475eec47 100644
--- a/ext/curl/tests/bug80595.phpt
+++ b/ext/curl/tests/bug80595.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #80595 (Resetting POSTFIELDS to empty array breaks request)
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/curl_CURLOPT_READDATA.phpt b/ext/curl/tests/curl_CURLOPT_READDATA.phpt
index 9266139c0dd..21d394a674c 100644
--- a/ext/curl/tests/curl_CURLOPT_READDATA.phpt
+++ b/ext/curl/tests/curl_CURLOPT_READDATA.phpt
@@ -3,8 +3,8 @@ Test CURLOPT_READDATA without a callback function
 --CREDITS--
 Mattijs Hoitink mattijshoitink@gmail.com
 #Testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_basic_001.phpt b/ext/curl/tests/curl_basic_001.phpt
index 2e9dbf2c3e8..f89394acdac 100644
--- a/ext/curl/tests/curl_basic_001.phpt
+++ b/ext/curl/tests/curl_basic_001.phpt
@@ -3,8 +3,8 @@ Test curl_exec() function with basic functionality
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt
index 740b3d5256a..1b79fc0d6dc 100644
--- a/ext/curl/tests/curl_basic_002.phpt
+++ b/ext/curl/tests/curl_basic_002.phpt
@@ -3,8 +3,8 @@ Test curl_opt() function with CURLOPT_RETURNTRANSFER parameter set to 1
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt
index ef0eba4c10b..cc578b9b505 100644
--- a/ext/curl/tests/curl_basic_003.phpt
+++ b/ext/curl/tests/curl_basic_003.phpt
@@ -3,8 +3,8 @@ Test curl_opt() function with POST parameters
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt
index 99e38294543..eb89987a313 100644
--- a/ext/curl/tests/curl_basic_004.phpt
+++ b/ext/curl/tests/curl_basic_004.phpt
@@ -3,8 +3,8 @@ Test curl_opt() function with setting referer
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt
index f16d6f6eb13..542e253d53e 100644
--- a/ext/curl/tests/curl_basic_005.phpt
+++ b/ext/curl/tests/curl_basic_005.phpt
@@ -3,8 +3,8 @@ Test curl_opt() function with user agent
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt
index cc8d8ca2339..a39eaa06b7c 100644
--- a/ext/curl/tests/curl_basic_006.phpt
+++ b/ext/curl/tests/curl_basic_006.phpt
@@ -3,8 +3,8 @@ Test curl_opt() function with CURLOPT_WRITEFUNCTION parameter set to a closure
 --CREDITS--
 ?
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt
index b0e96459da8..cf8cc63d02f 100644
--- a/ext/curl/tests/curl_basic_011.phpt
+++ b/ext/curl/tests/curl_basic_011.phpt
@@ -2,8 +2,8 @@
 Test curl_opt() function with COOKIE
 --CREDITS--
 TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt
index 1062e87f7b0..9de92898f39 100644
--- a/ext/curl/tests/curl_basic_012.phpt
+++ b/ext/curl/tests/curl_basic_012.phpt
@@ -2,8 +2,8 @@
 Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0
 --CREDITS--
 TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt
index e8305ba1626..4b0c46b5183 100644
--- a/ext/curl/tests/curl_basic_013.phpt
+++ b/ext/curl/tests/curl_basic_013.phpt
@@ -2,8 +2,8 @@
 Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1
 --CREDITS--
 TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt
index c241dc1c157..e500cd73b4a 100644
--- a/ext/curl/tests/curl_basic_018.phpt
+++ b/ext/curl/tests/curl_basic_018.phpt
@@ -2,8 +2,8 @@
 Test curl_setopt() with curl_multi function with basic functionality
 --CREDITS--
 TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_019.phpt b/ext/curl/tests/curl_basic_019.phpt
index 93b947c9156..20bddd87210 100644
--- a/ext/curl/tests/curl_basic_019.phpt
+++ b/ext/curl/tests/curl_basic_019.phpt
@@ -2,8 +2,8 @@
 Test curl_getinfo() function with CURLINFO_EFFECTIVE_URL parameter
 --CREDITS--
 Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_020.phpt b/ext/curl/tests/curl_basic_020.phpt
index 6c4fe8c585c..d7f92d3d666 100644
--- a/ext/curl/tests/curl_basic_020.phpt
+++ b/ext/curl/tests/curl_basic_020.phpt
@@ -2,8 +2,8 @@
 Test curl_getinfo() function with CURLINFO_HTTP_CODE parameter
 --CREDITS--
 Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt
index 93ec89bdee1..d6b31f2c41a 100644
--- a/ext/curl/tests/curl_basic_021.phpt
+++ b/ext/curl/tests/curl_basic_021.phpt
@@ -2,8 +2,8 @@
 Test curl_getinfo() function with CURLINFO_CONTENT_TYPE parameter
 --CREDITS--
 Jean-Marc Fontaine <jmf@durcommefaire.net>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt
index fbf80878772..527c8183251 100644
--- a/ext/curl/tests/curl_copy_handle_basic_001.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt
@@ -3,8 +3,8 @@ Test curl_copy_handle() with simple get
 --CREDITS--
 Rick Buitenman <rick@meritos.nl>
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt
index 1c3f29f53ec..8976433de2d 100644
--- a/ext/curl/tests/curl_copy_handle_basic_002.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt
@@ -3,8 +3,8 @@ Test curl_copy_handle() with simple POST
 --CREDITS--
 Rick Buitenman <rick@meritos.nl>
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt
index fe860abfbcb..be0c4e34623 100644
--- a/ext/curl/tests/curl_copy_handle_basic_004.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt
@@ -3,8 +3,8 @@ Test curl_copy_handle() after exec()
 --CREDITS--
 Rick Buitenman <rick@meritos.nl>
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt
index 54f9e14a4e3..1b5f10034c2 100644
--- a/ext/curl/tests/curl_copy_handle_basic_005.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt
@@ -3,8 +3,8 @@ Test curl_copy_handle() after exec() with POST
 --CREDITS--
 Rick Buitenman <rick@meritos.nl>
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt
index e90501466b8..0aaacb70d3b 100644
--- a/ext/curl/tests/curl_copy_handle_basic_006.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt
@@ -3,8 +3,8 @@ Test curl_copy_handle() with User Agent
 --CREDITS--
 Rick Buitenman <rick@meritos.nl>
 #testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt
index d0a0b9e8daf..16be071ae00 100644
--- a/ext/curl/tests/curl_copy_handle_basic_007.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_copy_handle() with simple POST
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_basic_008.phpt b/ext/curl/tests/curl_copy_handle_basic_008.phpt
index ecb039b403d..c1ab325660c 100644
--- a/ext/curl/tests/curl_copy_handle_basic_008.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_copy_handle() with CURLOPT_PROGRESSFUNCTION
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
   include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_variation3.phpt b/ext/curl/tests/curl_copy_handle_variation3.phpt
index ae643f4b302..43d55bf7688 100644
--- a/ext/curl/tests/curl_copy_handle_variation3.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 curl_copy_handle() allows to post CURLFile multiple times
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_variation4.phpt b/ext/curl/tests/curl_copy_handle_variation4.phpt
index 4ba37841397..8229075dfa3 100644
--- a/ext/curl/tests/curl_copy_handle_variation4.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 curl_copy_handle() allows to post CURLFile multiple times with curl_multi_exec()
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/curl_copy_handle_variation5.phpt b/ext/curl/tests/curl_copy_handle_variation5.phpt
index 019704e6c89..5549c27d1a1 100644
--- a/ext/curl/tests/curl_copy_handle_variation5.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 curl_copy_handle() allows to post CURLFile multiple times if postfields change
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 include 'server.inc';
diff --git a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
index 3d78ce60af8..17a3b476f44 100644
--- a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
+++ b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
@@ -2,8 +2,8 @@
 Memory corruption error if fp of just created file is closed before curl_close.
 --CREDITS--
 Alexey Shein <confik@gmail.com>
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_file_upload.phpt b/ext/curl/tests/curl_file_upload.phpt
index f1a8dab113b..75aba7d90e8 100644
--- a/ext/curl/tests/curl_file_upload.phpt
+++ b/ext/curl/tests/curl_file_upload.phpt
@@ -1,7 +1,7 @@
 --TEST--
 CURL file uploading
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_file_upload_stream.phpt b/ext/curl/tests/curl_file_upload_stream.phpt
index 082130176d5..0288130d5e6 100644
--- a/ext/curl/tests/curl_file_upload_stream.phpt
+++ b/ext/curl/tests/curl_file_upload_stream.phpt
@@ -1,7 +1,8 @@
 --TEST--
 CURL file uploading from stream
+--EXTENSIONS--
+curl
 --SKIPIF--
-<?php include 'skipif.inc'; ?>
 <?php
 if (curl_version()['version_number'] < 0x73800) die('skip requires curl >= 7.56.0');
 --FILE--
diff --git a/ext/curl/tests/curl_handle_clone.phpt b/ext/curl/tests/curl_handle_clone.phpt
index aa1251cbe01..14cff6b3be4 100644
--- a/ext/curl/tests/curl_handle_clone.phpt
+++ b/ext/curl/tests/curl_handle_clone.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test that cloning of Curl objects is supported
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index 601aa17a2fe..4e4f0fd21e7 100644
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -3,8 +3,8 @@ Curl_multi_getcontent() basic test with different sources (local file/http)
 --CREDITS--
 Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
     //CURL_MULTI_GETCONTENT TEST
diff --git a/ext/curl/tests/curl_setopt_array_basic.phpt b/ext/curl/tests/curl_setopt_array_basic.phpt
index 7978fd61c61..361bb35f681 100644
--- a/ext/curl/tests/curl_setopt_array_basic.phpt
+++ b/ext/curl/tests/curl_setopt_array_basic.phpt
@@ -3,8 +3,8 @@ curl_setopt_array() function - tests setting multiple cURL options with curl_set
 --CREDITS--
 Mattijs Hoitink mattijshoitink@gmail.com
 #Testfest Utrecht 2009
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 /*
diff --git a/ext/curl/tests/curl_setopt_basic002.phpt b/ext/curl/tests/curl_setopt_basic002.phpt
index 72754d989a9..faf7fef6e93 100644
--- a/ext/curl/tests/curl_setopt_basic002.phpt
+++ b/ext/curl/tests/curl_setopt_basic002.phpt
@@ -3,8 +3,8 @@ curl_setopt basic tests with CURLOPT_STDERR.
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_setopt_basic003.phpt b/ext/curl/tests/curl_setopt_basic003.phpt
index d4a63e8854a..ad56e1e1f24 100644
--- a/ext/curl/tests/curl_setopt_basic003.phpt
+++ b/ext/curl/tests/curl_setopt_basic003.phpt
@@ -3,8 +3,8 @@ curl_setopt() call with CURLOPT_HTTPHEADER
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_setopt_basic004.phpt b/ext/curl/tests/curl_setopt_basic004.phpt
index ee0b4921d5c..a54ec157aa0 100644
--- a/ext/curl/tests/curl_setopt_basic004.phpt
+++ b/ext/curl/tests/curl_setopt_basic004.phpt
@@ -3,8 +3,8 @@ curl_setopt() call with CURLOPT_RETURNTRANSFER
 --CREDITS--
 Paul Sohier
 #phptestfest utrecht
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_string_file_upload.phpt b/ext/curl/tests/curl_string_file_upload.phpt
index 65a041e1466..6a1b1126244 100644
--- a/ext/curl/tests/curl_string_file_upload.phpt
+++ b/ext/curl/tests/curl_string_file_upload.phpt
@@ -1,7 +1,7 @@
 --TEST--
 CURL file uploading from string
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_writeheader_callback.phpt b/ext/curl/tests/curl_writeheader_callback.phpt
index f56adb1dc52..3b9b10d02f2 100644
--- a/ext/curl/tests/curl_writeheader_callback.phpt
+++ b/ext/curl/tests/curl_writeheader_callback.phpt
@@ -5,8 +5,8 @@ Mathieu Kooiman <mathieuk@gmail.com>
 Dutch UG, TestFest 2009, Utrecht
 --DESCRIPTION--
 Hit the host and determine that the headers are sent to the callback specified for CURLOPT_HEADERFUNCTION. Different test servers might return different sets of headers. Just test for HTTP/1.1 200 OK.
---SKIPIF--
-<?php include 'skipif.inc'; ?>
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/skipif.inc b/ext/curl/tests/skipif.inc
deleted file mode 100644
index ea8bd0a5a85..00000000000
--- a/ext/curl/tests/skipif.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-if (!extension_loaded("curl")) exit("skip curl extension not loaded");
diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt
index ca4b15f405d..54103e0c210 100644
--- a/ext/xml/tests/bug25666.phpt
+++ b/ext/xml/tests/bug25666.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #25666 (XML namespaces broken in libxml-based SAX interface)
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not supported on this platform");}
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt
index 152a18540d9..c100f481bc8 100644
--- a/ext/xml/tests/bug26528.phpt
+++ b/ext/xml/tests/bug26528.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #26528 (HTML entities are not being decoded)
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
     $sample = "<?xml version=\"1.0\"?><test attr=\"angle&lt;bracket\"/>";
diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt
index ed42bc1fbf3..846d9fc6531 100644
--- a/ext/xml/tests/bug26614.phpt
+++ b/ext/xml/tests/bug26614.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (defined("LIBXML_VERSION")) die('skip expat test');
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt
index b6c0b875818..6acf2c44b2a 100644
--- a/ext/xml/tests/bug26614_libxml.phpt
+++ b/ext/xml/tests/bug26614_libxml.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug27908.phpt b/ext/xml/tests/bug27908.phpt
index b1e583efa1c..fee8cfb1ee4 100644
--- a/ext/xml/tests/bug27908.phpt
+++ b/ext/xml/tests/bug27908.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #27908 (default handler not being called)
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug30266.phpt b/ext/xml/tests/bug30266.phpt
index a7fe7592fe8..cc910dd01ef 100644
--- a/ext/xml/tests/bug30266.phpt
+++ b/ext/xml/tests/bug30266.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #30266 (Invalid opcode 137/1/8)
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 /*
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 111d86bd31e..0af4488ac2e 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -2,9 +2,9 @@
 Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect), using UTF-*
 --EXTENSIONS--
 iconv
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (ICONV_IMPL == 'glibc' && version_compare(ICONV_VERSION, '2.12', '<='))
     die("skip iconv of glibc <= 2.12 is buggy");
 ?>
diff --git a/ext/xml/tests/bug32001b.phpt b/ext/xml/tests/bug32001b.phpt
index 310a48f9fc8..2f1b537ab00 100644
--- a/ext/xml/tests/bug32001b.phpt
+++ b/ext/xml/tests/bug32001b.phpt
@@ -2,9 +2,9 @@
 Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect), using EUC-JP, Shift_JIS, GB2312
 --EXTENSIONS--
 iconv
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 foreach(array('EUC-JP', 'Shift_JISP', 'GB2312') as $encoding) {
     try {
         xml_parser_create($encoding);
diff --git a/ext/xml/tests/bug35447.phpt b/ext/xml/tests/bug35447.phpt
index 0f5f5581d04..229d59314d0 100644
--- a/ext/xml/tests/bug35447.phpt
+++ b/ext/xml/tests/bug35447.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #35447 (xml_parse_into_struct() chokes on the UTF-8 BOM)
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not supported on this platform");}
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug46699.phpt b/ext/xml/tests/bug46699.phpt
index 3996fd19177..9570ad9231d 100644
--- a/ext/xml/tests/bug46699.phpt
+++ b/ext/xml/tests/bug46699.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Bug #46699: (xml_parse crash when parser is namespace aware)
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not supported on this platform");}
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug50576.phpt b/ext/xml/tests/bug50576.phpt
index 152206a951c..3279966b3aa 100644
--- a/ext/xml/tests/bug50576.phpt
+++ b/ext/xml/tests/bug50576.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect)
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt
index 67b26d663f6..b98491dbdba 100644
--- a/ext/xml/tests/bug65236.phpt
+++ b/ext/xml/tests/bug65236.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #65236 (heap corruption in xml parser)
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 xml_parse_into_struct(xml_parser_create_ns(), str_repeat("<blah>", 1000), $a);
diff --git a/ext/xml/tests/bug72099.phpt b/ext/xml/tests/bug72099.phpt
index 6d6c20e9503..b50e9e40425 100644
--- a/ext/xml/tests/bug72099.phpt
+++ b/ext/xml/tests/bug72099.phpt
@@ -1,9 +1,7 @@
 --TEST--
 Bug #72099: xml_parse_into_struct segmentation fault
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 $var1=xml_parser_create_ns();
diff --git a/ext/xml/tests/bug72793.phpt b/ext/xml/tests/bug72793.phpt
index edbbaed8841..57bc815d75f 100644
--- a/ext/xml/tests/bug72793.phpt
+++ b/ext/xml/tests/bug72793.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72793: xml_parser_free leaks mem when execute xml_set_object
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug76874.phpt b/ext/xml/tests/bug76874.phpt
index ec0caae706a..804fb24241e 100644
--- a/ext/xml/tests/bug76874.phpt
+++ b/ext/xml/tests/bug76874.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #76874: xml_parser_free() should never leak memory
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug78563.phpt b/ext/xml/tests/bug78563.phpt
index a69b7b539a4..4e1bb5d63bf 100644
--- a/ext/xml/tests/bug78563.phpt
+++ b/ext/xml/tests/bug78563.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78563: parsers should not be clonable
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug78563_final.phpt b/ext/xml/tests/bug78563_final.phpt
index e8a819f85b9..c5fdffa8f9b 100644
--- a/ext/xml/tests/bug78563_final.phpt
+++ b/ext/xml/tests/bug78563_final.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78563: parsers should not be extendable
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/bug78563_serialize.phpt b/ext/xml/tests/bug78563_serialize.phpt
index 05171dc79e5..3047c941477 100644
--- a/ext/xml/tests/bug78563_serialize.phpt
+++ b/ext/xml/tests/bug78563_serialize.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #78563: parsers should not be serializable
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 
diff --git a/ext/xml/tests/skipif.inc b/ext/xml/tests/skipif.inc
deleted file mode 100644
index 44898f3da63..00000000000
--- a/ext/xml/tests/skipif.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// DO NOT dl load extension
-//if (!extension_loaded("xml")) {
-//  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-//  @dl("xml$dlext");
-//}
-if (!extension_loaded("xml")) {
-  die('skip xml extension not available');
-}
-?>
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
index 2d8fe54041e..1bbe3c0fced 100644
--- a/ext/xml/tests/xml001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -1,8 +1,9 @@
 --TEST--
 XML parser test, function callbacks
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt
index 27a920cedd8..b29c94f83d1 100644
--- a/ext/xml/tests/xml002.phpt
+++ b/ext/xml/tests/xml002.phpt
@@ -1,8 +1,9 @@
 --TEST--
 XML parser test, object tuple callbacks
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
index 08db287c18b..2227133caa0 100644
--- a/ext/xml/tests/xml003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -1,8 +1,9 @@
 --TEST--
 XML parser test, xml_set_object callbacks
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 XML_SAX_IMPL == 'libxml' && die('skip this test is not intended for libxml SAX parser');
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt
index 3d5adaa56b7..71c08c2f735 100644
--- a/ext/xml/tests/xml004.phpt
+++ b/ext/xml/tests/xml004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XML parser case folding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index 6389c7fa6e6..2c3a84dca1e 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -1,8 +1,9 @@
 --TEST--
 xml_parse_into_struct/umlauts in tags
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-include("skipif.inc");
 if(strtoupper("äöüß") != "ÄÖÜß")
 {
     die("skip strtoupper on non-ascii not supported on this platform");
diff --git a/ext/xml/tests/xml009.phpt b/ext/xml/tests/xml009.phpt
index 8a33a4e715a..8986cebe607 100644
--- a/ext/xml/tests/xml009.phpt
+++ b/ext/xml/tests/xml009.phpt
@@ -1,8 +1,9 @@
 --TEST--
 XML parser test, default namespaces
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not supported on this platform");}
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt
index 69e8469fa66..7a1f33785bc 100644
--- a/ext/xml/tests/xml010.phpt
+++ b/ext/xml/tests/xml010.phpt
@@ -1,8 +1,9 @@
 --TEST--
 XML parser test, attributes
+--EXTENSIONS--
+xml
 --SKIPIF--
 <?php
-require_once("skipif.inc");
 if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is not supported on this platform");}
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml011.phpt b/ext/xml/tests/xml011.phpt
index 9c4cfca8f14..f3557717e8f 100644
--- a/ext/xml/tests/xml011.phpt
+++ b/ext/xml/tests/xml011.phpt
@@ -1,9 +1,7 @@
 --TEST--
 XML Parser test: concat character data and set empty handlers
---SKIPIF--
-<?php
-require_once("skipif.inc");
-?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 function start_elem($parser,$name,$attribs) {
diff --git a/ext/xml/tests/xml_closures_001.phpt b/ext/xml/tests/xml_closures_001.phpt
index c1f91d50d53..a6c65a2676c 100644
--- a/ext/xml/tests/xml_closures_001.phpt
+++ b/ext/xml/tests/xml_closures_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 XML parser test using closures as callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
+--EXTENSIONS--
+xml
 --FILE--
 <?php
 chdir(__DIR__);
diff --git a/ext/xsl/tests/bug26384.phpt b/ext/xsl/tests/bug26384.phpt
index 5b268da781b..a85136e5c8f 100644
--- a/ext/xsl/tests/bug26384.phpt
+++ b/ext/xsl/tests/bug26384.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26384 (domxslt->process causes segfault with xsl:key)
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 $dom = new domDocument;
diff --git a/ext/xsl/tests/skipif.inc b/ext/xsl/tests/skipif.inc
deleted file mode 100644
index 0ef73723a3b..00000000000
--- a/ext/xsl/tests/skipif.inc
+++ /dev/null
@@ -1 +0,0 @@
-<?php	if (!extension_loaded('xsl')) die('skip xsl extension not available');?>
diff --git a/ext/xsl/tests/xslt001.phpt b/ext/xsl/tests/xslt001.phpt
index f7bdc424244..66784705ae7 100644
--- a/ext/xsl/tests/xslt001.phpt
+++ b/ext/xsl/tests/xslt001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 1: Transform To XML String
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 1: Transform To XML String";
diff --git a/ext/xsl/tests/xslt002.phpt b/ext/xsl/tests/xslt002.phpt
index 60a8ec0e16f..84533aaa1b3 100644
--- a/ext/xsl/tests/xslt002.phpt
+++ b/ext/xsl/tests/xslt002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 2: Transform To HTML String
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 2: Transform To HTML String";
diff --git a/ext/xsl/tests/xslt003.phpt b/ext/xsl/tests/xslt003.phpt
index d1ad8a6496f..737e2dd8ab3 100644
--- a/ext/xsl/tests/xslt003.phpt
+++ b/ext/xsl/tests/xslt003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 3: Using Parameters
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 3: Using Parameters";
diff --git a/ext/xsl/tests/xslt004.phpt b/ext/xsl/tests/xslt004.phpt
index 50ffd66d12e..be3469cb5c9 100644
--- a/ext/xsl/tests/xslt004.phpt
+++ b/ext/xsl/tests/xslt004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 4: Checking UTF8 Output
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 4: Checking UTF8 Output";
diff --git a/ext/xsl/tests/xslt005.phpt b/ext/xsl/tests/xslt005.phpt
index 28da4db7342..ed22413deb9 100644
--- a/ext/xsl/tests/xslt005.phpt
+++ b/ext/xsl/tests/xslt005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 5: Checking Indent
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 5: Checking Indent";
diff --git a/ext/xsl/tests/xslt006.phpt b/ext/xsl/tests/xslt006.phpt
index 0ad976ee692..ed3983101b4 100644
--- a/ext/xsl/tests/xslt006.phpt
+++ b/ext/xsl/tests/xslt006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 6: Transform To Doc
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 6: Transform To Doc";
diff --git a/ext/xsl/tests/xslt007.phpt b/ext/xsl/tests/xslt007.phpt
index 241cc1cc0b2..ce188815089 100644
--- a/ext/xsl/tests/xslt007.phpt
+++ b/ext/xsl/tests/xslt007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 7: Transform To Uri
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 7: Transform To Uri";
diff --git a/ext/xsl/tests/xslt008-mb.phpt b/ext/xsl/tests/xslt008-mb.phpt
index 84b117763e9..3210dbddc76 100644
--- a/ext/xsl/tests/xslt008-mb.phpt
+++ b/ext/xsl/tests/xslt008-mb.phpt
@@ -2,10 +2,7 @@
 Test 8: Stream Wrapper Includes
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php
-    require_once __DIR__ .'/skipif.inc';
-    ?>
+xsl
 --FILE--
 <?php
 echo "Test 8: Stream Wrapper Includes ";
diff --git a/ext/xsl/tests/xslt008.phpt b/ext/xsl/tests/xslt008.phpt
index e2a9212173d..03075925576 100644
--- a/ext/xsl/tests/xslt008.phpt
+++ b/ext/xsl/tests/xslt008.phpt
@@ -2,10 +2,7 @@
 Test 8: Stream Wrapper Includes
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php
-    require_once __DIR__ .'/skipif.inc';
-    ?>
+xsl
 --FILE--
 <?php
 echo "Test 8: Stream Wrapper Includes ";
diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt
index 934d7de8cea..099ff731006 100644
--- a/ext/xsl/tests/xslt009.phpt
+++ b/ext/xsl/tests/xslt009.phpt
@@ -2,10 +2,7 @@
 Test 9: Stream Wrapper XPath-Document()
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php
-    require_once __DIR__ .'/skipif.inc';
-    ?>
+xsl
 --FILE--
 <?php
 echo "Test 9: Stream Wrapper XPath-Document()";
diff --git a/ext/xsl/tests/xslt010.phpt b/ext/xsl/tests/xslt010.phpt
index 62bc6074172..7530be7bd88 100644
--- a/ext/xsl/tests/xslt010.phpt
+++ b/ext/xsl/tests/xslt010.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Test 10: EXSLT Support
+--EXTENSIONS--
+xsl
 --SKIPIF--
 <?php
-require_once __DIR__ .'/skipif.inc';
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
 if (LIBXSLT_VERSION < 10117) die('skip too old libxsl');
diff --git a/ext/xsl/tests/xslt010_gt10129.phpt b/ext/xsl/tests/xslt010_gt10129.phpt
index b5f650623ff..7088a6b2a91 100644
--- a/ext/xsl/tests/xslt010_gt10129.phpt
+++ b/ext/xsl/tests/xslt010_gt10129.phpt
@@ -1,8 +1,9 @@
 --TEST--
 Test 10: EXSLT Support
+--EXTENSIONS--
+xsl
 --SKIPIF--
 <?php
-require_once __DIR__ .'/skipif.inc';
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
 if (LIBXSLT_VERSION < 10130) die('skip too old libxsl');
diff --git a/ext/xsl/tests/xslt011.phpt b/ext/xsl/tests/xslt011.phpt
index ba58ecb0870..50279492b7b 100644
--- a/ext/xsl/tests/xslt011.phpt
+++ b/ext/xsl/tests/xslt011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 11: php:function Support
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 print "Test 11: php:function Support\n";
diff --git a/ext/xsl/tests/xslt012.phpt b/ext/xsl/tests/xslt012.phpt
index 737512bbe9f..5a30efb9825 100644
--- a/ext/xsl/tests/xslt012.phpt
+++ b/ext/xsl/tests/xslt012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 12: Using Associative Array of Parameters
---SKIPIF--
-<?php require_once __DIR__ .'/skipif.inc'; ?>
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 echo "Test 12: Using Associative Array of Parameters";