diff --git a/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt b/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
index 284de4e6a522..655f57700abc 100644
--- a/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
+++ b/ext/uri/tests/rfc3986/builder/basic_error_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder basic - error - with base URL
+Test Uri\Rfc3986\UriBuilder basic - error - with base URI
 --FILE--
 <?php
 
@@ -9,7 +9,7 @@ $builder = new Uri\Rfc3986\UriBuilder()
 try {
     $builder->build(new Uri\Rfc3986\Uri("/foo/bar"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt b/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
index b7a84dc00cf1..f98f34a5981b 100644
--- a/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
+++ b/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder basic - success - with base URL
+Test Uri\Rfc3986\UriBuilder basic - success - with base URI
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
index 8ed2a8938e9a..97ec3d167cb2 100644
--- a/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/fragment_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setFragment("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt b/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
index 2a15d5e85a82..a87ef9f5d3b0 100644
--- a/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/fragment_error_unicode_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setFragment("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
index ae06238a1f8f..7774bd4beb8e 100644
--- a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding1.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setHost("ex%3mple.co");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
index cc514ec69191..49f29269cff8 100644
--- a/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_error_percent_encoding2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder::setHost() - error - invalid percent encoded octet in IPv6
+Test Uri\Rfc3986\UriBuilder::setHost() - error - invalid percent-encoded octet in IPv6
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setHost("[2001:%308:85a3:0000:0000:8a2e:0370:7334]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
index 81e93ccfc10a..c7288893524f 100644
--- a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
+++ b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\UriBuilder::setHost() - success - Registered name
+Test Uri\Rfc3986\UriBuilder::setHost() - success - registered name
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt b/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
index 8cce8d471aa1..c95e2ea14446 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
@@ -9,7 +9,7 @@ $builder->setPath("fo:o/bar/baz");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt b/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
index b1f0a2518f1c..ede07bda8fc8 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
@@ -9,7 +9,7 @@ $builder->setPath("//foo/bar/baz");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt b/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
index 97b6c3e8b854..7b0cd553ae15 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_missing_leading_slash.phpt
@@ -10,7 +10,7 @@ $builder->setHost("example.com");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
index 039b22770246..3831c67bde70 100644
--- a/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/path_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setPath("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt b/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
index 4b40e84c78f3..a0d8a4c0c88b 100644
--- a/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/builder/port_error_missing_host.phpt
@@ -9,7 +9,7 @@ $builder->setPort(443);
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/port_error_negative.phpt b/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
index 4cbc0e1c69d7..0a1dd624b449 100644
--- a/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/builder/port_error_negative.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
index ecfced24a44c..d53b088b7a55 100644
--- a/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/query_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setQuery("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt b/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
index 4c212cddd631..c8c7f093c038 100644
--- a/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/query_error_unicode_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setQuery("főő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
index 13594c163363..dc325cc77a7b 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_empty.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
index c178a0fa1f1e..92719c129c30 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_first_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme("1");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
index 4941db44aa7d..1817af42edb3 100644
--- a/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/scheme_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setScheme(":");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
index a6919e8ffd0a..997ff84c6944 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_missing_host.phpt
@@ -9,7 +9,7 @@ $builder->setUserInfo("user:pass");
 try {
     $builder->build();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
index 0830a57864d7..53730dfe529d 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_percent_encoding.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setUserInfo("%3");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt b/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
index 9d3fb2544daf..6db1fbb5ba6c 100644
--- a/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
+++ b/ext/uri/tests/rfc3986/builder/userinfo_error_special_char.phpt
@@ -8,7 +8,7 @@ $builder = new Uri\Rfc3986\UriBuilder();
 try {
     $builder->setUserInfo("<>");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/general/array_cast_success.phpt b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
index 9e8e56eb7277..9bb133eba767 100644
--- a/ext/uri/tests/rfc3986/general/array_cast_success.phpt
+++ b/ext/uri/tests/rfc3986/general/array_cast_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test casting Uri\Rfc3986\Uri to array
+Test Uri\Rfc3986\Uri array cast - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/general/clone_success.phpt b/ext/uri/tests/rfc3986/general/clone_success.phpt
index 915909bb7350..6539f0e02910 100644
--- a/ext/uri/tests/rfc3986/general/clone_success.phpt
+++ b/ext/uri/tests/rfc3986/general/clone_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test cloning Uri\Rfc3986\Uri
+Test Uri\Rfc3986\Uri cloning - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/general/extension_error.phpt b/ext/uri/tests/rfc3986/general/extension_error.phpt
index 02cc60ff0e24..94b2cc4f9572 100644
--- a/ext/uri/tests/rfc3986/general/extension_error.phpt
+++ b/ext/uri/tests/rfc3986/general/extension_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extension of Uri\Rfc3986\Uri
+Test Uri\Rfc3986\Uri extension - error
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
index 5806ec1f14e5..b2b4967f2200 100644
--- a/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
+++ b/ext/uri/tests/rfc3986/general/instantiate_without_constructor_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri instantiation without calling the constructor
+Test Uri\Rfc3986\Uri instantiation - error - without calling the constructor
 --EXTENSIONS--
 reflection
 uri
diff --git a/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt b/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
index 0ac7ea3f7efd..c2edc849086c 100644
--- a/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
+++ b/ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component retrieval - host type - IP future
+Test Uri\Rfc3986\Uri component retrieval - host type - IPvFuture
 --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 2296a797e662..201ebe23ffbb 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - reserved characters
+Test Uri\Rfc3986\Uri::withFragment() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withFragment("#fragment");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
index 5caea7996c5f..18e0af52bbc7 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unicode characters
+Test Uri\Rfc3986\Uri::withFragment() - error - Unicode characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withFragment("ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
index 2c6285656a7b..807ecc3afe24 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - empty string
+Test Uri\Rfc3986\Uri::withFragment() - success - empty string
 --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 905ed65f6666..ab55b8e4f537 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - URL encoded characters
+Test Uri\Rfc3986\Uri::withFragment() - success - percent-encoded characters
 --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 4b5936880ff1..ebecce9ac565 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - changing an existing one
+Test Uri\Rfc3986\Uri::withFragment() - success - changing an existing one
 --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 9020a8f3669c..5d754f2c04f9 100644
--- a/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/fragment_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unsetting existing
+Test Uri\Rfc3986\Uri::withFragment() - success - unsetting existing
 --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 080b2ea9e1ba..966ebbbc3472 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - fragment - unsetting not-existent
+Test Uri\Rfc3986\Uri::withFragment() - success - unsetting non-existent
 --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 be724549926d..feeaa987f372 100644
--- a/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - reserved characters
+Test Uri\Rfc3986\Uri::withHost() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withHost("ex#mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt b/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
index dd3a527ff9ed..c5755dcc4f01 100644
--- a/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_error_unset_with_userinfo.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting with userinfo
+Test Uri\Rfc3986\Uri::withHost() - error - unsetting with userinfo
 --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 98187ddee609..71d86c05f8bf 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - empty string
+Test Uri\Rfc3986\Uri::withHost() - success - empty string
 --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 05bb410f44e0..eca764996183 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - URL encoded characters
+Test Uri\Rfc3986\Uri::withHost() - success - percent-encoded characters
 --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 385c29f985d5..b9bcdc498ed1 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - changing an existing one
+Test Uri\Rfc3986\Uri::withHost() - success - changing an existing one
 --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 7969559d73a6..e1fae015afe8 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ip_future.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IP future address
+Test Uri\Rfc3986\Uri::withHost() - success - IPvFuture address
 --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 7a2ef3702bc7..d146a842ad47 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IPv4 address
+Test Uri\Rfc3986\Uri::withHost() - success - IPv4 address
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt b/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
index dbdf0cd877de..a809c1cf135d 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv4_to_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - changing IPv4 to IPv6
+Test Uri\Rfc3986\Uri::withHost() - success - changing IPv4 to IPv6
 --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 521e5645fe66..ac1856fd5ac6 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - IPv6 address
+Test Uri\Rfc3986\Uri::withHost() - success - IPv6 address
 --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 f9d13de087fb..a387d4b14c75 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - adding a new one
+Test Uri\Rfc3986\Uri::withHost() - success - adding a new one
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt b/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
index 89fa9502cceb..00777a64dd0b 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_percent_encoded_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - percent-encoded reserved characters
+Test Uri\Rfc3986\Uri::withHost() - success - percent-encoded reserved characters
 --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 f1887209d49e..8d6880703b9d 100644
--- a/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/host_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting existing
+Test Uri\Rfc3986\Uri::withHost() - success - unsetting existing
 --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 8eb5faeac72b..c9d23ec7399b 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - host - unsetting non-existent
+Test Uri\Rfc3986\Uri::withHost() - success - unsetting non-existent
 --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 b629ec8fdd54..97fa180bee54 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - null byte
+Test Uri\Rfc3986\Uri::withPath() - error - null byte
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withPath("/\0foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
index 24863251f943..e539f6cefd06 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - reserved characters
+Test Uri\Rfc3986\Uri::withPath() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withPath("/[foo]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
index 1762470ee2a9..c86045ef3304 100644
--- a/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - unicode characters
+Test Uri\Rfc3986\Uri::withPath() - error - Unicode characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withPath("/ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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 5ab98a5d449a..7b8f2a9c8ec2 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - without leading slash
+Test Uri\Rfc3986\Uri::withPath() - error - without leading slash
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withPath("foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/path_success_email.phpt b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
index 0ff5a2dd1412..f13e1a4fe7ae 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_email.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_email.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - using an email format
+Test Uri\Rfc3986\Uri::withPath() - success - using an email format
 --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 0f0b3216d3bd..bae19eda1974 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - empty string
+Test Uri\Rfc3986\Uri::withPath() - success - empty string
 --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 536df32ee86c..d3d76465b4a1 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - URL encoded characters
+Test Uri\Rfc3986\Uri::withPath() - success - percent-encoded characters
 --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 13ec3b5d07c9..76bd8b76d153 100644
--- a/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/path_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - path - changing an existing one
+Test Uri\Rfc3986\Uri::withPath() - success - changing an existing one
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt b/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
index 51ab43185a4b..c1d0a8fe9b48 100644
--- a/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_error_missing_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - missing host
+Test Uri\Rfc3986\Uri::withPort() - error - missing host
 --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 250e01105b5c..74d370433d91 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 - port - too small number
+Test Uri\Rfc3986\Uri::withPort() - error - negative number
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt b/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
index 4710f4fb81b1..09aebc4d90f2 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - adding with an empty host
+Test Uri\Rfc3986\Uri::withPort() - success - adding with an empty host
 --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 d3a3d1c7a010..38a1326f8f4b 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - changing an existing one
+Test Uri\Rfc3986\Uri::withPort() - success - changing an existing one
 --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 ce1ebfdca5d2..af973e3dd104 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - adding a new one
+Test Uri\Rfc3986\Uri::withPort() - success - adding a new one
 --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 6610e75ebc40..2ec5c504408d 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting existing
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting existing
 --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 2c7f14aae781..9bfe494b33b3 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting non-existent
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting non-existent
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt b/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
index 3783e0122bdc..201a6f5b0a20 100644
--- a/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
+++ b/ext/uri/tests/rfc3986/modification/port_success_unset_without_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - port - unsetting with an empty host
+Test Uri\Rfc3986\Uri::withPort() - success - unsetting with an empty host
 --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 24c7b36c4378..b3e766313381 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - reserved characters
+Test Uri\Rfc3986\Uri::withQuery() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withQuery("#foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
index 5474792e39dd..3aa0858174ee 100644
--- a/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_error_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unicode characters
+Test Uri\Rfc3986\Uri::withQuery() - error - Unicode characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withQuery("ő");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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 437c00d7278e..a54b2f7288d0 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - context-sensitive reserved character
+Test Uri\Rfc3986\Uri::withQuery() - success - context-sensitive reserved character
 --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 44f7ebc42d8a..09bb7fe3cb91 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - empty string
+Test Uri\Rfc3986\Uri::withQuery() - success - empty string
 --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 1fc9049388cc..db73639f6b61 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - URL encoded characters
+Test Uri\Rfc3986\Uri::withQuery() - success - percent-encoded characters
 --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 de1d67f04d28..56f3bdb76a0f 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - changing an existing one
+Test Uri\Rfc3986\Uri::withQuery() - success - changing an existing one
 --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 0b3b62a29f79..ff00a7c4e810 100644
--- a/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/query_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unsetting existing
+Test Uri\Rfc3986\Uri::withQuery() - success - unsetting existing
 --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 129e4ca680c3..aaa4f0126039 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - query - unsetting not-existent
+Test Uri\Rfc3986\Uri::withQuery() - success - unsetting non-existent
 --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 5ef568415775..57f7f3b44b36 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 1
+Test Uri\Rfc3986\Uri::withHost() - success - round trip not guaranteed (case 1)
 --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 9e5551ee439a..141932a28d18 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 2
+Test Uri\Rfc3986\Uri::withScheme() - success - round trip not guaranteed (case 2)
 --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 89ae3c0b608b..56c12fe7e810 100644
--- a/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
+++ b/ext/uri/tests/rfc3986/modification/roundtrip_special_case3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification when roundtripping is not guaranteed - case 3
+Test Uri\Rfc3986\Uri::withHost() - success - round trip not guaranteed (case 3)
 --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 b737f94bec7f..18f7c48291c9 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - empty string
+Test Uri\Rfc3986\Uri::withScheme() - error - empty string
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
index 7b6d179fdc9d..092a5eb55403 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - URL encoded characters
+Test Uri\Rfc3986\Uri::withScheme() - error - percent-encoded characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withScheme("http%73");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
index beb94baf955c..b55ddd7fffea 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - reserved characters
+Test Uri\Rfc3986\Uri::withScheme() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withScheme("https:");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
index d50b76e085d1..7ca0de00f665 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - basic case
+Test Uri\Rfc3986\Uri::withScheme() - success - basic case
 --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 7cf806f7b2bd..896e8c38f5ed 100644
--- a/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/scheme_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - unsetting existing
+Test Uri\Rfc3986\Uri::withScheme() - success - unsetting existing
 --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 b2817a61f2a9..5ce37f79fba0 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - scheme - unsetting non-existent
+Test Uri\Rfc3986\Uri::withScheme() - success - unsetting non-existent
 --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 2db4f37c2e03..369938e8b949 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_error_reserved.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - reserved characters
+Test Uri\Rfc3986\Uri::withUserInfo() - error - reserved characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->withUserInfo("us/r:password"); // us/r:password
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
index 0d494c6a60a3..03848c4e2811 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - empty string
+Test Uri\Rfc3986\Uri::withUserInfo() - success - empty string
 --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 61f6ee9d41b4..167049803460 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - URL encoded characters
+Test Uri\Rfc3986\Uri::withUserInfo() - success - percent-encoded characters
 --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 cc4d4998aca9..443dd8635940 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - changing an existing one
+Test Uri\Rfc3986\Uri::withUserInfo() - success - changing an existing one
 --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 1937c4eba01e..e148c2bc9259 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - adding a new one
+Test Uri\Rfc3986\Uri::withUserInfo() - success - adding a new one
 --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 1f625d93f762..f006729ec995 100644
--- a/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
+++ b/ext/uri/tests/rfc3986/modification/userinfo_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - unsetting existing
+Test Uri\Rfc3986\Uri::withUserInfo() - success - unsetting existing
 --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 13f65e514514..8f164e5e28a9 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,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri component modification - userinfo - unsetting non-existent
+Test Uri\Rfc3986\Uri::withUserInfo() - success - unsetting non-existent
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
index cb6007c844aa..081081c805f4 100644
--- a/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - basic - multibyte character
 try {
     new Uri\Rfc3986\Uri("🐘");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
index 91d194e2ff5e..3209eec4cb8c 100644
--- a/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/basic_error_null_byte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - basic - URI contains null byte
 try {
     new Uri\Rfc3986\Uri("https://exam\0ple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
index d901d0fdecbd..4d5d2efb97a3 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - host - multibyte character
 try {
     new Uri\Rfc3986\Uri("https://exḁmple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt b/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
index be4fc5aa626f..dc3331ecc67e 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_multibyte_emoji.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - host - emoji code point
+Test Uri\Rfc3986\Uri parsing - host - emoji character
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
index 0568a027f5b9..01f041c188fd 100644
--- a/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/host_error_reserved.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - host - reserved character
 try {
     new Uri\Rfc3986\Uri("https://ex[a]mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
index ded528d03082..3eb651bdeff3 100644
--- a/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/path_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - path - multibyte character
 try {
     new Uri\Rfc3986\Uri("https://example.com/fȎȎ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
index 2a7efd702569..398bfd6400c3 100644
--- a/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/path_error_reserved.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - path - reserved character
 try {
     new Uri\Rfc3986\Uri("https://example.com/fo[o/ba]r/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
index 54bcd849e5f3..33eb4116c155 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - port - multibyte character
 try {
     new Uri\Rfc3986\Uri("https://example.com:Ȏ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt b/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
index df29c2767f05..1284ac845bf4 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_negative.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - port - negative value
 try {
     var_dump(new Uri\Rfc3986\Uri("http://example.com:-1"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
index 169f74e61de2..b4d412bc7c25 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_overflow.phpt
@@ -5,12 +5,12 @@ Test Uri\Rfc3986\Uri parsing - port - integer overflow
 
 if (PHP_INT_SIZE == 8) {
     $uri = new \Uri\Rfc3986\Uri('https://example.com:9223372036854775807');
-    echo $uri->getPort(), PHP_EOL;
-    echo "2147483647", PHP_EOL;
+    echo $uri->getPort(), "\n";
+    echo "2147483647", "\n";
 } else {
     $uri = new \Uri\Rfc3986\Uri('https://example.com:2147483647');
-    echo "9223372036854775807", PHP_EOL;
-    echo $uri->getPort(), PHP_EOL;
+    echo "9223372036854775807", "\n";
+    echo $uri->getPort(), "\n";
 }
 
 try {
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
index e38ad85b5758..caa5b1982735 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - port - percent encoded character
+Test Uri\Rfc3986\Uri parsing - port - percent-encoded character
 --FILE--
 <?php
 
 try {
     new Uri\Rfc3986\Uri("https://example.com:%30");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt b/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt
index d2632a6f2806..26dd223d2123 100644
--- a/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt
+++ b/ext/uri/tests/rfc3986/parsing/port_error_user_info_wrong_place.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - port - user info component is in wrong place
 try {
     var_dump(new Uri\Rfc3986\Uri("https://example.com:8080@username:password"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
index 7b720ee2c8c1..5114bce99f72 100644
--- a/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
+++ b/ext/uri/tests/rfc3986/parsing/query_error_multibyte_emoji.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - query - emoji code point
+Test Uri\Rfc3986\Uri parsing - query - emoji character
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
index ba686e7fafca..f2b7f93613b3 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_empty.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - scheme - empty
 try {
     new Uri\Rfc3986\Uri("://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
index f638ca80e0cd..4972bdeada13 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - scheme - multibyte characters
 try {
     new Uri\Rfc3986\Uri("ƕŢŢƤƨ://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
index d4dba6f260ad..80a8be51c480 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\Rfc3986\Uri parsing - scheme - percent encoded character
+Test Uri\Rfc3986\Uri parsing - scheme - percent-encoded character
 --FILE--
 <?php
 
 try {
     new Uri\Rfc3986\Uri("http%2F://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
index 99dfb664ea05..ce7eed6ae789 100644
--- a/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/scheme_error_reserved.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - scheme - reserved character
 try {
     new Uri\Rfc3986\Uri("http&://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
index 61ea8ecc3c28..bf12a200e1ce 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_extended_ascii.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - userinfo - extended ASCII character
 try {
     new Uri\Rfc3986\Uri("http://úzör@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
index fbceea77b1cd..8d83d632a3a1 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - userinfo - multibyte character
 try {
     new Uri\Rfc3986\Uri("http://usĕr:pąss@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt b/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
index 3b6caeb7a0ed..e505d4a7d310 100644
--- a/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
+++ b/ext/uri/tests/rfc3986/parsing/userinfo_error_reserved.phpt
@@ -6,7 +6,7 @@ Test Uri\Rfc3986\Uri parsing - userinfo - reserved character
 try {
     new Uri\Rfc3986\Uri("http://us[er]:pass@example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
similarity index 87%
rename from ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
index 54f96abf14c6..789421862b21 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_with_base.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_absolute_uri_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - parse() - absolute URI with base URI
+Test Uri\Rfc3986\Uri::parse() - success - absolute URI with base URI
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
similarity index 86%
rename from ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
index ce601e197dd9..ee1aa3132d21 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_with_base.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/parse_success_relative_reference_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - parse() - relative reference with base URI
+Test Uri\Rfc3986\Uri::parse() - success - relative reference with base 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_path_null_byte.phpt
similarity index 64%
rename from ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_null_byte.phpt
index 26f55896c1be..a5a6d7da2997 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_null_byte.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - null byte
+Test Uri\Rfc3986\Uri::resolve() - error - null byte in path
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $uri = Uri\Rfc3986\Uri::parse("https://example.com");
 try {
     $uri->resolve("/f\0o");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
similarity index 79%
rename from ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt
rename to ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
index 3fcf488074ed..26bbffbd0b5a 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_error_unicode.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_error_path_unicode_character.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - unicode
+Test Uri\Rfc3986\Uri::resolve() - error - Unicode character in path
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
index 433f62fd3721..26e2ecb4a64f 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_absolute_uri.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - absolute URI
+Test Uri\Rfc3986\Uri::resolve() - success - absolute URI
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
index b09789c7cf95..908d8fc7d340 100644
--- a/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
+++ b/ext/uri/tests/rfc3986/reference_resolution/resolve_success_relative_reference.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri reference resolution - resolve() - relative reference
+Test Uri\Rfc3986\Uri::resolve() - success - relative reference
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/serialization/basic_success.phpt b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
index 95b25b307123..8b246aab0caa 100644
--- a/ext/uri/tests/rfc3986/serialization/basic_success.phpt
+++ b/ext/uri/tests/rfc3986/serialization/basic_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\Rfc3986\Uri serialization and unserialization
+Test Uri\Rfc3986\Uri serialization and unserialization - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
index ef76114f2f43..c8cfabf022d1 100644
--- a/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
+++ b/ext/uri/tests/rfc3986/serialization/unserialize_error_legacy_format.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GH-22046: Uri\Rfc3986\Uri cannot be unserialized with the unsupported C format
+Test Uri\Rfc3986\Uri unserialize() - error - unsupported C format
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
index efc2d928bb6a..1c379f5ddd11 100644
--- a/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_percent_encoding2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent encoded octet in IPv6
+Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent-encoded octet in IPv6
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt b/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
index 7ba24a56a317..154b9dfc918c 100644
--- a/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
+++ b/ext/uri/tests/whatwg/builder/host_error_percent_encoding3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent encoded octet in IPv4
+Test Uri\WhatWg\UrlBuilder::setHost() - error - invalid percent-encoded octet in IPv4
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/builder/host_success_regname.phpt b/ext/uri/tests/whatwg/builder/host_success_regname.phpt
index d72b919c0afb..d8a2465c0bb3 100644
--- a/ext/uri/tests/whatwg/builder/host_success_regname.phpt
+++ b/ext/uri/tests/whatwg/builder/host_success_regname.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlBuilder::setHost() - success - Registered name
+Test Uri\WhatWg\UrlBuilder::setHost() - success - registered name
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
index 4dffda8138cb..cf943db6cdd3 100644
--- a/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
+++ b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url equivalence - returns true - identical URIs
+Test Uri\WhatWg\Url equivalence - returns true - identical URLs
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
index c869299eaab1..6b6be92b5010 100644
--- a/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
+++ b/ext/uri/tests/whatwg/exceptions/invalid_url_exception_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\InvalidUrlException constructor reentry
+Test Uri\WhatWg\InvalidUrlException::__construct() - error - reentry
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
index e5a473b4a6a5..923fe88b7531 100644
--- a/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
+++ b/ext/uri/tests/whatwg/exceptions/url_validation_error_constructor_reentry.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\UrlValidationError constructor reentry
+Test Uri\WhatWg\UrlValidationError::__construct() - error - reentry
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/general/array_cast_success.phpt b/ext/uri/tests/whatwg/general/array_cast_success.phpt
index bb267a46fe52..7cdbe1ddc33e 100644
--- a/ext/uri/tests/whatwg/general/array_cast_success.phpt
+++ b/ext/uri/tests/whatwg/general/array_cast_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test casting Uri\WhatWg\Url to array
+Test Uri\WhatWg\Url array cast - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/general/clone_success.phpt b/ext/uri/tests/whatwg/general/clone_success.phpt
index 47885b6fe19b..2a1500da3a95 100644
--- a/ext/uri/tests/whatwg/general/clone_success.phpt
+++ b/ext/uri/tests/whatwg/general/clone_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test cloning Uri\WhatWg\Url
+Test Uri\WhatWg\Url cloning - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/general/extension_error.phpt b/ext/uri/tests/whatwg/general/extension_error.phpt
index da079b9781dc..540b6c0cf8bc 100644
--- a/ext/uri/tests/whatwg/general/extension_error.phpt
+++ b/ext/uri/tests/whatwg/general/extension_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extension of Uri\WhatWg\Url
+Test Uri\WhatWg\Url extension - error
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt b/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
index 088c8f5fb642..8b97899bce0c 100644
--- a/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
+++ b/ext/uri/tests/whatwg/general/instantiate_without_constructor_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url instantiation without calling the constructor
+Test Uri\WhatWg\Url instantiation - error - without calling the constructor
 --EXTENSIONS--
 reflection
 uri
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 7d178691fc01..1184bc2d8931 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_auto_encode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - characters from the percent encode set
+Test Uri\WhatWg\Url::withFragment() - success - characters from the percent-encode set
 --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 5131a2574001..06a6866dcfcd 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - empty string
+Test Uri\WhatWg\Url::withFragment() - success - empty string
 --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 ff6e9097772c..9d16bc79f543 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - URL encoded characters
+Test Uri\WhatWg\Url::withFragment() - success - percent-encoded characters
 --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 038fd70ea887..00cd9dce394e 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - changing an existing one
+Test Uri\WhatWg\Url::withFragment() - success - changing an existing one
 --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 6e6424f8ef13..12bf55c49639 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - only a hashmark character
+Test Uri\WhatWg\Url::withFragment() - success - only a hashmark character
 --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 30353dc2e9f7..9bafc17837d2 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - null byte
+Test Uri\WhatWg\Url::withFragment() - success - null byte
 --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 b43631a3415b..186a7607e6be 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unicode characters
+Test Uri\WhatWg\Url::withFragment() - success - Unicode characters
 --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 cee1adc61c5d..20af982238bf 100644
--- a/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/fragment_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unsetting existing
+Test Uri\WhatWg\Url::withFragment() - success - unsetting existing
 --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 aab507be992a..83eeed92a4ae 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - unsetting not-existent
+Test Uri\WhatWg\Url::withFragment() - success - unsetting non-existent
 --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 d4af5c748725..110bfe667d46 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - fragment - with leading hashmark
+Test Uri\WhatWg\Url::withFragment() - success - with leading hashmark
 --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_at_sign_opaque.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
rename to ext/uri/tests/whatwg/modification/host_error_at_sign_opaque.phpt
index deca314462b8..8aefb1251e4a 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_at_sign_opaque.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - error - at sign in opaque host input
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("foo://example.com");
 try {
     $url = $url->withHost("ex@mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt b/ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
rename to ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
index 235960f19b53..52460752c88f 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_at_sign_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
+Test Uri\WhatWg\Url::withHost() - error - at sign in special host input
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url = $url->withHost("ex@mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt b/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt
new file mode 100644
index 000000000000..e27a2544cc0f
--- /dev/null
+++ b/ext/uri/tests/whatwg/modification/host_error_colon_opaque.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test Uri\WhatWg\Url::withHost() - error - colon in opaque host input
+--FILE--
+<?php
+
+$url = Uri\WhatWg\Url::parse("foo://example.com");
+
+try {
+    $url = $url->withHost("ex:mple.com");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Uri\WhatWg\InvalidUrlException: The specified host is malformed
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt b/ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
similarity index 63%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
rename to ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
index f465bb85f226..5697e1833040 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_colon_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
+Test Uri\WhatWg\Url::withHost() - error - colon in special host input
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url = $url->withHost("ex:mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_error_empty.phpt b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
index c280140381d8..f5c80ab7496f 100644
--- a/ext/uri/tests/whatwg/modification/host_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - empty string
+Test Uri\WhatWg\Url::withHost() - error - empty string
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withHost("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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
deleted file mode 100644
index f465bb85f226..000000000000
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_special3.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden domain code point
---FILE--
-<?php
-
-$url = Uri\WhatWg\Url::parse("https://example.com");
-
-try {
-    $url = $url->withHost("ex:mple.com");
-} catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
-}
-
-?>
---EXPECT--
-Uri\WhatWg\InvalidUrlException: The specified host is malformed
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 b6f501a201aa..66acd721f7b5 100644
--- a/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - null byte
+Test Uri\WhatWg\Url::withHost() - error - null byte
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withHost("h\0st");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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 719a3756a105..ab8c1cf65bdd 100644
--- a/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_error_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - unsetting existing
+Test Uri\WhatWg\Url::withHost() - error - unsetting existing
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url = $url->withHost(null);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
index e5e30570ba9b..69f53823e914 100644
--- a/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - URL encoded characters
+Test Uri\WhatWg\Url::withHost() - success - percent-encoded characters
 --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 45535cb88a8a..1d5fc66f7c3f 100644
--- a/ext/uri/tests/whatwg/modification/host_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - changing an existing one
+Test Uri\WhatWg\Url::withHost() - success - changing an existing one
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt b/ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
similarity index 75%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
rename to ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
index 3e986f0b48bf..1bb99b08e447 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque2.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_hashmark_opaque.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - success - hash mark in opaque host input
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt b/ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
similarity index 75%
rename from ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
rename to ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
index a968e1405273..8f95fd88e823 100644
--- a/ext/uri/tests/whatwg/modification/host_error_forbidden_host_codepoint_opaque3.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_hashmark_special.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - forbidden host code point
+Test Uri\WhatWg\Url::withHost() - success - hash mark in special host input
 --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 98c794ad7868..0ff8a690e70e 100644
--- a/ext/uri/tests/whatwg/modification/host_success_idna.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_idna.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IDNA characters
+Test Uri\WhatWg\Url::withHost() - success - IDNA characters
 --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 143465481f66..a34e0ea2574c 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IPv4 address
+Test Uri\WhatWg\Url::withHost() - success - IPv4 address
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt b/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
index 52989097f8c9..14f7f720bb9f 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv4_to_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - changing IPv4 to IPv6
+Test Uri\WhatWg\Url::withHost() - success - changing IPv4 to IPv6
 --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 f6665f6594aa..8ad078f5f267 100644
--- a/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
+++ b/ext/uri/tests/whatwg/modification/host_success_ipv6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - IPv6 address
+Test Uri\WhatWg\Url::withHost() - success - IPv6 address
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt b/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
index b5dd89446601..7c3c72609793 100644
--- a/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
+++ b/ext/uri/tests/whatwg/modification/multiple_error_with_warnings.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - error - modifying multiple components with warnings before throwing an exception
+Test Uri\WhatWg\Url component modification - error - earlier warnings not in exception
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ $url = new Uri\WhatWg\Url("https://example.com")
 try {
     $url->withScheme("0");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
     var_dump($e->errors);
 }
 
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 242c17430101..88d36bdb36ea 100644
--- a/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - characters from the percent encode set
+Test Uri\WhatWg\Url::withPassword() - success - characters from the percent-encode set
 --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 72bb5256cdde..6f7c3a8c6866 100644
--- a/ext/uri/tests/whatwg/modification/password_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - empty string
+Test Uri\WhatWg\Url::withPassword() - success - empty string
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
index 217e8f174d8b..84ca2c4e92d4 100644
--- a/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - empty host
+Test Uri\WhatWg\Url::withPassword() - success - empty host
 --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 b7f2f5485241..97c1a269f260 100644
--- a/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - URL encoded characters
+Test Uri\WhatWg\Url::withPassword() - success - percent-encoded characters
 --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 f3aedc393b2b..d27f6debc1d3 100644
--- a/ext/uri/tests/whatwg/modification/password_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - changing an existing one
+Test Uri\WhatWg\Url::withPassword() - success - changing an existing one
 --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 5c074a16a9eb..b93269c1d562 100644
--- a/ext/uri/tests/whatwg/modification/password_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - adding a new one
+Test Uri\WhatWg\Url::withPassword() - success - adding a new one
 --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 3ee703024d73..350a852b403f 100644
--- a/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - null byte
+Test Uri\WhatWg\Url::withPassword() - success - null byte
 --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 1f53b4c3b31f..083a8a9bce3b 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting existing
+Test Uri\WhatWg\Url::withPassword() - success - unsetting existing
 --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 70d405415eb5..e783105a4c86 100644
--- a/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/password_success_unset_existing2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting existing
+Test Uri\WhatWg\Url::withPassword() - success - unsetting existing
 --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 62127d739187..ba6083a335bc 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - password - unsetting non-existent
+Test Uri\WhatWg\Url::withPassword() - success - unsetting non-existent
 --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 ea4bac4b06aa..4bb5f0076725 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withPassword() - success - unsetting non-existent
 --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 a871b6614a75..4e0f9eb90703 100644
--- a/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - characters from the percent encode set
+Test Uri\WhatWg\Url::withPath() - success - characters from the percent-encode set
 --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 e17856f26dbc..54847894ebb7 100644
--- a/ext/uri/tests/whatwg/modification/path_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - empty string
+Test Uri\WhatWg\Url::withPath() - success - empty string
 --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 5ee661454f4f..2b432acf3d31 100644
--- a/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - URL encoded characters
+Test Uri\WhatWg\Url::withPath() - success - percent-encoded characters
 --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 ec7918a5a4f4..38b818085d18 100644
--- a/ext/uri/tests/whatwg/modification/path_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - changing an existing one
+Test Uri\WhatWg\Url::withPath() - success - changing an existing one
 --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 e753771aa9b8..0520f93b1e13 100644
--- a/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - null byte
+Test Uri\WhatWg\Url::withPath() - success - null byte
 --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 1a54a0882a42..0cf0aa29ad19 100644
--- a/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/path_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - unicode characters
+Test Uri\WhatWg\Url::withPath() - success - Unicode characters
 --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 c0991afb0969..a48b0f8b5b25 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - path - without leading slash
+Test Uri\WhatWg\Url::withPath() - success - without leading slash
 --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 1c6f447acd1e..4993a7dbdecb 100644
--- a/ext/uri/tests/whatwg/modification/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_negative.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - negative number
+Test Uri\WhatWg\Url::withPort() - error - negative number
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withPort(-1);
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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 a7270fd5f41b..f641cce37eda 100644
--- a/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
+++ b/ext/uri/tests/whatwg/modification/port_error_too_large.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - host - larger than a 16-bit unsigned integer
+Test Uri\WhatWg\Url::withPort() - error - larger than a 16-bit unsigned integer
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
index e7a6b94207e9..528e2549d3c1 100644
--- a/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - empty host
+Test Uri\WhatWg\Url::withPort() - success - empty host
 --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 f84e0a9c2de2..0ff800d88c2b 100644
--- a/ext/uri/tests/whatwg/modification/port_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - changing an existing one
+Test Uri\WhatWg\Url::withPort() - success - changing an existing one
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt b/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
index e49d075035dd..c4103d4aa31e 100644
--- a/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_file_scheme.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - file scheme
+Test Uri\WhatWg\Url::withPort() - success - file scheme
 --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 de23a1934aca..f71f1278ad3e 100644
--- a/ext/uri/tests/whatwg/modification/port_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one
+Test Uri\WhatWg\Url::withPort() - success - adding a new one
 --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 979a41a3a8ec..b85babc39a0a 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special1.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
+Test Uri\WhatWg\Url::withPort() - success - adding a new one for a special URL
 --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 7570768cd27c..f8640ce8a949 100644
--- a/ext/uri/tests/whatwg/modification/port_success_special2.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_special2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - adding a new one for a special URL
+Test Uri\WhatWg\Url::withPort() - success - adding a new one for a special URL
 --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 2aa7f3c07cfe..788a610e2e87 100644
--- a/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/port_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - unsetting existing
+Test Uri\WhatWg\Url::withPort() - success - unsetting existing
 --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 07ea45d9d8e9..55f4dc90295b 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - port - unsetting non-existent
+Test Uri\WhatWg\Url::withPort() - success - unsetting non-existent
 --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 88c164039a5b..1423ab4c54ad 100644
--- a/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - characters from the percent encode set
+Test Uri\WhatWg\Url::withQuery() - success - characters from the percent-encode set
 --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 95a857d0f4de..0201105d7c94 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - context-sensitive reserved character
+Test Uri\WhatWg\Url::withQuery() - success - context-sensitive reserved character
 --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 f8b94f435293..ee7f50be4ed4 100644
--- a/ext/uri/tests/whatwg/modification/query_success_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - empty string
+Test Uri\WhatWg\Url::withQuery() - success - empty string
 --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 ef319c04708f..f74399ed813f 100644
--- a/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - URL encoded characters
+Test Uri\WhatWg\Url::withQuery() - success - percent-encoded characters
 --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 317c4fa4687d..eda22cc4b0cf 100644
--- a/ext/uri/tests/whatwg/modification/query_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - changing an existing one
+Test Uri\WhatWg\Url::withQuery() - success - changing an existing one
 --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 873e17d787f3..80a151ae246f 100644
--- a/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - null byte
+Test Uri\WhatWg\Url::withQuery() - success - null byte
 --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 a993ca28b94f..165b49244f32 100644
--- a/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_question_mark.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - only a question mark character
+Test Uri\WhatWg\Url::withQuery() - success - only a question mark character
 --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 f30a49b868c3..582e7148f1a4 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unicode.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unicode characters
+Test Uri\WhatWg\Url::withQuery() - success - Unicode characters
 --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 e898da5a39ab..5224c7f091e7 100644
--- a/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/query_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unsetting existing
+Test Uri\WhatWg\Url::withQuery() - success - unsetting existing
 --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 1be347236552..10524914db32 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - unsetting not-existent
+Test Uri\WhatWg\Url::withQuery() - success - unsetting non-existent
 --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 d43e5e22dbbf..40f8b64423d3 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - query - with leading question mark
+Test Uri\WhatWg\Url::withQuery() - success - with leading question mark
 --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 0113d4ff8366..5670d5947913 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_empty.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - empty string
+Test Uri\WhatWg\Url::withScheme() - error - empty string
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withScheme("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
index 906a99585ad1..1567f047222f 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - URL encoded characters
+Test Uri\WhatWg\Url::withScheme() - error - percent-encoded characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withScheme("http%73");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
index 90256bbab1c0..278f579aeed9 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_invalid.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - invalid characters
+Test Uri\WhatWg\Url::withScheme() - error - invalid characters
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withScheme("http?");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
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 649d318b8973..9b98fa9bfbf9 100644
--- a/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_error_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - null byte
+Test Uri\WhatWg\Url::withScheme() - error - null byte
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->withScheme("sch\0me");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
index 838769ec30ff..df4413ef6357 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - basic case
+Test Uri\WhatWg\Url::withScheme() - success - basic case
 --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 88432552274f..e7d265e3d8a6 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_colon.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - trailing colon
+Test Uri\WhatWg\Url::withScheme() - success - trailing colon
 --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 103c77e1eb7a..e61e4759caae 100644
--- a/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
+++ b/ext/uri/tests/whatwg/modification/scheme_success_full.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - scheme - trailing colon and double slash
+Test Uri\WhatWg\Url::withScheme() - success - trailing colon and double slash
 --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 9763c9c51949..c2369fe1e7a5 100644
--- a/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_auto_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - characters from the percent encode set
+Test Uri\WhatWg\Url::withUsername() - success - characters from the percent-encode set
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt b/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
index 13357d269b49..91f37ebc9621 100644
--- a/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_empty_host.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - empty host
+Test Uri\WhatWg\Url::withUsername() - success - empty host
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_encoded.phpt b/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
index 1415261e1ed8..439d3212e3a0 100644
--- a/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_encoded.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - percent-encoded octet byte
+Test Uri\WhatWg\Url::withUsername() - success - percent-encoded octet byte
 --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 a0a1e5ffad95..bfc3b4a414e0 100644
--- a/ext/uri/tests/whatwg/modification/username_success_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - changing existing
+Test Uri\WhatWg\Url::withUsername() - success - changing existing
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt b/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
index 3a6a0bf858e5..e4ca78e80668 100644
--- a/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_file_scheme.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - file scheme
+Test Uri\WhatWg\Url::withUsername() - success - file scheme
 --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 f8672916ad5e..45887c194763 100644
--- a/ext/uri/tests/whatwg/modification/username_success_new.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_new.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - adding a new one
+Test Uri\WhatWg\Url::withUsername() - success - adding a new one
 --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 7428dfe96022..e7520a50b42b 100644
--- a/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_null_byte.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - null byte
+Test Uri\WhatWg\Url::withUsername() - success - null byte
 --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 59d3a42a1fdc..990d3f67ece4 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting existing
+Test Uri\WhatWg\Url::withUsername() - success - unsetting existing
 --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 2e6ba48a1dd9..36ab106ee141 100644
--- a/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
+++ b/ext/uri/tests/whatwg/modification/username_success_unset_existing2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting existing
+Test Uri\WhatWg\Url::withUsername() - success - unsetting existing
 --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 b462100a7e2e..5a71581b0ca1 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withUsername() - success - unsetting non-existent
 --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 938202b5c7d6..1394e982b8e2 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url component modification - username - unsetting non-existent
+Test Uri\WhatWg\Url::withUsername() - success - unsetting non-existent
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
similarity index 94%
rename from ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt
rename to ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
index 888f289a38ad..aeb4275fbd7b 100644
--- a/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_reference_returns_null.phpt
+++ b/ext/uri/tests/whatwg/parsing/basic_error_emoji_relative_url_returns_null.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - basic - parse() returns null for an emoji relative reference
+Test Uri\WhatWg\Url parsing - basic - parse() returns null for an emoji relative-URL
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
index 2b7114baa738..8375e16a9289 100644
--- a/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
+++ b/ext/uri/tests/whatwg/parsing/basic_error_empty.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - basic - empty string
 try {
     new Uri\WhatWg\Url("");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt b/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
index 8444ee9e3e96..fc6a4335c0fb 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_Invalid.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - invalid code point
 try {
     new Uri\WhatWg\Url("https://ex[a]mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
index 92b317078ebb..acc4f30696a3 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty1.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - empty
 try {
     new Uri\WhatWg\Url("https://");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
index 726241674fae..2a16305f9ebf 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty2.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - empty
 try {
     new Uri\WhatWg\Url("https://user:pass@");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt b/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
index 90f2738148f4..f3f8458e8645 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_empty3.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - empty
 try {
     new Uri\WhatWg\Url("/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt b/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
index 959aa0c4442b..9595a6bce61a 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_ipvfuture.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - IPvFuture
 try {
     new Uri\WhatWg\Url("https://[v7.host]");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt b/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
index f450d26c4164..d65d623ffb0d 100644
--- a/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_error_null_byte.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - basic - URL contains null byte
+Test Uri\WhatWg\Url parsing - host - null byte
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("https://exam\0ple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt b/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
index 25a28a9750c4..4129fa5d20b9 100644
--- a/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
+++ b/ext/uri/tests/whatwg/parsing/host_success_empty4.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - host - empty
 try {
     new Uri\WhatWg\Url("///");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
similarity index 64%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
index 8e6c6fd3842e..b61cecb9341e 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
similarity index 64%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
index 01d549210d9f..1f40dfb945f4 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_absolute.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url_absolute.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("/foo");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt b/ext/uri/tests/whatwg/parsing/path_error_relative_url_only_query_fragment.phpt
similarity index 65%
rename from ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt
rename to ext/uri/tests/whatwg/parsing/path_error_relative_url_only_query_fragment.phpt
index 9c6a7a7906b2..b0994261d257 100644
--- a/ext/uri/tests/whatwg/parsing/path_error_relative_reference_only_query_fragment.phpt
+++ b/ext/uri/tests/whatwg/parsing/path_error_relative_url_only_query_fragment.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - path - relative reference
+Test Uri\WhatWg\Url parsing - path - relative-URL
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("?query#fragment");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
index 8175f2ca992a..886ed4f265ee 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - port - multibyte
 try {
     new Uri\WhatWg\Url("https://example.com:Ȏ");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_negative.phpt b/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
index bb23476db57c..44557c20635e 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_negative.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - port - negative value
 try {
     new Uri\WhatWg\Url("http://example.com:-1");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
index 874211ccb1cf..ee22ec0caa4e 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - port - percent encoded character
+Test Uri\WhatWg\Url parsing - port - percent-encoded character
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("https://example.com:%30");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt b/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt
index f0f79670230d..f20bef470d52 100644
--- a/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt
+++ b/ext/uri/tests/whatwg/parsing/port_error_user_info_wrong_place.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - port - user info component is in wrong place
 try {
     var_dump(new Uri\WhatWg\Url("https://example.com:8080@username:password"));
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
index 023c1d3fab9d..f5f39669558b 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_empty.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - empty
 try {
     new Uri\WhatWg\Url("://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
index 9c69b08161ef..7b16223f2d25 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_invalid.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - invalid character
 try {
     new Uri\WhatWg\Url("http&://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
index 517bbb410596..d814c849b9bd 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_multibyte.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - multibyte code point
 try {
     new Uri\WhatWg\Url("ƕŢŢƤƨ://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
index 5674c1f33093..13428f0e6b68 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_null_byte.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - null byte
 try {
     new Uri\WhatWg\Url("ht\0tp://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
index 92832f65a019..2caf11fab36b 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_only1.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - only scheme
 try {
     new Uri\WhatWg\Url("http:");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
index 22ab6fc53515..fa21e6d2490b 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_only2.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - only scheme
 try {
     new Uri\WhatWg\Url("http:/");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
index a0324edd3701..ff857b3c972b 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_percent_encoded.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test Uri\WhatWg\Url parsing - scheme - percent encoded character
+Test Uri\WhatWg\Url parsing - scheme - percent-encoded character
 --FILE--
 <?php
 
 try {
     new Uri\WhatWg\Url("http%2F://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt b/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
index 9966ad6248e5..5196c92c262c 100644
--- a/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
+++ b/ext/uri/tests/whatwg/parsing/scheme_error_special.phpt
@@ -6,7 +6,7 @@ Test Uri\WhatWg\Url parsing - scheme - invalid character
 try {
     new Uri\WhatWg\Url("hÁttp://example.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
similarity index 86%
rename from ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt
rename to ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
index 0c293c6ba545..994a05cdc2be 100644
--- a/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_with_base.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_absolute_url_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - parse() - absolute URL with base URL
+Test Uri\WhatWg\Url::parse() - success - absolute URL with base URL
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
similarity index 84%
rename from ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt
rename to ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
index e6b24b7beab4..b24a335f0369 100644
--- a/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_with_base.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/parse_success_relative_url_with_base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - parse() - relative reference with base URL
+Test Uri\WhatWg\Url::parse() - success - relative-URL with base URL
 --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 15b2a141f2fd..ede2c6705112 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - null byte
+Test Uri\WhatWg\Url::resolve() - error - null byte in host
 --FILE--
 <?php
 
@@ -8,7 +8,7 @@ $url = Uri\WhatWg\Url::parse("https://example.com");
 try {
     $url->resolve("https://ex\0mple.com");
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
index fdcd96ef0b81..6213f32417df 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_error_ipv4_too_many_parts.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - IPv4 with too many parts
+Test Uri\WhatWg\Url::resolve() - error - IPv4 with too many parts
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
index 042b082cda0c..e1ed1cc5f275 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_absolute_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - absolute URL
+Test Uri\WhatWg\Url::resolve() - success - absolute URL
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
similarity index 90%
rename from ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt
rename to ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
index 49713f5e8389..e2660e1db0a5 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warnings.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_invalid_url_unit_warning.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - invalid URL unit warning
+Test Uri\WhatWg\Url::resolve() - success - invalid URL unit warning
 --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 f26b2eb5fa5c..0d7e41a699c6 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,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - null byte in path
+Test Uri\WhatWg\Url::resolve() - success - null byte in path
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
similarity index 87%
rename from ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt
rename to ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
index 3d9fff39692a..306f54ad3d90 100644
--- a/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_reference.phpt
+++ b/ext/uri/tests/whatwg/reference_resolution/resolve_success_relative_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url reference resolution - resolve() - relative reference
+Test Uri\WhatWg\Url::resolve() - success - relative-URL
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/serialization/basic_success.phpt b/ext/uri/tests/whatwg/serialization/basic_success.phpt
index b5b224797193..2c31521bc327 100644
--- a/ext/uri/tests/whatwg/serialization/basic_success.phpt
+++ b/ext/uri/tests/whatwg/serialization/basic_success.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test Uri\WhatWg\Url serialization and unserialization
+Test Uri\WhatWg\Url serialization and unserialization - success
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
index 6de1d9d17562..5cb3b14a7663 100644
--- a/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
+++ b/ext/uri/tests/whatwg/serialization/unserialize_error_legacy_format.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GH-22046: Uri\WhatWg\Url cannot be unserialized with the unsupported C format
+Test Uri\WhatWg\Url unserialize() - error - unsupported C format
 --FILE--
 <?php
 
diff --git a/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
index 659eabde89a0..7ca93e2d5795 100644
--- a/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
+++ b/ext/uri/tests/zend/internal_api_error_whatwg_invalid_url.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test zend_test_uri_parser() with an invalid Uri\WhatWg\Url
+Test zend_test_uri_parser() - error - invalid Uri\WhatWg\Url
 --EXTENSIONS--
 zend_test
 --FILE--
diff --git a/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt b/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
index 1ad726123b74..52c5eca1eb22 100644
--- a/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
+++ b/ext/uri/tests/zend/internal_api_success_parse_url_parsing.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test the parse_url-based URI parser
+Test zend_test_uri_parser() - success - parse_url-based parser
 --EXTENSIONS--
 zend_test
 --FILE--
diff --git a/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
index 7eec9984dc72..1edbaa32fc30 100644
--- a/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
+++ b/ext/uri/tests/zend/internal_api_success_rfc3986_large_port.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test the handling of large ports for the uri struct
+Test zend_test_uri_parser() - success - large RFC 3986 port
 --EXTENSIONS--
 zend_test
 --FILE--