From 8a14cd1ea9a79ad6e06b583ed770a7274ade688b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Wed, 10 Jun 2026 22:32:02 +0200
Subject: [PATCH 1/3] Fix Uri\Rfc3986\Uri test name

[skip ci]
---
 ext/uri/tests/rfc3986/modification/port_error_negative.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
index b8a25ee76667..fe07df976326 100644
--- a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - too small number
+Test Uri\Rfc3986\Uri component modification - port - too small number
 --EXTENSIONS--
 uri
 --FILE--

From 65ad51c2faf16d40b0b7b916bfbaba2468ab3f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Wed, 10 Jun 2026 22:36:43 +0200
Subject: [PATCH 2/3] Remove unnecessary "extensions" section from ext/uri
 tests

This extension is always available
---
 ext/uri/tests/003.phpt                                          | 2 --
 ext/uri/tests/004.phpt                                          | 2 --
 ext/uri/tests/005.phpt                                          | 2 --
 ext/uri/tests/006.phpt                                          | 2 --
 ext/uri/tests/007.phpt                                          | 2 --
 ext/uri/tests/008.phpt                                          | 2 --
 ext/uri/tests/009.phpt                                          | 2 --
 ext/uri/tests/010.phpt                                          | 2 --
 ext/uri/tests/011.phpt                                          | 2 --
 ext/uri/tests/012.phpt                                          | 2 --
 ext/uri/tests/013.phpt                                          | 2 --
 ext/uri/tests/014.phpt                                          | 2 --
 ext/uri/tests/018.phpt                                          | 2 --
 ext/uri/tests/019.phpt                                          | 2 --
 ext/uri/tests/021.phpt                                          | 2 --
 ext/uri/tests/022.phpt                                          | 2 --
 ext/uri/tests/023.phpt                                          | 2 --
 ext/uri/tests/024.phpt                                          | 2 --
 ext/uri/tests/025.phpt                                          | 2 --
 ext/uri/tests/026.phpt                                          | 2 --
 ext/uri/tests/026_userinfo.phpt                                 | 2 --
 ext/uri/tests/027.phpt                                          | 2 --
 ext/uri/tests/028.phpt                                          | 2 --
 ext/uri/tests/029.phpt                                          | 2 --
 ext/uri/tests/030.phpt                                          | 2 --
 ext/uri/tests/031.phpt                                          | 2 --
 ext/uri/tests/032.phpt                                          | 2 --
 ext/uri/tests/033.phpt                                          | 2 --
 ext/uri/tests/034.phpt                                          | 2 --
 ext/uri/tests/038.phpt                                          | 2 --
 ext/uri/tests/039.phpt                                          | 2 --
 ext/uri/tests/040.phpt                                          | 2 --
 ext/uri/tests/041.phpt                                          | 2 --
 ext/uri/tests/042.phpt                                          | 2 --
 ext/uri/tests/043.phpt                                          | 2 --
 ext/uri/tests/045.phpt                                          | 2 --
 ext/uri/tests/046.phpt                                          | 2 --
 ext/uri/tests/047.phpt                                          | 2 --
 ext/uri/tests/048.phpt                                          | 2 --
 ext/uri/tests/049.phpt                                          | 2 --
 ext/uri/tests/050.phpt                                          | 2 --
 ext/uri/tests/051.phpt                                          | 2 --
 ext/uri/tests/052.phpt                                          | 2 --
 ext/uri/tests/053.phpt                                          | 2 --
 ext/uri/tests/054.phpt                                          | 2 --
 ext/uri/tests/055.phpt                                          | 2 --
 ext/uri/tests/056.phpt                                          | 2 --
 ext/uri/tests/057.phpt                                          | 2 --
 ext/uri/tests/058.phpt                                          | 2 --
 ext/uri/tests/059.phpt                                          | 2 --
 ext/uri/tests/065.phpt                                          | 2 --
 ext/uri/tests/100.phpt                                          | 2 --
 ext/uri/tests/101.phpt                                          | 2 --
 ext/uri/tests/102.phpt                                          | 2 --
 ext/uri/tests/gh19780.phpt                                      | 2 --
 ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt | 2 --
 ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt  | 2 --
 ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt  | 2 --
 .../tests/rfc3986/modification/fragment_success_encoded.phpt    | 2 --
 .../tests/rfc3986/modification/fragment_success_existing.phpt   | 2 --
 .../rfc3986/modification/fragment_success_unset_existing.phpt   | 2 --
 .../modification/fragment_success_unset_non_existent.phpt       | 2 --
 ext/uri/tests/rfc3986/modification/host_error_reserved.phpt     | 2 --
 ext/uri/tests/rfc3986/modification/host_success_empty.phpt      | 2 --
 ext/uri/tests/rfc3986/modification/host_success_encoded.phpt    | 2 --
 ext/uri/tests/rfc3986/modification/host_success_existing.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt  | 2 --
 ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt       | 2 --
 ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt       | 2 --
 ext/uri/tests/rfc3986/modification/host_success_new.phpt        | 2 --
 .../tests/rfc3986/modification/host_success_unset_existing.phpt | 2 --
 .../rfc3986/modification/host_success_unset_non_existent.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt    | 2 --
 ext/uri/tests/rfc3986/modification/path_error_reserved.phpt     | 2 --
 ext/uri/tests/rfc3986/modification/path_error_unicode.phpt      | 2 --
 .../rfc3986/modification/path_error_without_leading_slash.phpt  | 2 --
 ext/uri/tests/rfc3986/modification/path_success_email.phpt      | 2 --
 ext/uri/tests/rfc3986/modification/path_success_empty.phpt      | 2 --
 ext/uri/tests/rfc3986/modification/path_success_encoded.phpt    | 2 --
 ext/uri/tests/rfc3986/modification/path_success_existing.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/port_error_negative.phpt     | 2 --
 ext/uri/tests/rfc3986/modification/port_success_existing.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/port_success_new.phpt        | 2 --
 .../tests/rfc3986/modification/port_success_unset_existing.phpt | 2 --
 .../rfc3986/modification/port_success_unset_non_existent.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/query_error_reserved.phpt    | 2 --
 ext/uri/tests/rfc3986/modification/query_error_unicode.phpt     | 2 --
 .../modification/query_success_context_sensitive_reserved.phpt  | 2 --
 ext/uri/tests/rfc3986/modification/query_success_empty.phpt     | 2 --
 ext/uri/tests/rfc3986/modification/query_success_encoded.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/query_success_existing.phpt  | 2 --
 .../rfc3986/modification/query_success_unset_existing.phpt      | 2 --
 .../rfc3986/modification/query_success_unset_non_existent.phpt  | 2 --
 ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt | 2 --
 ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt | 2 --
 ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt | 2 --
 ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt      | 2 --
 ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt    | 2 --
 ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt    | 2 --
 .../rfc3986/modification/scheme_success_unset_existing.phpt     | 2 --
 .../rfc3986/modification/scheme_success_unset_non_existent.phpt | 2 --
 ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt | 2 --
 ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt  | 2 --
 .../tests/rfc3986/modification/userinfo_success_encoded.phpt    | 2 --
 .../tests/rfc3986/modification/userinfo_success_existing.phpt   | 2 --
 ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt    | 2 --
 .../rfc3986/modification/userinfo_success_unset_existing.phpt   | 2 --
 .../modification/userinfo_success_unset_non_existent.phpt       | 2 --
 ext/uri/tests/rfc3986/parsing/userinfo_success_empty.phpt       | 2 --
 .../tests/rfc3986/parsing/userinfo_success_only_password.phpt   | 2 --
 .../tests/rfc3986/parsing/userinfo_success_only_username.phpt   | 2 --
 .../rfc3986/reference_resolution/resolve_error_null_byte.phpt   | 2 --
 ext/uri/tests/whatwg/getters/gh20771.phpt                       | 2 --
 .../tests/whatwg/modification/fragment_success_auto_encode.phpt | 2 --
 ext/uri/tests/whatwg/modification/fragment_success_empty.phpt   | 2 --
 ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt | 2 --
 .../tests/whatwg/modification/fragment_success_existing.phpt    | 2 --
 .../tests/whatwg/modification/fragment_success_hashmark.phpt    | 2 --
 .../tests/whatwg/modification/fragment_success_null_byte.phpt   | 2 --
 ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt | 2 --
 .../whatwg/modification/fragment_success_unset_existing.phpt    | 2 --
 .../modification/fragment_success_unset_non_existent.phpt       | 2 --
 .../modification/fragment_success_with_leading_hashmark.phpt    | 2 --
 ext/uri/tests/whatwg/modification/host_error_empty.phpt         | 2 --
 .../host_error_forbidden_host_codepoint_opaque1.phpt            | 2 --
 .../host_error_forbidden_host_codepoint_opaque2.phpt            | 2 --
 .../host_error_forbidden_host_codepoint_opaque3.phpt            | 2 --
 .../host_error_forbidden_host_codepoint_special1.phpt           | 2 --
 .../host_error_forbidden_host_codepoint_special2.phpt           | 2 --
 .../host_error_forbidden_host_codepoint_special3.phpt           | 2 --
 ext/uri/tests/whatwg/modification/host_error_null_byte.phpt     | 2 --
 .../tests/whatwg/modification/host_error_unset_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/host_success_encoded.phpt     | 2 --
 ext/uri/tests/whatwg/modification/host_success_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/host_success_idna.phpt        | 2 --
 ext/uri/tests/whatwg/modification/host_success_ipv4.phpt        | 2 --
 ext/uri/tests/whatwg/modification/host_success_ipv6.phpt        | 2 --
 .../whatwg/modification/password_success_auto_encoded.phpt      | 2 --
 ext/uri/tests/whatwg/modification/password_success_empty.phpt   | 2 --
 ext/uri/tests/whatwg/modification/password_success_encoded.phpt | 2 --
 .../tests/whatwg/modification/password_success_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/password_success_new.phpt     | 2 --
 .../tests/whatwg/modification/password_success_null_byte.phpt   | 2 --
 .../whatwg/modification/password_success_unset_existing.phpt    | 2 --
 .../whatwg/modification/password_success_unset_existing2.phpt   | 2 --
 .../modification/password_success_unset_non_existent1.phpt      | 2 --
 .../modification/password_success_unset_non_existent2.phpt      | 2 --
 .../tests/whatwg/modification/path_success_auto_encoded.phpt    | 2 --
 ext/uri/tests/whatwg/modification/path_success_empty.phpt       | 2 --
 ext/uri/tests/whatwg/modification/path_success_encoded.phpt     | 2 --
 ext/uri/tests/whatwg/modification/path_success_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/path_success_null_byte.phpt   | 2 --
 ext/uri/tests/whatwg/modification/path_success_unicode.phpt     | 2 --
 .../whatwg/modification/path_success_without_leading_slash.phpt | 2 --
 ext/uri/tests/whatwg/modification/port_error_negative.phpt      | 2 --
 ext/uri/tests/whatwg/modification/port_error_too_large.phpt     | 2 --
 ext/uri/tests/whatwg/modification/port_success_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/port_success_new.phpt         | 2 --
 ext/uri/tests/whatwg/modification/port_success_special1.phpt    | 2 --
 ext/uri/tests/whatwg/modification/port_success_special2.phpt    | 2 --
 .../tests/whatwg/modification/port_success_unset_existing.phpt  | 2 --
 .../whatwg/modification/port_success_unset_non_existent.phpt    | 2 --
 .../tests/whatwg/modification/query_success_auto_encoded.phpt   | 2 --
 .../modification/query_success_context_sensitive_reserved.phpt  | 2 --
 ext/uri/tests/whatwg/modification/query_success_empty.phpt      | 2 --
 ext/uri/tests/whatwg/modification/query_success_encoded.phpt    | 2 --
 ext/uri/tests/whatwg/modification/query_success_existing.phpt   | 2 --
 ext/uri/tests/whatwg/modification/query_success_null_byte.phpt  | 2 --
 .../tests/whatwg/modification/query_success_question_mark.phpt  | 2 --
 ext/uri/tests/whatwg/modification/query_success_unicode.phpt    | 2 --
 .../tests/whatwg/modification/query_success_unset_existing.phpt | 2 --
 .../whatwg/modification/query_success_unset_non_existent.phpt   | 2 --
 .../modification/query_success_with_leading_question_mark.phpt  | 2 --
 ext/uri/tests/whatwg/modification/scheme_error_empty.phpt       | 2 --
 ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt     | 2 --
 ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt     | 2 --
 ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt   | 2 --
 ext/uri/tests/whatwg/modification/scheme_success_basic.phpt     | 2 --
 ext/uri/tests/whatwg/modification/scheme_success_colon.phpt     | 2 --
 ext/uri/tests/whatwg/modification/scheme_success_full.phpt      | 2 --
 .../whatwg/modification/username_success_auto_encoded.phpt      | 2 --
 .../tests/whatwg/modification/username_success_existing.phpt    | 2 --
 ext/uri/tests/whatwg/modification/username_success_new.phpt     | 2 --
 .../tests/whatwg/modification/username_success_null_byte.phpt   | 2 --
 .../whatwg/modification/username_success_unset_existing.phpt    | 2 --
 .../whatwg/modification/username_success_unset_existing2.phpt   | 2 --
 .../modification/username_success_unset_non_existent1.phpt      | 2 --
 .../modification/username_success_unset_non_existent2.phpt      | 2 --
 .../reference_resolution/resolve_error_host_null_byte.phpt      | 2 --
 .../reference_resolution/resolve_success_path_null_byte.phpt    | 2 --
 191 files changed, 382 deletions(-)

