diff --git a/ext/curl/tests/bug79741.phpt b/ext/curl/tests/bug79741.phpt
index 5fddd30c276..d5c777e252e 100644
--- a/ext/curl/tests/bug79741.phpt
+++ b/ext/curl/tests/bug79741.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79741: curl_setopt CURLOPT_POSTFIELDS asserts on object with declared properties
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/bug80121.phpt b/ext/curl/tests/bug80121.phpt
index 9239cf007fb..a7bf6385367 100644
--- a/ext/curl/tests/bug80121.phpt
+++ b/ext/curl/tests/bug80121.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80121: Null pointer deref if CurlHandle directly instantiated
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_int_cast.phpt b/ext/curl/tests/curl_int_cast.phpt
index 7a3a89db0b9..b83193881ab 100644
--- a/ext/curl/tests/curl_int_cast.phpt
+++ b/ext/curl/tests/curl_int_cast.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Casting CurlHandle to int returns object ID
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/curl/tests/curl_share_basic.phpt b/ext/curl/tests/curl_share_basic.phpt
index 2a37fce16ad..699fddc9a0c 100644
--- a/ext/curl/tests/curl_share_basic.phpt
+++ b/ext/curl/tests/curl_share_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Basic curl_share test
+--EXTENSIONS--
+curl
 --FILE--
 <?php
 
diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 92d5903294d..4f1fe947b81 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for exif_read_data, Unicode WinXP tags
+--EXTENSIONS--
+exif
 --SKIPIF--
 <?php
     if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
diff --git a/ext/filter/tests/001.phpt b/ext/filter/tests/001.phpt
index 2755a57363b..8264c4b6c4a 100644
--- a/ext/filter/tests/001.phpt
+++ b/ext/filter/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Simple GET test
+--EXTENSIONS--
+filter
 --GET--
 a=1
 --FILE--
diff --git a/ext/filter/tests/002.phpt b/ext/filter/tests/002.phpt
index 7629f0125ab..9781b94534e 100644
--- a/ext/filter/tests/002.phpt
+++ b/ext/filter/tests/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GET test with 2 values and an empty one
+--EXTENSIONS--
+filter
 --GET--
 a=1&b=&c=3
 --FILE--
diff --git a/ext/filter/tests/003.phpt b/ext/filter/tests/003.phpt
index e49e2404482..aa7f7717bef 100644
--- a/ext/filter/tests/003.phpt
+++ b/ext/filter/tests/003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GET/POST/REQUEST Test
+--EXTENSIONS--
+filter
 --POST--
 d=4&e=5
 --GET--
