diff --git a/test/fixtures/wpt/url/WEB_FEATURES.yml b/test/fixtures/wpt/url/WEB_FEATURES.yml
index b7a784695aa0cd..a39c0594f47dab 100644
--- a/test/fixtures/wpt/url/WEB_FEATURES.yml
+++ b/test/fixtures/wpt/url/WEB_FEATURES.yml
@@ -1,11 +1,4 @@
-features:
-- name: url
-  files:
-  - "*"
-  - "!url-statics-canparse.*"
-- name: url-canparse
-  files:
-  - url-statics-canparse.*
-- name: base
-  files:
-  - a-element*
+rules:
+- url-statics-canparse.*: [url-canparse]
+- a-element*: [base, url]
+- "*": [url]
diff --git a/test/fixtures/wpt/url/resources/setters_tests.json b/test/fixtures/wpt/url/resources/setters_tests.json
index 0a151f91862a90..221e77a951bbca 100644
--- a/test/fixtures/wpt/url/resources/setters_tests.json
+++ b/test/fixtures/wpt/url/resources/setters_tests.json
@@ -1900,6 +1900,7 @@
             "href": "https://domain.com:443",
             "new_value": "\u00098080",
             "expected": {
+                "href": "https://domain.com:8080/",
                 "port": "8080"
             }
         },
@@ -1908,6 +1909,7 @@
             "href": "wpt++://domain.com:443",
             "new_value": "\u00098080",
             "expected": {
+                "href": "wpt++://domain.com:8080",
                 "port": "8080"
             }
         },
@@ -1916,6 +1918,7 @@
             "href": "https://www.google.com:4343",
             "new_value": "4wpt",
             "expected": {
+                "href": "https://www.google.com:4/",
                 "port": "4"
             }
         },
@@ -1923,6 +1926,7 @@
             "href": "https://domain.com:3000",
             "new_value": "\n\t80\n\t80\n\t",
             "expected": {
+                "href": "https://domain.com:8080/",
                 "port": "8080"
             }
         },
@@ -1930,6 +1934,7 @@
             "href": "https://domain.com:3000",
             "new_value": "\n\n\t\t",
             "expected": {
+                "href": "https://domain.com:3000/",
                 "port": "3000"
             }
         }
diff --git a/test/fixtures/wpt/url/resources/urltestdata.json b/test/fixtures/wpt/url/resources/urltestdata.json
index c8d6ffe22bffe2..c4807f9e2cfca3 100644
--- a/test/fixtures/wpt/url/resources/urltestdata.json
+++ b/test/fixtures/wpt/url/resources/urltestdata.json
@@ -4373,6 +4373,52 @@
     "search": "",
     "hash": ""
   },
+  "Astral code point followed by a trailing character in the userinfo",
+  {
+    "input": "http://😀x@host/",
+    "base": null,
+    "href": "http://%F0%9F%98%80x@host/",
+    "origin": "http://host",
+    "protocol": "http:",
+    "username": "%F0%9F%98%80x",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://a:😀x@host/",
+    "base": null,
+    "href": "http://a:%F0%9F%98%80x@host/",
+    "origin": "http://host",
+    "protocol": "http:",
+    "username": "a",
+    "password": "%F0%9F%98%80x",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "http://😀@host/",
+    "base": null,
+    "href": "http://%F0%9F%98%80@host/",
+    "origin": "http://host",
+    "protocol": "http:",
+    "username": "%F0%9F%98%80",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
   {
     "input": "https://localhost?q=🔥",
     "base": null,
diff --git a/test/fixtures/wpt/versions.json b/test/fixtures/wpt/versions.json
index ef4ac92ba8b375..32b9537ffca903 100644
--- a/test/fixtures/wpt/versions.json
+++ b/test/fixtures/wpt/versions.json
@@ -72,7 +72,7 @@
     "path": "streams"
   },
   "url": {
-    "commit": "b63305b743ed9ce2725d4ae09c5c8f0c40d8e6e1",
+    "commit": "4832db47614f5f48cc57374cbf5c1f70937fad48",
     "path": "url"
   },
   "urlpattern": {