diff --git a/ext/uri/tests/003.phpt b/ext/uri/tests/003.phpt
index a1918f7a838b..38d62b0ec8e6 100644
--- a/ext/uri/tests/003.phpt
+++ b/ext/uri/tests/003.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Parse special URIs
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/004.phpt b/ext/uri/tests/004.phpt
index d22f52f30c48..a7c2e190683a 100644
--- a/ext/uri/tests/004.phpt
+++ b/ext/uri/tests/004.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Parse invalid URLs
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/005.phpt b/ext/uri/tests/005.phpt
index 6db6c4a56ee5..8d8be9679397 100644
--- a/ext/uri/tests/005.phpt
+++ b/ext/uri/tests/005.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Parse multibyte URLs
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/006.phpt b/ext/uri/tests/006.phpt
index c4da9db905c8..e7fa79a8b837 100644
--- a/ext/uri/tests/006.phpt
+++ b/ext/uri/tests/006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test successful manual Uri child instance creation
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/007.phpt b/ext/uri/tests/007.phpt
index 54151f2dfcb1..db051e553fb1 100644
--- a/ext/uri/tests/007.phpt
+++ b/ext/uri/tests/007.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test URI creation errors
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/008.phpt b/ext/uri/tests/008.phpt
index 133f225aabf4..0a02bae63163 100644
--- a/ext/uri/tests/008.phpt
+++ b/ext/uri/tests/008.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri getters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/009.phpt b/ext/uri/tests/009.phpt
index 05f2820bb3fc..9c896d0153b2 100644
--- a/ext/uri/tests/009.phpt
+++ b/ext/uri/tests/009.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test parsing with IANA schemes
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/010.phpt b/ext/uri/tests/010.phpt
index 2ca071eb2ca3..ff5a37000775 100644
--- a/ext/uri/tests/010.phpt
+++ b/ext/uri/tests/010.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test parsing URIs when a base URI is present
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/011.phpt b/ext/uri/tests/011.phpt
index 49b915fa22a3..0e8fd8ec8f48 100644
--- a/ext/uri/tests/011.phpt
+++ b/ext/uri/tests/011.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test encoding and normalization
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/012.phpt b/ext/uri/tests/012.phpt
index 3eb343af535c..e033223a6426 100644
--- a/ext/uri/tests/012.phpt
+++ b/ext/uri/tests/012.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test parsing of various schemes
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/013.phpt b/ext/uri/tests/013.phpt
index 6a5bb31870fb..865843ec27e8 100644
--- a/ext/uri/tests/013.phpt
+++ b/ext/uri/tests/013.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test parsing of query strings
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/014.phpt b/ext/uri/tests/014.phpt
index e2886b98c7b5..2966e2a9dcf1 100644
--- a/ext/uri/tests/014.phpt
+++ b/ext/uri/tests/014.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test recomposition of URIs
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/018.phpt b/ext/uri/tests/018.phpt
index aaff3042555c..7a7be9b3c19f 100644
--- a/ext/uri/tests/018.phpt
+++ b/ext/uri/tests/018.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/019.phpt b/ext/uri/tests/019.phpt
index 3ca7c59086f8..7f62a64e9fde 100644
--- a/ext/uri/tests/019.phpt
+++ b/ext/uri/tests/019.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test IDNA support
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/021.phpt b/ext/uri/tests/021.phpt
index c7e42547e73f..02cc60ff0e24 100644
--- a/ext/uri/tests/021.phpt
+++ b/ext/uri/tests/021.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test extension of Uri\Rfc3986\Uri
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/022.phpt b/ext/uri/tests/022.phpt
index 1e920c5055f8..da079b9781dc 100644
--- a/ext/uri/tests/022.phpt
+++ b/ext/uri/tests/022.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test extension of Uri\WhatWg\Url
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/023.phpt b/ext/uri/tests/023.phpt
index d1b97eaa9ae5..d52fa3405322 100644
--- a/ext/uri/tests/023.phpt
+++ b/ext/uri/tests/023.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - scheme
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/024.phpt b/ext/uri/tests/024.phpt
index 907be0091d7c..4147ff3ae124 100644
--- a/ext/uri/tests/024.phpt
+++ b/ext/uri/tests/024.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - username
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/025.phpt b/ext/uri/tests/025.phpt
index dafc36043bcb..a6dd505fcca1 100644
--- a/ext/uri/tests/025.phpt
+++ b/ext/uri/tests/025.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - password
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/026.phpt b/ext/uri/tests/026.phpt
index 2f50e41bb8c1..e46c30055cb6 100644
--- a/ext/uri/tests/026.phpt
+++ b/ext/uri/tests/026.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - host
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/026_userinfo.phpt b/ext/uri/tests/026_userinfo.phpt
index 75f54fccf612..cff2665803a4 100644
--- a/ext/uri/tests/026_userinfo.phpt
+++ b/ext/uri/tests/026_userinfo.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - userinfo
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/027.phpt b/ext/uri/tests/027.phpt
index 781932f5889e..334d67aa0bb6 100644
--- a/ext/uri/tests/027.phpt
+++ b/ext/uri/tests/027.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - port
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/028.phpt b/ext/uri/tests/028.phpt
index 9c9c92c00cc0..cfc11b331c8e 100644
--- a/ext/uri/tests/028.phpt
+++ b/ext/uri/tests/028.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - path
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/029.phpt b/ext/uri/tests/029.phpt
index f7a1a0989910..4936cb60db87 100644
--- a/ext/uri/tests/029.phpt
+++ b/ext/uri/tests/029.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - query
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/030.phpt b/ext/uri/tests/030.phpt
index 92e99d01f892..03ed763f7795 100644
--- a/ext/uri/tests/030.phpt
+++ b/ext/uri/tests/030.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test property mutation - fragment
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/031.phpt b/ext/uri/tests/031.phpt
index ae84596b54e0..d3cc926b82fa 100644
--- a/ext/uri/tests/031.phpt
+++ b/ext/uri/tests/031.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test serialization and unserialization
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/032.phpt b/ext/uri/tests/032.phpt
index 070d9dd01893..b17765240c7b 100644
--- a/ext/uri/tests/032.phpt
+++ b/ext/uri/tests/032.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test JSON encoding
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/033.phpt b/ext/uri/tests/033.phpt
index dcfaa31c07ba..e88baadeba0d 100644
--- a/ext/uri/tests/033.phpt
+++ b/ext/uri/tests/033.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test var_export
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/034.phpt b/ext/uri/tests/034.phpt
index c6590252ea16..35d51aad8664 100644
--- a/ext/uri/tests/034.phpt
+++ b/ext/uri/tests/034.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test array cast
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/038.phpt b/ext/uri/tests/038.phpt
index 64a6289fada2..175a6762894b 100644
--- a/ext/uri/tests/038.phpt
+++ b/ext/uri/tests/038.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test toString()
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/039.phpt b/ext/uri/tests/039.phpt
index 7c3e2f810db6..ae662dfd1722 100644
--- a/ext/uri/tests/039.phpt
+++ b/ext/uri/tests/039.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test percent-encoding of different URI components
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/040.phpt b/ext/uri/tests/040.phpt
index 3b38d037edb1..2699de18e17f 100644
--- a/ext/uri/tests/040.phpt
+++ b/ext/uri/tests/040.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test HTTP URL validation
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/041.phpt b/ext/uri/tests/041.phpt
index 5b4f8c7b54bd..59a8e3211f97 100644
--- a/ext/uri/tests/041.phpt
+++ b/ext/uri/tests/041.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test relative URI parsing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/042.phpt b/ext/uri/tests/042.phpt
index 8296b1b8c6de..aadb9e5c192f 100644
--- a/ext/uri/tests/042.phpt
+++ b/ext/uri/tests/042.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test URN parsing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/043.phpt b/ext/uri/tests/043.phpt
index 52f5460dc63a..18c65e3c7735 100644
--- a/ext/uri/tests/043.phpt
+++ b/ext/uri/tests/043.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test reference resolution
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/045.phpt b/ext/uri/tests/045.phpt
index a6f93f701655..f968716f9fcd 100644
--- a/ext/uri/tests/045.phpt
+++ b/ext/uri/tests/045.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test percent-decoding of reserved characters in the path
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/046.phpt b/ext/uri/tests/046.phpt
index 7902a3c22736..10d56024698e 100644
--- a/ext/uri/tests/046.phpt
+++ b/ext/uri/tests/046.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test special path variants
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/047.phpt b/ext/uri/tests/047.phpt
index 50ba14ed2669..de9a21efd9b0 100644
--- a/ext/uri/tests/047.phpt
+++ b/ext/uri/tests/047.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test IP addresses
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/048.phpt b/ext/uri/tests/048.phpt
index 307d007e26f9..ee7a396f1796 100644
--- a/ext/uri/tests/048.phpt
+++ b/ext/uri/tests/048.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test RFC 3986 percent-encoding normalization
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/049.phpt b/ext/uri/tests/049.phpt
index c6ae3666ddcc..48f27277fab0 100644
--- a/ext/uri/tests/049.phpt
+++ b/ext/uri/tests/049.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test percent-encoding normalization - special case
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/050.phpt b/ext/uri/tests/050.phpt
index 1fd74f32cafa..3bd4052fb80c 100644
--- a/ext/uri/tests/050.phpt
+++ b/ext/uri/tests/050.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test resolve() method - success cases
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/051.phpt b/ext/uri/tests/051.phpt
index 0d60a1ed4246..0485356075a8 100644
--- a/ext/uri/tests/051.phpt
+++ b/ext/uri/tests/051.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test resolve() method - error cases
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/052.phpt b/ext/uri/tests/052.phpt
index af7d05b893ea..3d8d2053f6e8 100644
--- a/ext/uri/tests/052.phpt
+++ b/ext/uri/tests/052.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test UrlValidationError constructor error handling
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/053.phpt b/ext/uri/tests/053.phpt
index 2bd02365b09a..c88f4d386f35 100644
--- a/ext/uri/tests/053.phpt
+++ b/ext/uri/tests/053.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test InvalidUrlException constructor error handling
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/054.phpt b/ext/uri/tests/054.phpt
index 562ba981a12a..757b21cc114a 100644
--- a/ext/uri/tests/054.phpt
+++ b/ext/uri/tests/054.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test UrlValidationErrorType singleton
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/055.phpt b/ext/uri/tests/055.phpt
index 1b1684d350b0..de240bb6e053 100644
--- a/ext/uri/tests/055.phpt
+++ b/ext/uri/tests/055.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test InvalidUrlException constructor error handling
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/056.phpt b/ext/uri/tests/056.phpt
index a39d7897357d..7f348774459f 100644
--- a/ext/uri/tests/056.phpt
+++ b/ext/uri/tests/056.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Lexbor memory management
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/057.phpt b/ext/uri/tests/057.phpt
index 458bdb468e34..5cc4e5974212 100644
--- a/ext/uri/tests/057.phpt
+++ b/ext/uri/tests/057.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test assigning errors by reference fails
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/058.phpt b/ext/uri/tests/058.phpt
index efca0a0e8aaf..c1ceaa1e02e5 100644
--- a/ext/uri/tests/058.phpt
+++ b/ext/uri/tests/058.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test that integer overflows in the port are rejected
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/059.phpt b/ext/uri/tests/059.phpt
index 3d7cef10dff1..23971cd4ebe0 100644
--- a/ext/uri/tests/059.phpt
+++ b/ext/uri/tests/059.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test empty ports become null
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/065.phpt b/ext/uri/tests/065.phpt
index d9a6c905c9ef..2c84cceea3d4 100644
--- a/ext/uri/tests/065.phpt
+++ b/ext/uri/tests/065.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test that overwriting the URI is not possible
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/100.phpt b/ext/uri/tests/100.phpt
index 0c1abcdd00b6..6a5482d43e7c 100644
--- a/ext/uri/tests/100.phpt
+++ b/ext/uri/tests/100.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test the parse_url-based URI parser
---EXTENSIONS--
-uri
 zend_test
 --FILE--
 <?php
