diff --git a/Cargo.lock b/Cargo.lock
index a4db04da3e1..1edbe7bac9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2839,9 +2839,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -6481,11 +6481,10 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.4"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 dependencies = [
- "matches",
  "serde",
 ]
 
@@ -6497,9 +6496,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.17"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
@@ -6546,9 +6545,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
  "form_urlencoded",
  "idna",
diff --git a/Cargo.toml b/Cargo.toml
index c263b1e01cb..bbd96cff120 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,7 +81,7 @@ tokio-rustls = "0.24"
 tungstenite = "0.19"
 unicode-bidi = "0.3.4"
 unicode-script = "0.5"
-url = "2.0"
+url = "2.4"
 uuid = { version = "1.4.1", features = ["v4"] }
 webdriver = "0.48.0"
 webpki-roots = "0.23"
diff --git a/tests/wpt/meta-legacy-layout/url/a-element-xhtml.xhtml.ini b/tests/wpt/meta-legacy-layout/url/a-element-xhtml.xhtml.ini
index 5a9850dbfa3..1ec8a0251d3 100644
--- a/tests/wpt/meta-legacy-layout/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/meta-legacy-layout/url/a-element-xhtml.xhtml.ini
@@ -268,42 +268,6 @@
 
 
 [a-element-xhtml.xhtml?exclude=(file|javascript|mailto)]