diff --git a/ext/filter/tests/bug77423.phpt b/ext/filter/tests/bug77423.phpt
index bf63b7595cc..a95477c3c51 100644
--- a/ext/filter/tests/bug77423.phpt
+++ b/ext/filter/tests/bug77423.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #77423 (parse_url() will deliver a wrong host to user)
---SKIPIF--
-<?php if (!function_exists('filter_var')) { echo "skip requires filter\n"; } ?>
+--EXTENSIONS--
+filter
 --FILE--
 <?php
 $urls = array(
diff --git a/ext/intl/tests/bug78804.phpt b/ext/intl/tests/bug78804.phpt
index b0d58ec4309..5add1224abe 100644
--- a/ext/intl/tests/bug78804.phpt
+++ b/ext/intl/tests/bug78804.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #78804: Segmentation fault in Locale::filterMatches
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/bug81019.phpt b/ext/intl/tests/bug81019.phpt
index 6703dae1bdd..237a9279b66 100644
--- a/ext/intl/tests/bug81019.phpt
+++ b/ext/intl/tests/bug81019.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #81019: Unable to clone NumberFormatter after failed parse()
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/grapheme_out_of_bounds.phpt b/ext/intl/tests/grapheme_out_of_bounds.phpt
index 831ab874084..286cb68b7d3 100644
--- a/ext/intl/tests/grapheme_out_of_bounds.phpt
+++ b/ext/intl/tests/grapheme_out_of_bounds.phpt
@@ -1,5 +1,7 @@
 --TEST--
 grapheme_* functions with out-of-bounds offsets
+--EXTENSIONS--
+intl
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/bug52681.phpt b/ext/mbstring/tests/bug52681.phpt
index c2f9abad762..2086051e941 100644
--- a/ext/mbstring/tests/bug52681.phpt
+++ b/ext/mbstring/tests/bug52681.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/bug79037.phpt b/ext/mbstring/tests/bug79037.phpt
index 94ff01a4a1d..f97ec7716cf 100644
--- a/ext/mbstring/tests/bug79037.phpt
+++ b/ext/mbstring/tests/bug79037.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79037: global buffer-overflow in `mbfl_filt_conv_big5_wchar`
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_convert_encoding_failed_detection.phpt b/ext/mbstring/tests/mb_convert_encoding_failed_detection.phpt
index 45efe28766e..5155d702050 100644
--- a/ext/mbstring/tests/mb_convert_encoding_failed_detection.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_failed_detection.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_convert_encoding() when encoding detection fails
+--EXTENSIONS--
+mbstring
 --INI--
 mbstring.strict_detection=1
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt
index 653df93ce06..813fe5e41ef 100644
--- a/ext/mbstring/tests/mb_ereg1.phpt
+++ b/ext/mbstring/tests/mb_ereg1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_ereg() and invalid arguments
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php if (!function_exists("mb_ereg")) print "skip"; ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
index 1a78b272728..6979816fe8e 100644
--- a/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_ereg_search() with invalid pattern should discard old matches
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php if (!function_exists("mb_ereg")) print "skip requires mbregex"; ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index 96eecbb6256..a71e2125436 100644
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 1 (lang=neutral)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 026d794e40e..13f9dd09747 100644
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 2 (lang=Japanese)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index acc152f7203..124c94834e6 100644
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 3 (lang=English)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index 9e681281407..bf5bfef578b 100644
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 4 (lang=German)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index f4c07e26f8b..b03ce8748e6 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 5 (lang=Simplified Chinese)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 521a976ca39..2a81a4a4821 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 6 (lang=Traditional Chinese)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index eb702b690ae..56368942cfd 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() test 7 (lang=Korean)
+--EXTENSIONS--
+mbstring
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/mbstring/tests/mb_send_mail_null_bytes.phpt b/ext/mbstring/tests/mb_send_mail_null_bytes.phpt
index 061451e3b84..572a2932e36 100644
--- a/ext/mbstring/tests/mb_send_mail_null_bytes.phpt
+++ b/ext/mbstring/tests/mb_send_mail_null_bytes.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mb_send_mail() with null bytes in arguments
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/mbstring/tests/mb_strpos_offset_errors.phpt b/ext/mbstring/tests/mb_strpos_offset_errors.phpt
index 68dc75b338b..21fd260c3d3 100644
--- a/ext/mbstring/tests/mb_strpos_offset_errors.phpt
+++ b/ext/mbstring/tests/mb_strpos_offset_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Offset errors for various strpos functions
+--EXTENSIONS--
+mbstring
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/bug79881.phpt b/ext/openssl/tests/bug79881.phpt
index 915f95bdd4b..d71198cbb34 100644
--- a/ext/openssl/tests/bug79881.phpt
+++ b/ext/openssl/tests/bug79881.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79881: Memory leak in openssl_pkey_get_public()
+--EXTENSIONS--
+openssl
 --FILE--
 <?php
 
diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt
index af8e0dcdd17..4590ef7804d 100644
--- a/ext/openssl/tests/check_default_conf_path.phpt
+++ b/ext/openssl/tests/check_default_conf_path.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Check for default OpenSSL config path on Windows
+--EXTENSIONS--
+openssl
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
diff --git a/ext/pcntl/tests/pcntl_alarm.phpt b/ext/pcntl/tests/pcntl_alarm.phpt
index d0164f856b2..e63403d47cc 100644
--- a/ext/pcntl/tests/pcntl_alarm.phpt
+++ b/ext/pcntl/tests/pcntl_alarm.phpt
@@ -1,5 +1,7 @@
 --TEST--
 pcntl_alarm()
+--EXTENSIONS--
+pcntl
 --SKIPIF--
 <?php if (!function_exists("pcntl_sigtimedwait")) die("skip pcntl_sigtimedwait() not available"); ?>
 --INI--
diff --git a/ext/pgsql/tests/no_link_open.phpt b/ext/pgsql/tests/no_link_open.phpt
index e6c4b977842..bf15ec1ac66 100644
--- a/ext/pgsql/tests/no_link_open.phpt
+++ b/ext/pgsql/tests/no_link_open.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Using pg function with default link while no link open
+--EXTENSIONS--
+pgsql
 --FILE--
 <?php
 
diff --git a/ext/session/tests/bug79031.phpt b/ext/session/tests/bug79031.phpt
index 061e94154f9..d56f19decf5 100644
--- a/ext/session/tests/bug79031.phpt
+++ b/ext/session/tests/bug79031.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #79031: Session unserialization problem
+--EXTENSIONS--
+session
 --FILE--
 <?php
 
diff --git a/ext/session/tests/bug79221.phpt b/ext/session/tests/bug79221.phpt
index 07f50a9252a..8b568a19924 100644
--- a/ext/session/tests/bug79221.phpt
+++ b/ext/session/tests/bug79221.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Null Pointer Dereference in PHP Session Upload Progress
+--EXTENSIONS--
+session
 --INI--
 error_reporting=0
 file_uploads=1
diff --git a/ext/sockets/tests/bug80723.phpt b/ext/sockets/tests/bug80723.phpt
index a05d8579009..3b17807bc84 100644
--- a/ext/sockets/tests/bug80723.phpt
+++ b/ext/sockets/tests/bug80723.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80723: Different sockets compare as equal (regression in 8.0)
+--EXTENSIONS--
+sockets
 --FILE--
 <?php
 $socket_1 = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
diff --git a/ext/sockets/tests/socket_accept_failure.phpt b/ext/sockets/tests/socket_accept_failure.phpt
index 522987469b2..1c352ec513f 100644
--- a/ext/sockets/tests/socket_accept_failure.phpt
+++ b/ext/sockets/tests/socket_accept_failure.phpt
@@ -1,5 +1,7 @@
 --TEST--
 socket_accept() failure
+--EXTENSIONS--
+sockets
 --FILE--
 <?php
 
diff --git a/ext/sockets/tests/socket_sendrecvmsg_error.phpt b/ext/sockets/tests/socket_sendrecvmsg_error.phpt
index a91f7b41321..16f77a1e763 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_error.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Error during socket_sendmsg() or socket_recvmsg()
+--EXTENSIONS--
+sockets
 --FILE--
 <?php
 
diff --git a/ext/sodium/tests/php_password_hash_argon2i.phpt b/ext/sodium/tests/php_password_hash_argon2i.phpt
index 836e19ac5c0..23f6b730dbb 100644
--- a/ext/sodium/tests/php_password_hash_argon2i.phpt
+++ b/ext/sodium/tests/php_password_hash_argon2i.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test interoperability of password_hash('argon2i')
+--EXTENSIONS--
+sodium
 --SKIPIF--
 <?php
 if (!function_exists('sodium_crypto_pwhash_str_verify')) {
diff --git a/ext/sodium/tests/php_password_hash_argon2id.phpt b/ext/sodium/tests/php_password_hash_argon2id.phpt
index 6d69e169032..75fc05f0b50 100644
--- a/ext/sodium/tests/php_password_hash_argon2id.phpt
+++ b/ext/sodium/tests/php_password_hash_argon2id.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test interoperability of password_hash('argon2id')
+--EXTENSIONS--
+sodium
 --SKIPIF--
 <?php
 if (!function_exists('sodium_crypto_pwhash_str_verify')) {
diff --git a/ext/sodium/tests/php_password_verify.phpt b/ext/sodium/tests/php_password_verify.phpt
index 803ca640c14..67c2a720d2b 100644
--- a/ext/sodium/tests/php_password_verify.phpt
+++ b/ext/sodium/tests/php_password_verify.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test interoperability of password_verify()
+--EXTENSIONS--
+sodium
 --SKIPIF--
 <?php
 if (!function_exists('sodium_crypto_pwhash_str')) {
diff --git a/ext/tokenizer/tests/PhpToken_toString.phpt b/ext/tokenizer/tests/PhpToken_toString.phpt
index f4b9e8b1186..3ebc02b9383 100644
--- a/ext/tokenizer/tests/PhpToken_toString.phpt
+++ b/ext/tokenizer/tests/PhpToken_toString.phpt
@@ -1,5 +1,7 @@
 --TEST--
 PhpToken implements __toString()
+--EXTENSIONS--
+tokenizer
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/attributes.phpt b/ext/tokenizer/tests/attributes.phpt
index f4211ca769a..6c2bd57ed89 100644
--- a/ext/tokenizer/tests/attributes.phpt
+++ b/ext/tokenizer/tests/attributes.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Attributes are exposed as tokens.
+--EXTENSIONS--
+tokenizer
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug77966.phpt b/ext/tokenizer/tests/bug77966.phpt
index db2ed83738c..5255246fd40 100644
--- a/ext/tokenizer/tests/bug77966.phpt
+++ b/ext/tokenizer/tests/bug77966.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Handling of "namespace as" in TOKEN_PARSE mode
+--EXTENSIONS--
+tokenizer
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug80462.phpt b/ext/tokenizer/tests/bug80462.phpt
index 068cea0833e..c634efc0ce0 100644
--- a/ext/tokenizer/tests/bug80462.phpt
+++ b/ext/tokenizer/tests/bug80462.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #80462: Nullsafe operator tokenize with TOKEN_PARSE flag fails
+--EXTENSIONS--
+tokenizer
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/namespaced_names.phpt b/ext/tokenizer/tests/namespaced_names.phpt
index 651524b8e4c..bb2f156d3f3 100644
--- a/ext/tokenizer/tests/namespaced_names.phpt
+++ b/ext/tokenizer/tests/namespaced_names.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Tokenization of namespaced names
+--EXTENSIONS--
+tokenizer
 --FILE--
 <?php
 
diff --git a/ext/xsl/tests/xsltprocessor_transformToDoc_no_stylesheet.phpt b/ext/xsl/tests/xsltprocessor_transformToDoc_no_stylesheet.phpt
index c590b694fa0..4b444aa150f 100644
--- a/ext/xsl/tests/xsltprocessor_transformToDoc_no_stylesheet.phpt
+++ b/ext/xsl/tests/xsltprocessor_transformToDoc_no_stylesheet.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Calling XSLTProcessor::transformToDoc() without stylesheet
+--EXTENSIONS--
+xsl
 --FILE--
 <?php
 
diff --git a/ext/zlib/tests/zlib_wrapper_level.phpt b/ext/zlib/tests/zlib_wrapper_level.phpt
index 5cfd9cf6a80..e326f72c5c0 100644
--- a/ext/zlib/tests/zlib_wrapper_level.phpt
+++ b/ext/zlib/tests/zlib_wrapper_level.phpt
@@ -1,5 +1,7 @@
 --TEST--
 compress.zlib:// wrapper with compression level
+--EXTENSIONS--
+zlib
 --SKIPIF--
 <?php in_array('compress.zlib', stream_get_wrappers()) || print 'skip No zlib wrapper';
 --FILE--