diff --git a/ext/uri/tests/101.phpt b/ext/uri/tests/101.phpt
index 8a44b376a612..d394fc119f0c 100644
--- a/ext/uri/tests/101.phpt
+++ b/ext/uri/tests/101.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test the Lexbor-based URI parser
---EXTENSIONS--
-uri
 zend_test
 --FILE--
 <?php
diff --git a/ext/uri/tests/102.phpt b/ext/uri/tests/102.phpt
index 6080c1be884c..65bf1a373886 100644
--- a/ext/uri/tests/102.phpt
+++ b/ext/uri/tests/102.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test the handling large ports for the uri struct
---EXTENSIONS--
-uri
 zend_test
 --FILE--
 <?php
diff --git a/ext/uri/tests/gh19780.phpt b/ext/uri/tests/gh19780.phpt
index 7271c60e8f93..fffa25bc37d2 100644
--- a/ext/uri/tests/gh19780.phpt
+++ b/ext/uri/tests/gh19780.phpt
@@ -1,7 +1,5 @@
 --TEST--
 GH-19780 (InvalidUrlException should check $errors argument)
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
index 1afde4151ac6..2296a797e662 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
index 5d6cf1198c9c..5caea7996c5f 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
index f0a05d5bb5bb..2c6285656a7b 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
index b1b1081ff81c..905ed65f6666 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
index fe534e846504..4b5936880ff1 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
index 7532c35e0fe7..9020a8f3669c 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
index 1c6fa898dde3..080b2ea9e1ba 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - fragment - unsetting not-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
index ca87c1a3ce26..be724549926d 100644
--- a/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
index b337674841c6..98187ddee609 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
index d9db6003b157..05bb410f44e0 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_existing.phpt b/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
index f9d3da987abc..385c29f985d5 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt b/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
index 004210000cf4..7969559d73a6 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - IP future address
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
index 850a32281aba..7a2ef3702bc7 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - IPv4 address
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
index 475088840159..521e5645fe66 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - IPv6 address
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_new.phpt b/ext/uri/tests/rfc3986/modification/host_success_new.phpt
index 326616140078..f9d13de087fb 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
index 8f79d723be5d..f1887209d49e 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
index b1793a31413a..8eb5faeac72b 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - host - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt b/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
index d02e3e8575f2..b629ec8fdd54 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
index e883a7daed19..24863251f943 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
index 5fc836533ca1..1762470ee2a9 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt b/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
index b6f66bdb5e44..5ab98a5d449a 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_without_leading_slash.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - without leading slash
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_success_email.phpt b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
index 58f5ab4baa6d..0ff5a2dd1412 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_email.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - using an email format
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_success_empty.phpt b/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
index a67eeae44eed..0f0b3216d3bd 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
index 05b62cafe250..536df32ee86c 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/path_success_existing.phpt b/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
index 6dafbc0a3ff8..13ec3b5d07c9 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - path - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
index fe07df976326..250e01105b5c 100644
--- a/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_error_negative.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - port - too small number
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
index 8451f1bcf469..d3a3d1c7a010 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - port - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_success_new.phpt b/ext/uri/tests/rfc3986/modification/port_success_new.phpt
index 36ccea04a949..ce1ebfdca5d2 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - port - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
index 574af3f6e3ee..6610e75ebc40 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - port - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
index a3fbdc5e8742..2c7f14aae781 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - port - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
index d7f9745e9ef7..24c7b36c4378 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
index 964e6b36d72b..5474792e39dd 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt b/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
index d40a7f7e09ef..437c00d7278e 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_context_sensitive_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - context-sensitive reserved character
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_empty.phpt b/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
index e668b44df9b3..44f7ebc42d8a 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
index 7fd9707220d8..1fc9049388cc 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_existing.phpt b/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
index b5af7feee250..de1d67f04d28 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
index 89d130eedc27..0b3b62a29f79 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
index d9dfcd208310..129e4ca680c3 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - query - unsetting not-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
index 4349764d4dd1..5ef568415775 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 1
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
index 624abf2fc49c..9e5551ee439a 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 2
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt b/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
index 7d6e1e4d0489..89ae3c0b608b 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 3
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
index 94888c446f69..b737f94bec7f 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
index e44e8df85ed0..7b6d179fdc9d 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
index 7d235e56d113..beb94baf955c 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
index 695cb9c7f1e4..d50b76e085d1 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - basic case
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
index 67d447e8810e..7cf806f7b2bd 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
index 4aa9b2d9dd2c..b2817a61f2a9 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - scheme - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
index c416ea43eb73..2db4f37c2e03 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - reserved characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
index ab753e6de507..0d494c6a60a3 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
index a4b7409d6706..61f6ee9d41b4 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
index a13e091075cb..cc4d4998aca9 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
index dc49c10d7526..1937c4eba01e 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
index 0f4e7219cbd3..1f625d93f762 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
index 9aa2a5999ac4..13f65e514514 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri component modification - userinfo - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_success_empty.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_success_empty.phpt
index 8b7df6c55ca0..f5b2f55a0eb2 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri parsing - userinfo - empty
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_success_only_password.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_success_only_password.phpt
index eb5053c10490..4a603ab46396 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_success_only_password.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_success_only_password.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri parsing - userinfo - only password
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_success_only_username.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_success_only_username.phpt
index 1081a0e04858..81e38334f1bc 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_success_only_username.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_success_only_username.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri parsing - userinfo - only username
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
index 16b2f61dce78..26f55896c1be 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\Rfc3986\Uri reference resolution - resolve() - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/getters/gh20771.phpt b/ext/uri/tests/whatwg/getters/gh20771.phpt
index 19f1d1fb0f50..1b69d0a99040 100644
--- a/ext/uri/tests/whatwg/getters/gh20771.phpt
+++ b/ext/uri/tests/whatwg/getters/gh20771.phpt
@@ -1,7 +1,5 @@
 --TEST--
 GH-20771 (Assertion failure when getUnicodeHost() returns empty string)
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt b/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
index ac74b8668cd2..7d178691fc01 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - characters from the percent encode set
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt b/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
index 5b3aa9426232..5131a2574001 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt b/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
index 9473ea9535f9..ff6e9097772c 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt b/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
index 0a7d253434d4..038fd70ea887 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt b/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
index 4639d993df04..6e6424f8ef13 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - only a hashmark character
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
index faaf41796c74..30353dc2e9f7 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
index c609b5df042d..b43631a3415b 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
index 585707e497e5..cee1adc61c5d 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
index 21e295db23ec..aab507be992a 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - unsetting not-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt b/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
index 4523388223b6..d4af5c748725 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_with_leading_hashmark.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - fragment - with leading hashmark
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_empty.phpt b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
index 7ce0fa9dff2b..c280140381d8 100644
--- a/ext/uri/tests/whatwg/modification/host_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
index a6ef7e6a5d5d..deca314462b8 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden host code point
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
index 6d8b0c8b6565..3e986f0b48bf 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden host code point
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
index 7d32dcba2c6c..7b4a2fad9085 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden host codepoint
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
index d06234d949b8..235960f19b53 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden domain code point
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
index 4413802fdb9e..f465bb85f226 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden domain code point
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
index 4413802fdb9e..f465bb85f226 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - forbidden domain code point
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt b/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
index 84a6bc1ebdbc..b6f501a201aa 100644
--- a/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt b/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
index 627fe8d3e588..719a3756a105 100644
--- a/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
index 9604476554fc..e5e30570ba9b 100644
--- a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_existing.phpt b/ext/uri/tests/whatwg/modification/host_success_existing.phpt
index 57394c851c77..45535cb88a8a 100644
--- a/ext/uri/tests/whatwg/modification/host_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_idna.phpt b/ext/uri/tests/whatwg/modification/host_success_idna.phpt
index 919e22934dfa..98c794ad7868 100644
--- a/ext/uri/tests/whatwg/modification/host_success_idna.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_idna.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - IDNA characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
index fef9e0fc6376..143465481f66 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - IPv4 address
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
index 2124b70ef56d..f6665f6594aa 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - IPv6 address
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
index 5db68cb90a62..242c17430101 100644
--- a/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - characters from the percent encode set
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_empty.phpt b/ext/uri/tests/whatwg/modification/password_success_empty.phpt
index 40c350cc1b30..72bb5256cdde 100644
--- a/ext/uri/tests/whatwg/modification/password_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_encoded.phpt b/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
index 82b172d914af..b7f2f5485241 100644
--- a/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_existing.phpt b/ext/uri/tests/whatwg/modification/password_success_existing.phpt
index 61b0ce3909b4..f3aedc393b2b 100644
--- a/ext/uri/tests/whatwg/modification/password_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_new.phpt b/ext/uri/tests/whatwg/modification/password_success_new.phpt
index 8357b9972109..5c074a16a9eb 100644
--- a/ext/uri/tests/whatwg/modification/password_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
index 2216fa4e8e84..3ee703024d73 100644
--- a/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
index 203b831411a6..1f53b4c3b31f 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
index 06bade29468f..70d405415eb5 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
index 357b33b78c0b..62127d739187 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - password - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
index a795f3197a6d..ea4bac4b06aa 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_non_existent2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
index 59f539124c68..8f34b6db9de6 100644
--- a/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - characters from the percent encode set
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_empty.phpt b/ext/uri/tests/whatwg/modification/path_success_empty.phpt
index 9e8d3495445a..e17856f26dbc 100644
--- a/ext/uri/tests/whatwg/modification/path_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_encoded.phpt b/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
index b698c4691b0c..5ee661454f4f 100644
--- a/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_existing.phpt b/ext/uri/tests/whatwg/modification/path_success_existing.phpt
index 113c8c88d48b..ec7918a5a4f4 100644
--- a/ext/uri/tests/whatwg/modification/path_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
index c09a3aa2810f..e753771aa9b8 100644
--- a/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_unicode.phpt b/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
index d195a6dadbc1..1a54a0882a42 100644
--- a/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt b/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
index 1149287dc531..c0991afb0969 100644
--- a/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_without_leading_slash.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - path - without leading slash
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_error_negative.phpt b/ext/uri/tests/whatwg/modification/port_error_negative.phpt
index 27e29995ce35..1c6f447acd1e 100644
--- a/ext/uri/tests/whatwg/modification/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_negative.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - negative number
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_error_too_large.phpt b/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
index f530b3672163..204b3caccc96 100644
--- a/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - host - larger than a 16-bit unsigned integer
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_existing.phpt b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
index e5ea806bd1a4..f84e0a9c2de2 100644
--- a/ext/uri/tests/whatwg/modification/port_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_new.phpt b/ext/uri/tests/whatwg/modification/port_success_new.phpt
index 85098b21b7b3..de23a1934aca 100644
--- a/ext/uri/tests/whatwg/modification/port_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_special1.phpt b/ext/uri/tests/whatwg/modification/port_success_special1.phpt
index ba85449e4353..979a41a3a8ec 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_special2.phpt b/ext/uri/tests/whatwg/modification/port_success_special2.phpt
index d9f0074f0532..7570768cd27c 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
index c280c181b19a..2aa7f3c07cfe 100644
--- a/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
index d364c72d7002..07ea45d9d8e9 100644
--- a/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - port - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
index fc487f33797d..88c164039a5b 100644
--- a/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - characters from the percent encode set
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt b/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
index cb220a0a33ef..95a857d0f4de 100644
--- a/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_context_sensitive_reserved.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - context-sensitive reserved character
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_empty.phpt b/ext/uri/tests/whatwg/modification/query_success_empty.phpt
index dcb98bc37689..f8b94f435293 100644
--- a/ext/uri/tests/whatwg/modification/query_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_encoded.phpt b/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
index f9935015f7bd..ef319c04708f 100644
--- a/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_existing.phpt b/ext/uri/tests/whatwg/modification/query_success_existing.phpt
index b3429b58b865..317c4fa4687d 100644
--- a/ext/uri/tests/whatwg/modification/query_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - changing an existing one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
index 81232d8b2aa2..873e17d787f3 100644
--- a/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt b/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
index 3e1bf5ab9dce..a993ca28b94f 100644
--- a/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - only a question mark character
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_unicode.phpt b/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
index 526138f8954a..f30a49b868c3 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - unicode characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
index cb5a2a701e24..e898da5a39ab 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt b/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
index 6456dcacac7f..1be347236552 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unset_non_existent.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - unsetting not-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt b/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
index ce67dcb6bb35..d43e5e22dbbf 100644
--- a/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_with_leading_question_mark.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - query - with leading question mark
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt b/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
index 5e3525de7d94..0113d4ff8366 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - empty string
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
index bda1ac497e25..906a99585ad1 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - URL encoded characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
index ad98af24e4af..90256bbab1c0 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - invalid characters
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt b/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
index ab2845ae6493..649d318b8973 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
index 6f66b30b2b7b..838769ec30ff 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - basic case
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt b/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
index 052eca6e247b..88432552274f 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - trailing colon
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/scheme_success_full.phpt b/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
index 957a1fab7aff..103c77e1eb7a 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - scheme - trailing colon and double slash
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt b/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
index bc0beab49649..9763c9c51949 100644
--- a/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - characters from the percent encode set
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_existing.phpt b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
index 2506acf85d71..a0a1e5ffad95 100644
--- a/ext/uri/tests/whatwg/modification/username_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - changing existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_new.phpt b/ext/uri/tests/whatwg/modification/username_success_new.phpt
index 56666a68ea7d..f8672916ad5e 100644
--- a/ext/uri/tests/whatwg/modification/username_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_new.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - adding a new one
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt b/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
index 86f6a62e0f20..7428dfe96022 100644
--- a/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
index 8340b4ca1db6..59d3a42a1fdc 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
index ccfeac222e4e..2e6ba48a1dd9 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - unsetting existing
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
index 44a648610424..b462100a7e2e 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent1.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
index 7886b35fd9b8..938202b5c7d6 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_non_existent2.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url component modification - username - unsetting non-existent
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
index ed31e0e5daea..15b2a141f2fd 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_error_host_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url reference resolution - resolve() - null byte
---EXTENSIONS--
-uri
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
index abdcec98e842..f26b2eb5fa5c 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Test Uri\WhatWg\Url reference resolution - resolve() - null byte in path
---EXTENSIONS--
-uri
 --FILE--
 <?php
 