-  [Parsing: <non-spec:/.//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
 
 [a-element-xhtml.xhtml?include=javascript]
 
diff --git a/tests/wpt/meta-legacy-layout/url/a-element.html.ini b/tests/wpt/meta-legacy-layout/url/a-element.html.ini
index 8d592f2d26c..0ee1045ae03 100644
--- a/tests/wpt/meta-legacy-layout/url/a-element.html.ini
+++ b/tests/wpt/meta-legacy-layout/url/a-element.html.ini
@@ -272,38 +272,3 @@
 
 
 [a-element.html?exclude=(file|javascript|mailto)]
-  [Parsing: <non-spec:/.//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/url/url-constructor.any.js.ini b/tests/wpt/meta-legacy-layout/url/url-constructor.any.js.ini
index eaf3130a21b..6c6d48bd1e7 100644
--- a/tests/wpt/meta-legacy-layout/url/url-constructor.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/url/url-constructor.any.js.ini
@@ -583,24 +583,6 @@
   [Parsing: <non-spec:/a/..//path> against <about:blank>]
     expected: FAIL
 
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
   [Parsing: <file:\\\\//> without base]
     expected: FAIL
 
@@ -649,24 +631,6 @@
   [Parsing: <file:/.//p> without base]
     expected: FAIL
 
-  [Parsing: <non-spec:/.//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> without base]
-    expected: FAIL
-
 
 [url-constructor.any.html?include=file]
   [Parsing: </> against <file://h/C:/a/b>]
@@ -849,41 +813,5 @@
   [Parsing: <non-spec:/a/..//path> against <about:blank>]
     expected: FAIL
 
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> without base]
-    expected: FAIL
-
 
 [url-constructor.any.worker.html?include=javascript]
diff --git a/tests/wpt/meta-legacy-layout/url/url-setters-a-area.window.js.ini b/tests/wpt/meta-legacy-layout/url/url-setters-a-area.window.js.ini
index d7aa58ea911..7feb5cc3329 100644
--- a/tests/wpt/meta-legacy-layout/url/url-setters-a-area.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/url/url-setters-a-area.window.js.ini
@@ -1267,15 +1267,9 @@
   [<area>: Setting <sc:original>.pathname = 'new value']
     expected: FAIL
 
-  [<a>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
   [<area>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
     expected: FAIL
 
-  [<a>: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
   [<area>: Setting <sc:/nospace>.pathname = 'space ']
     expected: FAIL
 
@@ -1306,33 +1300,21 @@
   [<area>: Setting <http://test/>.protocol = 'h\n\ntt\tps' Tab and newline are stripped]
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x0c']
     expected: FAIL
 
   [<area>: Setting <http://test/>.protocol = 'https\r']
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https ']
     expected: FAIL
 
   [<area>: Setting <http://test/>.protocol = 'h\r\ntt\tps' Tab and newline are stripped]
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x0e']
     expected: FAIL
 
@@ -1375,15 +1357,9 @@
   [<area>: Setting <https://example.com/>.hostname = 'xn--']
     expected: FAIL
 
-  [<a>: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
     expected: FAIL
 
-  [<a>: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
     expected: FAIL
 
@@ -1399,6 +1375,12 @@
   [<area>: Setting <http://example.net>.hash = '\x00' Trailing C0 control should be encoded]
     expected: FAIL
 
+  [<a>: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [<a>: Setting <sc:space  ?query#fragment>.search = '']
+    expected: FAIL
+
 
 [url-setters-a-area.window.html?include=mailto]
   [<area>: Setting <mailto:me@example.net>.protocol = 'http' Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must.]
diff --git a/tests/wpt/meta-legacy-layout/url/url-setters-stripping.any.js.ini b/tests/wpt/meta-legacy-layout/url/url-setters-stripping.any.js.ini
index fe77d023889..e1f6f4a8b76 100644
--- a/tests/wpt/meta-legacy-layout/url/url-setters-stripping.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/url/url-setters-stripping.any.js.ini
@@ -1,43 +1,7 @@
 [url-setters-stripping.any.html]
-  [Setting protocol with U+0000 before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting protocol with U+0000 before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
@@ -49,45 +13,9 @@
 
 
 [url-setters-stripping.any.worker.html]
-  [Setting protocol with U+0000 before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting protocol with U+0000 before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/url/url-setters.any.js.ini b/tests/wpt/meta-legacy-layout/url/url-setters.any.js.ini
index 4231535936e..c9719df91ee 100644
--- a/tests/wpt/meta-legacy-layout/url/url-setters.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/url/url-setters.any.js.ini
@@ -93,43 +93,22 @@
   [URL: Setting <non-spec:/>.pathname = '//p']
     expected: FAIL
 
-  [URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
-  [URL: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
-  [URL: Setting <data:space ?query>.search = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space ?query>.search = '']
-    expected: FAIL
-
-  [URL: Setting <data:space                                                                                                                                  #fragment>.hash = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space    #fragment>.hash = '']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
   [URL: Setting <http://example.net:8080/path>.port = 'randomstring' Setting port to a string that doesn't parse as a number]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = '']
+    expected: FAIL
+
+  [URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
+    expected: FAIL
+
+  [URL: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [URL: Setting <sc:space  ?query#fragment>.search = '']
     expected: FAIL
 
 
@@ -185,41 +164,20 @@
   [URL: Setting <non-spec:/>.pathname = '//p']
     expected: FAIL
 
-  [URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
-  [URL: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
-  [URL: Setting <data:space ?query>.search = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space ?query>.search = '']
-    expected: FAIL
-
-  [URL: Setting <data:space                                                                                                                                  #fragment>.hash = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space    #fragment>.hash = '']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
   [URL: Setting <http://example.net:8080/path>.port = 'randomstring' Setting port to a string that doesn't parse as a number]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = '']
+    expected: FAIL
+
+  [URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
+    expected: FAIL
+
+  [URL: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [URL: Setting <sc:space  ?query#fragment>.search = '']
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/url/urlsearchparams-delete.any.js.ini b/tests/wpt/meta-legacy-layout/url/urlsearchparams-delete.any.js.ini
index baa982aa8ae..f6cf733e35d 100644
--- a/tests/wpt/meta-legacy-layout/url/urlsearchparams-delete.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/url/urlsearchparams-delete.any.js.ini
@@ -1,8 +1,8 @@
 [urlsearchparams-delete.any.worker.html]
-  [Changing the query of a URL with an opaque path can impact the path]
+  [Changing the query of a URL with an opaque path can impact the path if the URL has no fragment]
     expected: FAIL
 
 
 [urlsearchparams-delete.any.html]
-  [Changing the query of a URL with an opaque path can impact the path]
+  [Changing the query of a URL with an opaque path can impact the path if the URL has no fragment]
     expected: FAIL
diff --git a/tests/wpt/meta/url/a-element-xhtml.xhtml.ini b/tests/wpt/meta/url/a-element-xhtml.xhtml.ini
index 9e94e0e3050..30dc6c65851 100644
--- a/tests/wpt/meta/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/meta/url/a-element-xhtml.xhtml.ini
@@ -542,41 +542,5 @@
 
 
 [a-element-xhtml.xhtml?exclude=(file|javascript|mailto)]
-  [Parsing: <non-spec:/.//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
 
 [a-element-xhtml.xhtml?include=mailto]
diff --git a/tests/wpt/meta/url/a-element.html.ini b/tests/wpt/meta/url/a-element.html.ini
index 1c0274a0ef8..9b14591f695 100644
--- a/tests/wpt/meta/url/a-element.html.ini
+++ b/tests/wpt/meta/url/a-element.html.ini
@@ -544,38 +544,3 @@
 [a-element.html?include=javascript]
 
 [a-element.html?exclude=(file|javascript|mailto)]
-  [Parsing: <non-spec:/.//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
diff --git a/tests/wpt/meta/url/url-constructor.any.js.ini b/tests/wpt/meta/url/url-constructor.any.js.ini
index bdda0349de0..1a5c84ba528 100644
--- a/tests/wpt/meta/url/url-constructor.any.js.ini
+++ b/tests/wpt/meta/url/url-constructor.any.js.ini
@@ -881,42 +881,6 @@
   [Parsing: <non-spec:/a/..//path> against <about:blank>]
     expected: FAIL
 
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> without base]
-    expected: FAIL
-
 
 [url-constructor.any.worker.html?include=file]
   [Parsing: </> against <file://h/C:/a/b>]
@@ -1203,24 +1167,6 @@
   [Parsing: <non-spec:/a/..//path> against <about:blank>]
     expected: FAIL
 
-  [Parsing: </.//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: </..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <a/..//path> against <non-spec:/p>]
-    expected: FAIL
-
-  [Parsing: <> against <non-spec:/..//p>]
-    expected: FAIL
-
-  [Parsing: <path> against <non-spec:/..//p>]
-    expected: FAIL
-
   [Parsing: <file:\\\\//> without base]
     expected: FAIL
 
@@ -1269,24 +1215,6 @@
   [Parsing: <file:/.//p> without base]
     expected: FAIL
 
-  [Parsing: <non-spec:/.//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/.//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/..//path> without base]
-    expected: FAIL
-
-  [Parsing: <non-spec:/a/..//path> without base]
-    expected: FAIL
-
 
 [url-constructor.any.html?include=file]
   [Parsing: </> against <file://h/C:/a/b>]
diff --git a/tests/wpt/meta/url/url-setters-a-area.window.js.ini b/tests/wpt/meta/url/url-setters-a-area.window.js.ini
index ce44801dd11..5179ff004b1 100644
--- a/tests/wpt/meta/url/url-setters-a-area.window.js.ini
+++ b/tests/wpt/meta/url/url-setters-a-area.window.js.ini
@@ -704,15 +704,9 @@
   [<area>: Setting <sc:original>.pathname = 'new value']
     expected: FAIL
 
-  [<a>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
   [<area>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
     expected: FAIL
 
-  [<a>: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
   [<area>: Setting <sc:/nospace>.pathname = 'space ']
     expected: FAIL
 
@@ -746,27 +740,15 @@
   [<area>: Setting <http://test/>.protocol = 'https\r']
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x0c']
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https\x0e']
     expected: FAIL
 
-  [<a>: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
   [<area>: Setting <http://test/>.protocol = 'https ']
     expected: FAIL
 
@@ -809,15 +791,9 @@
   [<area>: Setting <https://www.google.com:4343>.port = '4wpt' Should use all ascii prefixed characters as port]
     expected: FAIL
 
-  [<a>: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
     expected: FAIL
 
-  [<a>: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
     expected: FAIL
 
@@ -832,3 +808,9 @@
 
   [<area>: Setting <http://example.net>.hash = '\x00' Trailing C0 control should be encoded]
     expected: FAIL
+
+  [<a>: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [<a>: Setting <sc:space  ?query#fragment>.search = '']
+    expected: FAIL
diff --git a/tests/wpt/meta/url/url-setters-stripping.any.js.ini b/tests/wpt/meta/url/url-setters-stripping.any.js.ini
index fe77d023889..e1f6f4a8b76 100644
--- a/tests/wpt/meta/url/url-setters-stripping.any.js.ini
+++ b/tests/wpt/meta/url/url-setters-stripping.any.js.ini
@@ -1,43 +1,7 @@
 [url-setters-stripping.any.html]
-  [Setting protocol with U+0000 before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting protocol with U+0000 before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
@@ -49,45 +13,9 @@
 
 
 [url-setters-stripping.any.worker.html]
-  [Setting protocol with U+0000 before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting protocol with U+0000 before inserted colon (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with U+001F before inserted colon (https:)]
-    expected: FAIL
-
-  [Setting pathname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting protocol with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
diff --git a/tests/wpt/meta/url/url-setters.any.js.ini b/tests/wpt/meta/url/url-setters.any.js.ini
index 9529af02188..6ae0d31e0bf 100644
--- a/tests/wpt/meta/url/url-setters.any.js.ini
+++ b/tests/wpt/meta/url/url-setters.any.js.ini
@@ -26,43 +26,22 @@
   [URL: Setting <non-spec:/>.pathname = '//p']
     expected: FAIL
 
-  [URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
-  [URL: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
-  [URL: Setting <data:space ?query>.search = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space ?query>.search = '']
-    expected: FAIL
-
-  [URL: Setting <data:space                                                                                                                                  #fragment>.hash = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space    #fragment>.hash = '']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
   [URL: Setting <http://example.net:8080/path>.port = 'randomstring' Setting port to a string that doesn't parse as a number]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = '']
+    expected: FAIL
+
+  [URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
+    expected: FAIL
+
+  [URL: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [URL: Setting <sc:space  ?query#fragment>.search = '']
     expected: FAIL
 
 
@@ -114,43 +93,22 @@
   [URL: Setting <non-spec:/>.pathname = '//p']
     expected: FAIL
 
-  [URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
-    expected: FAIL
-
-  [URL: Setting <sc:/nospace>.pathname = 'space ']
-    expected: FAIL
-
-  [URL: Setting <data:space ?query>.search = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space ?query>.search = '']
-    expected: FAIL
-
-  [URL: Setting <data:space                                                                                                                                  #fragment>.hash = '' Drop trailing spaces from trailing opaque paths]
-    expected: FAIL
-
-  [URL: Setting <sc:space    #fragment>.hash = '']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x00' Non-tab/newline C0 controls result in no-op]
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0c']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https\x0e']
-    expected: FAIL
-
-  [URL: Setting <http://test/>.protocol = 'https ']
-    expected: FAIL
-
   [URL: Setting <http://example.net:8080/path>.port = 'randomstring' Setting port to a string that doesn't parse as a number]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = ' ' Trailing space should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.pathname = '\x00' Trailing C0 control should be encoded]
+  [URL: Setting <non-spec:/.//p>.hostname = '']
+    expected: FAIL
+
+  [URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
+    expected: FAIL
+
+  [URL: Setting <data:space  ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
+    expected: FAIL
+
+  [URL: Setting <sc:space  ?query#fragment>.search = '']
     expected: FAIL
 
 
diff --git a/tests/wpt/meta/url/urlsearchparams-delete.any.js.ini b/tests/wpt/meta/url/urlsearchparams-delete.any.js.ini
index baa982aa8ae..f6cf733e35d 100644
--- a/tests/wpt/meta/url/urlsearchparams-delete.any.js.ini
+++ b/tests/wpt/meta/url/urlsearchparams-delete.any.js.ini
@@ -1,8 +1,8 @@
 [urlsearchparams-delete.any.worker.html]
-  [Changing the query of a URL with an opaque path can impact the path]
+  [Changing the query of a URL with an opaque path can impact the path if the URL has no fragment]
     expected: FAIL
 
 
 [urlsearchparams-delete.any.html]
-  [Changing the query of a URL with an opaque path can impact the path]
+  [Changing the query of a URL with an opaque path can impact the path if the URL has no fragment]
     expected: FAIL