diff --git a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html
index 0fef946227e04..4dc406bb7529c 100644
--- a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html
+++ b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html
@@ -174,9 +174,6 @@
 ftp
 '
 '
-gopher
-'
-'
 http
 +
 x
diff --git a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html
index a2428596680d3..1afbf663dd25e 100644
--- a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html
+++ b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html
@@ -104,9 +104,6 @@
 ftp
 '
 '
-gopher
-'
-'
 http
 +
 x
diff --git a/testing/web-platform/tests/url/failure.html b/testing/web-platform/tests/url/failure.html
index d9009cb24afa8..97fab74b01dd0 100644
--- a/testing/web-platform/tests/url/failure.html
+++ b/testing/web-platform/tests/url/failure.html
@@ -24,6 +24,15 @@
 title
 >
 <
+meta
+name
+=
+timeout
+content
+=
+long
+>
+<
 script
 src
 =
diff --git a/testing/web-platform/tests/url/resources/urltestdata.json b/testing/web-platform/tests/url/resources/urltestdata.json
index da59dc4407f79..bb6559cf1b7ee 100644
--- a/testing/web-platform/tests/url/resources/urltestdata.json
+++ b/testing/web-platform/tests/url/resources/urltestdata.json
@@ -9010,7 +9010,6 @@ href
 gopher
 :
 /
-/
 example
 .
 com
@@ -9021,13 +9020,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-example
-.
-com
+null
 "
 "
 protocol
@@ -9054,18 +9047,12 @@ host
 "
 :
 "
-example
-.
-com
 "
 "
 hostname
 "
 :
 "
-example
-.
-com
 "
 "
 port
@@ -9079,6 +9066,10 @@ pathname
 :
 "
 /
+example
+.
+com
+/
 "
 "
 search
@@ -10308,8 +10299,6 @@ href
 "
 gopher
 :
-/
-/
 example
 .
 com
@@ -10320,13 +10309,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-example
-.
-com
+null
 "
 "
 protocol
@@ -10353,18 +10336,12 @@ host
 "
 :
 "
-example
-.
-com
 "
 "
 hostname
 "
 :
 "
-example
-.
-com
 "
 "
 port
@@ -10377,6 +10354,9 @@ pathname
 "
 :
 "
+example
+.
+com
 /
 "
 "
@@ -20791,6 +20771,8 @@ gopher
 /
 /
 foo
+:
+70
 /
 "
 "
@@ -20798,11 +20780,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-foo
+null
 "
 "
 protocol
@@ -20830,6 +20808,8 @@ host
 :
 "
 foo
+:
+70
 "
 "
 hostname
@@ -20843,6 +20823,7 @@ port
 "
 :
 "
+70
 "
 "
 pathname
@@ -20907,13 +20888,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-foo
-:
-443
+null
 "
 "
 protocol
@@ -22559,7 +22534,6 @@ href
 gopher
 :
 /
-/
 example
 .
 com
@@ -22570,13 +22544,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-example
-.
-com
+null
 "
 "
 protocol
@@ -22603,18 +22571,12 @@ host
 "
 :
 "
-example
-.
-com
 "
 "
 hostname
 "
 :
 "
-example
-.
-com
 "
 "
 port
@@ -22628,6 +22590,10 @@ pathname
 :
 "
 /
+example
+.
+com
+/
 "
 "
 search
@@ -23757,8 +23723,6 @@ href
 "
 gopher
 :
-/
-/
 example
 .
 com
@@ -23769,13 +23733,7 @@ origin
 "
 :
 "
-gopher
-:
-/
-/
-example
-.
-com
+null
 "
 "
 protocol
@@ -23802,18 +23760,12 @@ host
 "
 :
 "
-example
-.
-com
 "
 "
 hostname
 "
 :
 "
-example
-.
-com
 "
 "
 port
@@ -23826,6 +23778,9 @@ pathname
 "
 :
 "
+example
+.
+com
 /
 "
 "