From 0e973e379227f7b08934c1088b3fc8b23a7be1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= <kocsismate@woohoolabs.com>
Date: Thu, 11 Jun 2026 02:44:54 +0200
Subject: [PATCH 3/3] Fix missing zend_tests extension dependencies for ext/uri
 tests

---
 ext/uri/tests/100.phpt | 1 +
 ext/uri/tests/101.phpt | 1 +
 ext/uri/tests/102.phpt | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ext/uri/tests/100.phpt b/ext/uri/tests/100.phpt
index 6a5482d43e7c..1ad726123b74 100644
--- a/ext/uri/tests/100.phpt
+++ b/ext/uri/tests/100.phpt
@@ -1,5 +1,6 @@
 --TEST--
 Test the parse_url-based URI parser
+--EXTENSIONS--
 zend_test
 --FILE--
 <?php
diff --git a/ext/uri/tests/101.phpt b/ext/uri/tests/101.phpt
index d394fc119f0c..daa83e45c9f8 100644
--- a/ext/uri/tests/101.phpt
+++ b/ext/uri/tests/101.phpt
@@ -1,5 +1,6 @@
 --TEST--
 Test the Lexbor-based URI parser
+--EXTENSIONS--
 zend_test
 --FILE--
 <?php
diff --git a/ext/uri/tests/102.phpt b/ext/uri/tests/102.phpt
index 65bf1a373886..69d6b21babb3 100644
--- a/ext/uri/tests/102.phpt
+++ b/ext/uri/tests/102.phpt
@@ -1,5 +1,6 @@
 --TEST--
 Test the handling large ports for the uri struct
+--EXTENSIONS--
 zend_test
 --FILE--
 <?php