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 32d1f1f314eb5..585016eae9ff8 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
@@ -9,7 +9,7 @@
   [
     'x',
     'data',
-    // 'mailto' opens an email client in Firefox...
+    // 'mailto' opens an email client in Chrome and Firefox and then ends up passing anyway...
     'file',
     'ftp',
     'http+x'
@@ -17,6 +17,7 @@
     async_test((t) => {
       // HTTP URL <iframe>
       const frame = document.createElement("iframe")
+      t.add_cleanup(() => frame.remove())
       frame.src = "/common/blank.html"
       frame.onload = t.step_func(() => {
         frame.contentWindow.location.protocol = val
@@ -25,7 +26,9 @@
           assert_equals(frame.contentWindow.location.host, location.host)
           assert_equals(frame.contentWindow.location.port, location.port)
           t.done()
-        }, 500)
+          // Matches the timeout from location-protocol-setter-non-broken-weird.html which suggests
+          // that 4 seconds is enough for a navigation to complete.
+        }, 4000)
       })
       document.body.appendChild(frame)
     }, "Set HTTP URL frame location.protocol to " + val)
@@ -33,6 +36,7 @@
     async_test((t) => {
       // data URL <iframe>
       const dataFrame = document.createElement("iframe")
+      t.add_cleanup(() => dataFrame.remove())
       const channel = new MessageChannel()
       dataFrame.src = `data:text/html,<script>
 onmessage = (e) => {
@@ -42,7 +46,7 @@
   } catch(e) {
     result = true
   }
-  setTimeout(() => e.ports[0].postMessage([result, location.protocol]), 100)
+  setTimeout(() => e.ports[0].postMessage([result, location.protocol]), 4000)
 }
 <\/script>`
       dataFrame.onload = t.step_func(() => {
diff --git a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html
new file mode 100644
index 0000000000000..c581ae35aae9a
--- /dev/null
+++ b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter-sameish.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<title>Set location.protocol to the scheme it already was</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<iframe src=/common/blank.html></iframe>
+<iframe src=/common/blank.html></iframe>
+<iframe src=/common/blank.html></iframe>
+<iframe src=/common/blank.html></iframe>
+<script>
+self.onload = () => {
+  [
+    "http",
+    "ht\x0Atp",
+    "http\x0A",
+    "\x09ht\x09\x0AtP"
+  ].forEach((val, index) => {
+    async_test(t => {
+      self[index].frameElement.onload = t.step_func_done(() => {
+        assert_equals(self[index].location.protocol, "http:");
+      });
+      self[index].location.protocol = val;
+    }, `Set location.protocol to ${encodeURI(val)} (percent-encoded here for clarity)`);
+  });
+}
+</script>
diff --git a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter.html b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter.html
index da6859b19ffe8..3d051e8cfb47d 100644
--- a/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter.html
+++ b/testing/web-platform/tests/html/browsers/history/the-location-interface/location-protocol-setter.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<title>Set location.protocol to broken schemes</title>
+<title>Set location.protocol to schemes that throw</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
@@ -32,14 +32,13 @@
 }
 </script>"></iframe>
 <script>
-  // Tests with '\x0A' (i.e., '\n') don't conform to the URL Standard as of the
-  // time of writing, as according to spec they should be ignored.
-  // See https://github.com/whatwg/url/issues/609.
-
-  let broken = [
+  const broken = [
     '\x00',
     '\x01',
-    '\x0A',
+    '\x09', // becomes the empty string
+    '\x0A', // becomes the empty string
+    '\x0C',
+    '\x0D',
     '\x20',
     '\x21',
     '\x7F',
@@ -49,7 +48,6 @@
     '†',
     '\x00x',
     '\x01x',
-    '\x0Ax',
     '\x20x',
     '\x21x',
     '\x7Fx',
@@ -59,7 +57,6 @@
     '†x',
     '\x00X',
     '\x01X',
-    '\x0AX',
     '\x20X',
     '\x21X',
     '\x7FX',
@@ -69,7 +66,6 @@
     '†X',
     'x\x00',
     'x\x01',
-    'x\x0A',
     'x\x20',
     'x\x21',
     'x\x7F',
@@ -78,20 +74,18 @@
     'x†',
     'X\x00',
     'X\x01',
-    'X\x0A',
     'X\x20',
     'X\x21',
     'X\x7F',
     'X\x80',
     'X\xFF',
     'X†',
-    'a\x0A',
-    'a+-.\x0A'
-  ]
-  ;broken.forEach((val) => {
+  ];
+
+  broken.forEach(val => {
     test(() => {
       assert_throws_dom("SyntaxError", () => { location.protocol = val })
-    }, encodeURI(val) + " (percent-encoded) is not a scheme")
+    }, `${encodeURI(val)} (percent-encoded here for clarity) is not a scheme`)
   })
   let c = 0
   async_test((t) => {
diff --git a/testing/web-platform/tests/url/resources/setters_tests.json b/testing/web-platform/tests/url/resources/setters_tests.json
index cff93d83ba2f8..df75ab57c420d 100644
--- a/testing/web-platform/tests/url/resources/setters_tests.json
+++ b/testing/web-platform/tests/url/resources/setters_tests.json
@@ -269,6 +269,49 @@
                 "protocol": "https:",
                 "port": ""
             }
+        },
+        {
+            "comment": "Tab and newline are stripped",
+            "href": "http://test/",
+            "new_value": "h\u000A\u000Att\u0009ps",
+            "expected": {
+              "href": "https://test/",
+              "protocol": "https:",
+              "port": ""
+            }
+        },
+        {
+            "comment": "Non-tab/newline C0 controls result in no-op",
+            "href": "http://test/",
+            "new_value": "https\u0000",
+            "expected": {
+              "href": "http://test/",
+              "protocol": "http:"
+            }
+        },
+        {
+            "href": "http://test/",
+            "new_value": "https\u000C",
+            "expected": {
+              "href": "http://test/",
+              "protocol": "http:"
+            }
+        },
+        {
+            "href": "http://test/",
+            "new_value": "https\u000D",
+            "expected": {
+              "href": "http://test/",
+              "protocol": "http:"
+            }
+        },
+        {
+            "href": "http://test/",
+            "new_value": "https\u0020",
+            "expected": {
+              "href": "http://test/",
+              "protocol": "http:"
+            }
         }
     ],
     "username": [
