diff --git a/Cargo.lock b/Cargo.lock
index 958304b2906..fab3ceb8e28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6116,9 +6116,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
+checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 dependencies = [
  "idna",
  "matches",
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
new file mode 100644
index 00000000000..1acda0fafa5
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
@@ -0,0 +1,5 @@
+[location-protocol-setter-non-broken-weird.html]
+  type: testharness
+  [Set location.protocol to x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index b95a9339bc0..6b846a6dc05 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -6,3 +6,14 @@
   [Set data URL frame location.protocol to file]
     expected: FAIL
 
+  [Set HTTP URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to file]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to http+x]
+    expected: FAIL
\ No newline at end of file
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
index 327544a548f..b014cf7652d 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
@@ -1,62 +1,5 @@
 [location-protocol-setter.html]
   type: testharness
-  [%00x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%01x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%0Ax (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%20x (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%EF%BF%BD%EF%BF%BD%EF%BF%BDx (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%00X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%01X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%0AX (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [%20X (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%00 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%01 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [x%20 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%00 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%01 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [X%20 (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [a%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
-  [a+-.%0A (percent-encoded) is not a scheme]
-    expected: FAIL
-
   [Equivalent tests for data URL and srcdoc <iframe>s]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location_hash.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location_hash.html.ini
deleted file mode 100644
index d4ee703a53d..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location_hash.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[location_hash.html]
-  type: testharness
-  [Setting hash which is partially encoded should only encode incompatible characters]
-    expected: FAIL
-
-  [Setting hash should encode incompatible characters]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
index cbad3735a97..ba5373c7d02 100644
--- a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
@@ -1,101 +1,5 @@
 [a-element-xhtml.xhtml]
   type: testharness
-  [Parsing: <foo://> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <sc://@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://te@s:t@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:12/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <sc://?> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://#> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <////> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <////x/> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\?fox> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\#guppy> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://spider///> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\localhost//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://\\/localhost//cat> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://localhost//a//../..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </////mouse> against <file:///elephant>]
-    expected: FAIL
-
-  [Parsing: <\\/localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: <//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </..//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </rooibos> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: </?chai> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: <C|> against <file://host/dir/file>]
-    expected: FAIL
-
-  [Parsing: </c:/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: </c|/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: <file:\\c:\\foo\\bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
   [Parsing: <test-a.html> against <a>]
     expected: FAIL
 
@@ -105,51 +9,6 @@
   [Parsing: <test-a-slash-slash.html> against <a//>]
     expected: FAIL
 
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <lolscheme:x x#x x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo"bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo<bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo>bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo`bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
   [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/a-element.html.ini b/tests/wpt/metadata/url/a-element.html.ini
index 37070520a11..31a9dac5f17 100644
--- a/tests/wpt/metadata/url/a-element.html.ini
+++ b/tests/wpt/metadata/url/a-element.html.ini
@@ -1,101 +1,5 @@
 [a-element.html]
   type: testharness
-  [Parsing: <foo://> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <sc://@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://te@s:t@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:12/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <sc://?> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://#> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <////> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <////x/> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\?fox> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\#guppy> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://spider///> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\localhost//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://\\/localhost//cat> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://localhost//a//../..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </////mouse> against <file:///elephant>]
-    expected: FAIL
-
-  [Parsing: <\\/localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: <//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </..//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </rooibos> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: </?chai> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: <C|> against <file://host/dir/file>]
-    expected: FAIL
-
-  [Parsing: </c:/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: </c|/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: <file:\\c:\\foo\\bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
   [Parsing: <test-a.html> against <a>]
     expected: FAIL
 
@@ -105,51 +9,6 @@
   [Parsing: <test-a-slash-slash.html> against <a//>]
     expected: FAIL
 
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <lolscheme:x x#x x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo"bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo<bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo>bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo`bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
   [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/failure.html.ini b/tests/wpt/metadata/url/failure.html.ini
index b54dca88127..8fd4773f308 100644
--- a/tests/wpt/metadata/url/failure.html.ini
+++ b/tests/wpt/metadata/url/failure.html.ini
@@ -51,33 +51,6 @@
   [window.open(): http:/@:www.example.com should throw]
     expected: FAIL
 
-  [URL's constructor's base argument: sc://@/ should throw]
-    expected: FAIL
-
-  [URL's href: sc://@/ should throw]
-    expected: FAIL
-
-  [XHR: sc://@/ should throw]
-    expected: FAIL
-
-  [Location's href: sc://@/ should throw]
-    expected: FAIL
-
-  [window.open(): sc://@/ should throw]
-    expected: FAIL
-
-  [URL's constructor's base argument: sc://te@s:t@/ should throw]
-    expected: FAIL
-
-  [URL's href: sc://te@s:t@/ should throw]
-    expected: FAIL
-
-  [XHR: sc://te@s:t@/ should throw]
-    expected: FAIL
-
-  [Location's href: sc://te@s:t@/ should throw]
-    expected: FAIL
-
   [Location's href: http:/:@/www.example.com should throw]
     expected: FAIL
 
@@ -111,39 +84,6 @@
   [Location's href: a// should throw]
     expected: FAIL
 
-  [window.open(): sc://te@s:t@/ should throw]
-    expected: FAIL
-
-  [URL's constructor's base argument: sc://:/ should throw]
-    expected: FAIL
-
-  [URL's href: sc://:/ should throw]
-    expected: FAIL
-
-  [XHR: sc://:/ should throw]
-    expected: FAIL
-
-  [Location's href: sc://:/ should throw]
-    expected: FAIL
-
-  [window.open(): sc://:/ should throw]
-    expected: FAIL
-
-  [URL's constructor's base argument: sc://:12/ should throw]
-    expected: FAIL
-
-  [URL's href: sc://:12/ should throw]
-    expected: FAIL
-
-  [XHR: sc://:12/ should throw]
-    expected: FAIL
-
-  [Location's href: sc://:12/ should throw]
-    expected: FAIL
-
-  [window.open(): sc://:12/ should throw]
-    expected: FAIL
-
   [XHR: a should throw]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini
index d30f5a08615..35befb1dd17 100644
--- a/tests/wpt/metadata/url/url-constructor.html.ini
+++ b/tests/wpt/metadata/url/url-constructor.html.ini
@@ -1,146 +1,5 @@
 [url-constructor.html]
   type: testharness
-  [Parsing: <foo://> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <sc://@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://te@s:t@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://:12/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <sc://?> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://#> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <////> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <////x/> against <sc://x/>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\?fox> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\\\\\#guppy> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://spider///> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:\\\\localhost//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://\\/localhost//cat> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file://localhost//a//../..//> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: </////mouse> against <file:///elephant>]
-    expected: FAIL
-
-  [Parsing: <\\/localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: <//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </..//localhost//pig> against <file://lion/>]
-    expected: FAIL
-
-  [Parsing: </rooibos> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: </?chai> against <file://tea/>]
-    expected: FAIL
-
-  [Parsing: <C|> against <file://host/dir/file>]
-    expected: FAIL
-
-  [Parsing: </c:/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: </c|/foo/bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: <file:\\c:\\foo\\bar> against <file:///c:/baz/qux>]
-    expected: FAIL
-
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <lolscheme:x x#x x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo"bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo<bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo>bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo.bar/baz?qux#foo`bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ?x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <?x> against <sc://ñ>]
-    expected: FAIL
-
-  [Parsing: <#x> against <sc://ñ>]
-    expected: FAIL
-
   [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/url-setters-stripping.any.js.ini b/tests/wpt/metadata/url/url-setters-stripping.any.js.ini
index ae1ba2692bb..53fd0219a47 100644
--- a/tests/wpt/metadata/url/url-setters-stripping.any.js.ini
+++ b/tests/wpt/metadata/url/url-setters-stripping.any.js.ini
@@ -1,43 +1,10 @@
 [url-setters-stripping.any.html]
-  [Setting pathname with leading U+001F (https:)]
-    expected: FAIL
-
   [Setting protocol with U+0000 before inserted colon (https:)]
     expected: FAIL
 
-  [Setting pathname with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting search with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting hash with trailing U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting protocol with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting host with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting pathname with trailing U+001F (https:)]
     expected: FAIL
 
@@ -47,36 +14,15 @@
   [Setting pathname with trailing U+001F (wpt++:)]
     expected: FAIL
 
-  [Setting hash with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting protocol with leading U+0000 (https:)]
     expected: FAIL
 
-  [Setting host with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with leading U+0000 (wpt++:)]
-    expected: FAIL
-
   [Setting hash with trailing U+0000 (https:)]
     expected: FAIL
 
   [Setting hash with middle U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting hash with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+001F (https:)]
-    expected: FAIL
-
   [Setting hash with leading U+0000 (wpt++:)]
     expected: FAIL
 
@@ -86,21 +32,9 @@
   [Setting protocol with U+001F before inserted colon (wpt++:)]
     expected: FAIL
 
-  [Setting hostname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with trailing U+001F (https:)]
-    expected: FAIL
-
   [Setting pathname with trailing U+0000 (https:)]
     expected: FAIL
 
-  [Setting pathname with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
@@ -113,12 +47,6 @@
   [Setting pathname with trailing U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting hostname with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting hash with trailing U+0000 (wpt++:)]
     expected: FAIL
 
@@ -128,80 +56,23 @@
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
-  [Setting hash with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting search with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+001F (https:)]
     expected: FAIL
 
   [Setting hash with middle U+0000 (https:)]
     expected: FAIL
 
-  [Setting host with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting host with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+001F (wpt++:)]
     expected: FAIL
 
 
 [url-setters-stripping.any.worker.html]
-  [Setting pathname with leading U+001F (https:)]
-    expected: FAIL
-
   [Setting protocol with U+0000 before inserted colon (https:)]
     expected: FAIL
 
-  [Setting pathname with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting search with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting hash with trailing U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting protocol with leading U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting host with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting pathname with trailing U+001F (https:)]
     expected: FAIL
 
@@ -211,36 +82,15 @@
   [Setting pathname with trailing U+001F (wpt++:)]
     expected: FAIL
 
-  [Setting hash with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting search with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting protocol with leading U+0000 (https:)]
     expected: FAIL
 
-  [Setting host with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting pathname with leading U+0000 (wpt++:)]
-    expected: FAIL
-
   [Setting hash with trailing U+0000 (https:)]
     expected: FAIL
 
   [Setting hash with middle U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting hash with leading U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+001F (https:)]
-    expected: FAIL
-
   [Setting hash with leading U+0000 (wpt++:)]
     expected: FAIL
 
@@ -250,21 +100,9 @@
   [Setting protocol with U+001F before inserted colon (wpt++:)]
     expected: FAIL
 
-  [Setting hostname with trailing U+001F (https:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with trailing U+001F (https:)]
-    expected: FAIL
-
   [Setting pathname with trailing U+0000 (https:)]
     expected: FAIL
 
-  [Setting pathname with leading U+0000 (https:)]
-    expected: FAIL
-
   [Setting port with leading U+0000 (wpt++:)]
     expected: FAIL
 
@@ -277,12 +115,6 @@
   [Setting pathname with trailing U+0000 (wpt++:)]
     expected: FAIL
 
-  [Setting hostname with leading U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting hash with trailing U+0000 (wpt++:)]
     expected: FAIL
 
@@ -292,36 +124,12 @@
   [Setting port with leading U+0000 (https:)]
     expected: FAIL
 
-  [Setting hash with leading U+001F (https:)]
-    expected: FAIL
-
-  [Setting search with trailing U+0000 (https:)]
-    expected: FAIL
-
-  [Setting host with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting search with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with trailing U+0000 (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+001F (https:)]
     expected: FAIL
 
   [Setting hash with middle U+0000 (https:)]
     expected: FAIL
 
-  [Setting host with leading U+0000 (wpt++:)]
-    expected: FAIL
-
-  [Setting host with trailing U+001F (wpt++:)]
-    expected: FAIL
-
-  [Setting hostname with leading U+001F (wpt++:)]
-    expected: FAIL
-
   [Setting port with leading U+001F (wpt++:)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
index f84f6d2cfc4..0484f8770e1 100644
--- a/tests/wpt/metadata/url/url-setters.html.ini
+++ b/tests/wpt/metadata/url/url-setters.html.ini
@@ -135,12 +135,6 @@
   [<area>: Setting <http://example.net:8080>.host = 'example.com' Port number is unchanged if not specified in the new value]
     expected: FAIL
 
-  [URL: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified]
-    expected: FAIL
-
-  [<a>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified]
-    expected: FAIL
-
   [<area>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified]
     expected: FAIL
 
@@ -315,12 +309,6 @@
   [<area>: Setting <view-source+http://example.net/home?lang=fr#nav>.pathname = '\\a\\%2E\\b\\%2e.\\c' \\ is *not* a segment delimiter for non-'special' URLs]
     expected: FAIL
 
-  [URL: Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
-  [<a>: Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
   [<area>: Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
     expected: FAIL
 
@@ -354,12 +342,6 @@
   [<area>: Setting <https://example.net>.search = '']
     expected: FAIL
 
-  [URL: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
-  [<a>: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
   [<area>: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
     expected: FAIL
 
@@ -405,93 +387,15 @@
   [<area>: Setting <a:/>.hash = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' Simple percent-encoding; nuls, tabs, and newlines are removed]
     expected: FAIL
 
-  [URL: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged.]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged.]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'b']
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'b']
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = '0b' No leading digit]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = '0b' No leading digit]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = '+b' No leading punctuation]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = '+b' No leading punctuation]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'bC0+-.']
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'bC0+-.']
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable]
-    expected: FAIL
-
-  [URL: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected]
-    expected: FAIL
-
-  [URL: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
     expected: FAIL
 
-  [URL: Setting <https://example.net>.protocol = 's']
-    expected: FAIL
-
-  [<a>: Setting <https://example.net>.protocol = 's']
-    expected: FAIL
-
   [<area>: Setting <https://example.net>.protocol = 's']
     expected: FAIL
 
-  [URL: Setting <ftp://example.net>.protocol = 'test']
-    expected: FAIL
-
-  [<a>: Setting <ftp://example.net>.protocol = 'test']
-    expected: FAIL
-
   [<area>: Setting <ftp://example.net>.protocol = 'test']
     expected: FAIL
 
-  [URL: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
-    expected: FAIL
-
-  [<a>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
-    expected: FAIL
-
   [<area>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
     expected: FAIL
 
@@ -504,30 +408,12 @@
   [<area>: Setting <ssh://me@example.net>.protocol = 'gopher']
     expected: FAIL
 
-  [URL: Setting <ssh://me@example.net>.protocol = 'file']
-    expected: FAIL
-
-  [<a>: Setting <ssh://me@example.net>.protocol = 'file']
-    expected: FAIL
-
   [<area>: Setting <ssh://me@example.net>.protocol = 'file']
     expected: FAIL
 
-  [URL: Setting <nonsense:///test>.protocol = 'https']
-    expected: FAIL
-
-  [<a>: Setting <nonsense:///test>.protocol = 'https']
-    expected: FAIL
-
   [<area>: Setting <nonsense:///test>.protocol = 'https']
     expected: FAIL
 
-  [URL: Setting <sc://x/>.host = '\x00' Non-special scheme]
-    expected: FAIL
-
-  [<a>: Setting <sc://x/>.host = '\x00' Non-special scheme]
-    expected: FAIL
-
   [<area>: Setting <sc://x/>.host = '\x00' Non-special scheme]
     expected: FAIL
 
@@ -540,12 +426,6 @@
   [<area>: Setting <sc://x/>.host = '\r']
     expected: FAIL
 
-  [URL: Setting <sc://x/>.host = ' ']
-    expected: FAIL
-
-  [<a>: Setting <sc://x/>.host = ' ']
-    expected: FAIL
-
   [<area>: Setting <sc://x/>.host = ' ']
     expected: FAIL
 
@@ -579,12 +459,6 @@
   [<area>: Setting <http://example.net/>.host = '[::1.\]']
     expected: FAIL
 
-  [URL: Setting <sc://x/>.hostname = '\x00' Non-special scheme]
-    expected: FAIL
-
-  [<a>: Setting <sc://x/>.hostname = '\x00' Non-special scheme]
-    expected: FAIL
-
   [<area>: Setting <sc://x/>.hostname = '\x00' Non-special scheme]
     expected: FAIL
 
@@ -597,12 +471,6 @@
   [<area>: Setting <sc://x/>.hostname = '\r']
     expected: FAIL
 
-  [URL: Setting <sc://x/>.hostname = ' ']
-    expected: FAIL
-
-  [<a>: Setting <sc://x/>.hostname = ' ']
-    expected: FAIL
-
   [<area>: Setting <sc://x/>.hostname = ' ']
     expected: FAIL
 
@@ -666,87 +534,33 @@
   [<area>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing]
     expected: FAIL
 
-  [URL: Setting <file://y/>.host = 'x:123']
-    expected: FAIL
-
-  [<a>: Setting <file://y/>.host = 'x:123']
-    expected: FAIL
-
   [<area>: Setting <file://y/>.host = 'x:123']
     expected: FAIL
 
-  [URL: Setting <file://y/>.host = 'loc%41lhost']
-    expected: FAIL
-
   [<area>: Setting <file://y/>.host = 'loc%41lhost']
     expected: FAIL
 
-  [URL: Setting <file://hi/x>.host = '']
-    expected: FAIL
-
-  [<a>: Setting <file://hi/x>.host = '']
-    expected: FAIL
-
   [<area>: Setting <file://hi/x>.host = '']
     expected: FAIL
 
-  [URL: Setting <sc://test@test/>.host = '']
-    expected: FAIL
-
-  [<a>: Setting <sc://test@test/>.host = '']
-    expected: FAIL
-
   [<area>: Setting <sc://test@test/>.host = '']
     expected: FAIL
 
-  [URL: Setting <sc://test:12/>.host = '']
-    expected: FAIL
-
-  [<a>: Setting <sc://test:12/>.host = '']
-    expected: FAIL
-
   [<area>: Setting <sc://test:12/>.host = '']
     expected: FAIL
 
-  [URL: Setting <file://y/>.hostname = 'x:123']
-    expected: FAIL
-
-  [<a>: Setting <file://y/>.hostname = 'x:123']
-    expected: FAIL
-
   [<area>: Setting <file://y/>.hostname = 'x:123']
     expected: FAIL
 
-  [URL: Setting <file://y/>.hostname = 'loc%41lhost']
-    expected: FAIL
-
   [<area>: Setting <file://y/>.hostname = 'loc%41lhost']
     expected: FAIL
 
-  [URL: Setting <file://hi/x>.hostname = '']
-    expected: FAIL
-
-  [<a>: Setting <file://hi/x>.hostname = '']
-    expected: FAIL
-
   [<area>: Setting <file://hi/x>.hostname = '']
     expected: FAIL
 
-  [URL: Setting <sc://test@test/>.hostname = '']
-    expected: FAIL
-
-  [<a>: Setting <sc://test@test/>.hostname = '']
-    expected: FAIL
-
   [<area>: Setting <sc://test@test/>.hostname = '']
     expected: FAIL
 
-  [URL: Setting <sc://test:12/>.hostname = '']
-    expected: FAIL
-
-  [<a>: Setting <sc://test:12/>.hostname = '']
-    expected: FAIL
-
   [<area>: Setting <sc://test:12/>.hostname = '']
     expected: FAIL
 
@@ -768,12 +582,6 @@
   [<area>: Setting <javascript:alert(1)>.protocol = 'defuse']
     expected: FAIL
 
-  [URL: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
-    expected: FAIL
-
-  [<a>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
-    expected: FAIL
-
   [<area>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
     expected: FAIL
 
@@ -786,12 +594,6 @@
   [<area>: Setting <gopher://example.net:1234>.protocol = 'file']
     expected: FAIL
 
-  [URL: Setting <wss://x:x@example.net:1234>.protocol = 'file']
-    expected: FAIL
-
-  [<a>: Setting <wss://x:x@example.net:1234>.protocol = 'file']
-    expected: FAIL
-
   [<area>: Setting <wss://x:x@example.net:1234>.protocol = 'file']
     expected: FAIL
 
@@ -804,21 +606,9 @@
   [<area>: Setting <file:>.protocol = 'wss']
     expected: FAIL
 
-  [URL: Setting <file://hi/path>.protocol = 's']
-    expected: FAIL
-
-  [<a>: Setting <file://hi/path>.protocol = 's']
-    expected: FAIL
-
   [<area>: Setting <file://hi/path>.protocol = 's']
     expected: FAIL
 
-  [URL: Setting <ssh://example.net>.protocol = 'file']
-    expected: FAIL
-
-  [<a>: Setting <ssh://example.net>.protocol = 'file']
-    expected: FAIL
-
   [<area>: Setting <ssh://example.net>.protocol = 'file']
     expected: FAIL
 
@@ -837,90 +627,36 @@
   [<area>: Setting <javascript://x/>.port = '12']
     expected: FAIL
 
-  [URL: Setting <file://monkey/>.pathname = '\\\\' File URLs and (back)slashes]
-    expected: FAIL
-
-  [<a>: Setting <file://monkey/>.pathname = '\\\\' File URLs and (back)slashes]
-    expected: FAIL
-
   [<area>: Setting <file://monkey/>.pathname = '\\\\' File URLs and (back)slashes]
     expected: FAIL
 
-  [URL: Setting <file:///unicorn>.pathname = '//\\/' File URLs and (back)slashes]
-    expected: FAIL
-
-  [<a>: Setting <file:///unicorn>.pathname = '//\\/' File URLs and (back)slashes]
-    expected: FAIL
-
   [<area>: Setting <file:///unicorn>.pathname = '//\\/' File URLs and (back)slashes]
     expected: FAIL
 
-  [URL: Setting <file:///unicorn>.pathname = '//monkey/..//' File URLs and (back)slashes]
-    expected: FAIL
-
-  [<a>: Setting <file:///unicorn>.pathname = '//monkey/..//' File URLs and (back)slashes]
-    expected: FAIL
-
   [<area>: Setting <file:///unicorn>.pathname = '//monkey/..//' File URLs and (back)slashes]
     expected: FAIL
 
-  [URL: Setting <javascript:alert(1)>.hash = 'castle']
-    expected: FAIL
-
   [<a>: Setting <javascript:alert(1)>.hash = 'castle']
     expected: FAIL
 
   [<area>: Setting <javascript:alert(1)>.hash = 'castle']
     expected: FAIL
 
-  [URL: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme.]
-    expected: FAIL
-
   [<area>: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme.]
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '#foo bar']
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '#foo bar']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.hash = '#foo bar']
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '#foo"bar']
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '#foo"bar']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.hash = '#foo"bar']
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '#foo<bar']
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '#foo<bar']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.hash = '#foo<bar']
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '#foo>bar']
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '#foo>bar']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.hash = '#foo>bar']
     expected: FAIL
 
-  [URL: Setting <http://example.net>.hash = '#foo`bar']
-    expected: FAIL
-
-  [<a>: Setting <http://example.net>.hash = '#foo`bar']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.hash = '#foo`bar']
     expected: FAIL
 
@@ -930,18 +666,9 @@
   [URL: Setting <a:/>.hash = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' Simple percent-encoding; nuls, tabs, and newlines are removed]
     expected: FAIL
 
-  [<a>: Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
-  [<a>: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
   [<area>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing]
     expected: FAIL
 
-  [URL: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
     expected: FAIL
 
@@ -969,15 +696,6 @@
   [<a>: Setting <a:/>.hash = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' Simple percent-encoding; nuls, tabs, and newlines are removed]
     expected: FAIL
 
-  [<a>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
-    expected: FAIL
-
-  [<a>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
-    expected: FAIL
-
-  [URL: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
-    expected: FAIL
-
   [<area>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
     expected: FAIL
 
@@ -987,54 +705,30 @@
   [<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.]
     expected: FAIL
 
-  [URL: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file]
-    expected: FAIL
-
-  [<a>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected]
-    expected: FAIL
-
   [<area>: Setting <sc://x/>.host = 'ß']
     expected: FAIL
 
-  [URL: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.username = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the userinfo encode set.]
     expected: FAIL
 
-  [URL: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected]
-    expected: FAIL
-
   [<area>: Setting <a:/>.search = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed.]
     expected: FAIL
 
-  [URL: Setting <a:/>.pathname = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed.]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.pathname = '%2e%2E%c3%89té' Bytes already percent-encoded are left as-is, including %2E outside dotted segments.]
     expected: FAIL
 
   [<area>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is]
     expected: FAIL
 
-  [<a>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.search = '%c3%89té' Bytes already percent-encoded are left as-is]
     expected: FAIL
 
-  [URL: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected]
-    expected: FAIL
-
   [<area>: Setting <a:/>.hash = '\x00\x01\t\n\r\x1f !"#$%&'()*+,-./09:;<=>?@AZ[\\\]^_`az{|}~€Éé' Simple percent-encoding; nuls, tabs, and newlines are removed]
     expected: FAIL
 
   [<area>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special]
     expected: FAIL
 
-  [<a>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected]
-    expected: FAIL
-
   [<area>: Setting <data:text/plain,Stuff>.host = 'example.net' Cannot-be-a-base means no host]
     expected: FAIL
 
@@ -1044,12 +738,6 @@
   [<area>: Setting <ssh://me@example.net>.protocol = 'https']
     expected: FAIL
 
-  [<a>: Setting <ssh://me@example.net>.protocol = 'https']
-    expected: FAIL
-
-  [URL: Setting <ssh://me@example.net>.protocol = 'https']
-    expected: FAIL
-
   [<area>: Setting <http://example.net>.host = '[2001:db8::2\]:4002' IPv6 literal address with port, crbug.com/1012416]
     expected: FAIL