diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index fa54d7d8ac514..fcc8c4cd1252e 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -3732425,7 +3732425,7 @@ html
 :
 [
 "
-c5fec0f733b77620267488917cf54554c766801f
+b9635c43ce159e1961106b039dce0e3d04fade34
 "
 "
 testharness
@@ -3732637,7 +3732637,7 @@ html
 :
 [
 "
-d099c6f374df5e68dd44bd6fe6115c415e74e91c
+30bdfc96ffaff0277ceca69aad43d82d5ac691b6
 "
 "
 testharness
@@ -3732699,7 +3732699,7 @@ html
 :
 [
 "
-3e1ef3ebcb1f0c15251dd968848b9e6805aa8b90
+771631eca687f2d4abbf7cb9337af4ecded432e4
 "
 "
 testharness
@@ -3732949,7 +3732949,7 @@ html
 :
 [
 "
-8a1e3421b49173a03f55447b13e0fa8991e0114c
+64fcbe6783d68372c9a03a1e732ad7acbfff925f
 "
 "
 testharness
@@ -3733019,7 +3733019,7 @@ html
 :
 [
 "
-2d0c46478ea701ab05824b0f334da16fb42c34b0
+e7897095737650b30287cf4e618f5502d8bf86e2
 "
 "
 testharness
@@ -3733089,7 +3733089,7 @@ html
 :
 [
 "
-a838bc3715b451abf71ab6033da96ac3661a0fcb
+f4245d39d4435d9c00b981d220677ff0e3579106
 "
 "
 testharness
@@ -3733295,7 +3733295,7 @@ html
 :
 [
 "
-7d40adac42aa7984b271d38d08f34bdc57956e81
+3ff8533d6e7c59ea4a2fe98255e140b7b583ef2c
 "
 "
 testharness
@@ -3733365,7 +3733365,7 @@ html
 :
 [
 "
-7a6264e73b6f555b55307d4316b64b685bc4eed8
+eeb61c360f85949479c970652c81532d27e38892
 "
 "
 testharness
@@ -3733435,7 +3733435,7 @@ html
 :
 [
 "
-94a2d523cca2484c1646ea38cc35463104bcdf6a
+6c1e0582aae5a1dc83ea286feebebe69c6e218e8
 "
 "
 testharness
@@ -3734075,7 +3734075,7 @@ html
 :
 [
 "
-56eac9997ca4620ae3f60ac94f4746f16ad69398
+d2cbf81979d2755352b9f007c40a6340b60e74d3
 "
 "
 testharness
@@ -3734149,7 +3734149,7 @@ html
 :
 [
 "
-04b9ba862024429668725770249a13a93118a1ce
+b6b1deba45ea2621747d292443758adfb075e27e
 "
 "
 testharness
@@ -3734223,7 +3734223,7 @@ html
 :
 [
 "
-a10fb4f38065dce550f099b83dee5315b014d9bd
+4cb2e185dedbd21c3632b7a31e883580e71b366f
 "
 "
 testharness
@@ -3734399,7 +3734399,7 @@ html
 :
 [
 "
-c250dd2597bf3e6b66d4bed1484363ee186197e3
+cdc3fe8fc70539fc6415e2d3b43fda6f87d09262
 "
 "
 testharness
@@ -3734473,7 +3734473,7 @@ html
 :
 [
 "
-a54eafaa9c27429edf96650392d288805509f6a5
+19c4224bda8f399f090f3ea4d77c10a0f47513e8
 "
 "
 testharness
@@ -3734547,7 +3734547,7 @@ html
 :
 [
 "
-f4f427e139bf5d92c4982d108315733ce10c091c
+a99791f74775a996f49e4b60a369d5b81d289c0d
 "
 "
 testharness
@@ -3735287,7 +3735287,7 @@ html
 :
 [
 "
-84cd159f998e8e6ad80d0403d0128bd72718e674
+034b3f10660076f877d7e78699cd5103d8c955f7
 "
 "
 testharness
@@ -3735353,7 +3735353,7 @@ html
 :
 [
 "
-125c9ecd59012aa5b4ad6c6dfaa7586d1f6b2593
+abe031cce4bec1c40f37fcff428b874ef3ef1f76
 "
 "
 testharness
@@ -3735419,7 +3735419,7 @@ html
 :
 [
 "
-0099dd77b846ad2771aa278070b85ebf1b577a77
+dcba1f4b6755e55ed5dbfa3d2cff642324aa6c2a
 "
 "
 testharness
@@ -3735927,7 +3735927,7 @@ html
 :
 [
 "
-a5ad64e3cfbd60d2f7df60c3708c66441a0511df
+94990204891a673ed591a05bd4423b8d22a907ac
 "
 "
 testharness
@@ -3735993,7 +3735993,7 @@ html
 :
 [
 "
-c92ed9030f97d8e86fdafdb024fc7d32b0b87861
+e3ef37abf1fb9d6a39f391c4e5a4b376cad808c8
 "
 "
 testharness
@@ -3736059,7 +3736059,7 @@ html
 :
 [
 "
-cb8f12a62af6ea1be459ff8ca1c3e8846a8b9d55
+a1cfb188c286c2f34d95fe2ca180dd577da1d7b5
 "
 "
 testharness
@@ -3737199,7 +3737199,7 @@ html
 :
 [
 "
-ac3af4e3ae4831d6bbb4a10cf20165c8c6f6f0c0
+f9710ba55e4f6781f14f7b292c767cf87fc40090
 "
 "
 testharness
@@ -3737305,7 +3737305,7 @@ html
 :
 [
 "
-ac75e0cdb92edcec4ccbcea4e4d45329305fd4be
+936dedf12d56abe3083061a68b6be806a8cb8503
 "
 "
 testharness
@@ -3737919,7 +3737919,7 @@ html
 :
 [
 "
-ad6ba78bc2ebc5b88b08ac19efe60f6220a1f636
+e855d30690f5aed7043442f233cbb77fc209bca0
 "
 "
 testharness
@@ -3737989,7 +3737989,7 @@ html
 :
 [
 "
-dce0fad843d12c98905f1bb3edbe5343f7849b0c
+f4caa1544f2291f394f58a4835f1fb5962baac14
 "
 "
 testharness
@@ -3739303,7 +3739303,7 @@ html
 :
 [
 "
-158e2df87e89f8d10ac045a8c6d7b1a879c60c05
+7201211915cb8ae3ac0b7f5656c295f3c08b3089
 "
 "
 testharness
@@ -3739369,7 +3739369,7 @@ html
 :
 [
 "
-07fc6c15fc19b39e458670b19efc95d46822a889
+3eb05f9627d84506e9d730b9e26021403963d0f9
 "
 "
 testharness
@@ -3739435,7 +3739435,7 @@ html
 :
 [
 "
-0c4726348095a7b2a2954e4516bfad4b6bf64e59
+d4e49734b115c0bf3f0ab2ddc7a3de4556866e9c
 "
 "
 testharness
@@ -3739501,7 +3739501,7 @@ html
 :
 [
 "
-9835733d78de331c1ad9297572b321265a6a03c9
+b24f67557b5e6ef966484b4c0b6b1c90a69b24ee
 "
 "
 testharness
@@ -3739567,7 +3739567,7 @@ html
 :
 [
 "
-65056fd448b1783a93866c6dfe4f0f84ecc65058
+f4ce13cd0e392452ce160d0b688315ef039e2e56
 "
 "
 testharness
@@ -3739633,7 +3739633,7 @@ html
 :
 [
 "
-836a669b04de5ba3a3c3c429ea7d89b67d6f58b4
+4e83b4a9d2695780b0ad87ac8519f36b83778ee6
 "
 "
 testharness
@@ -3739793,7 +3739793,7 @@ html
 :
 [
 "
-b0f2f3bd2bad4eb4b2979bf8c11105f6c0a42dd8
+90cbc57fb49501ff276c2198235f0d5c2d5561eb
 "
 "
 testharness
@@ -3739859,7 +3739859,7 @@ html
 :
 [
 "
-c6850b7f03fbfd76bfc156593d7e75887799baa4
+2ec76262a6bc1a789999fd51b394a66a878bc6bf
 "
 "
 testharness
@@ -3739925,7 +3739925,7 @@ html
 :
 [
 "
-493dd0361da6e0ce711e05e90fd3a40125be5ba3
+ba76ce0d3d04f97074c712ce6b11a7d6b523fb33
 "
 "
 testharness
@@ -3826423,7 +3826423,7 @@ html
 :
 [
 "
-bc42ced67ad1368f3cf459dd113b131c69aaba78
+34aa7e5a7d4daba412fa700859913cf9def77565
 "
 "
 testharness
@@ -3826581,7 +3826581,7 @@ js
 :
 [
 "
-70fd863f8335a2026d5755cf2ba7a01d98222ec0
+03fc73b64f0fd6f80bbb5616da4a4528162638ee
 "
 "
 support
@@ -4149577,7 +4149577,7 @@ md
 :
 [
 "
-67bbc49a62ee08a94b7b55fff97e1160bf88bc33
+c617345fc667ed52a8e97027d121001d7a9edae0
 "
 "
 support
@@ -4213206,7 +4213206,7 @@ htm
 :
 [
 "
-a36c7b0e5919af7842883582ef9fc415d8f7ef25
+ba2438440413dd999906c9055b3ccb0ab6988a74
 "
 "
 testharness
diff --git a/testing/web-platform/tests/encoding/big5-encoder.html b/testing/web-platform/tests/encoding/big5-encoder.html
index b9ac1ae2b9373..2a66987877b1d 100644
--- a/testing/web-platform/tests/encoding/big5-encoder.html
+++ b/testing/web-platform/tests/encoding/big5-encoder.html
@@ -206,10 +206,12 @@
 u9EA6
 "
 "
-&
+%
+26
 %
 2340614
-;
+%
+3B
 "
 "
 Highest
@@ -232,10 +234,12 @@
 uDE6B
 "
 "
-&
+%
+26
 %
 23156267
-;
+%
+3B
 "
 "
 Highest
@@ -417,10 +421,12 @@
 u2603
 "
 "
-&
+%
+26
 %
 239731
-;
+%
+3B
 "
 "
 The
@@ -446,10 +452,12 @@
 uDCA9
 "
 "
-&
+%
+26
 %
 23128169
-;
+%
+3B
 "
 "
 The
diff --git a/testing/web-platform/tests/encoding/gbk-encoder.html b/testing/web-platform/tests/encoding/gbk-encoder.html
index 7fea176e1dbb5..64bfcb47aa9f2 100644
--- a/testing/web-platform/tests/encoding/gbk-encoder.html
+++ b/testing/web-platform/tests/encoding/gbk-encoder.html
@@ -238,10 +238,12 @@
 udca9
 "
 "
-&
+%
+26
 %
 23128169
-;
+%
+3B
 "
 "
 poo
diff --git a/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html b/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html
index bc65b2a79b31b..1b4fd55c92dd2 100644
--- a/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html
+++ b/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html
@@ -245,6 +245,27 @@
 ESC
 "
 )
+encode
+(
+"
+\
+uFFFD
+"
+"
+%
+26
+%
+2365533
+%
+3B
+"
+"
+U
++
+FFFD
+"
+)
+;
 <
 /
 script
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
index c9fd89ac31b29..877021bc2493a 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
@@ -1320,15 +1320,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1339,7 +1334,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
index 3d2d2177984d6..e6f10fad4fc74 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
@@ -1065,15 +1065,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1084,7 +1079,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
index b855bad022a27..e7addca831758 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
@@ -1406,15 +1406,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1425,7 +1420,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
index 10a21772d171b..59fc4b1994b1c 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
@@ -338,15 +338,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
index deaffced92dfa..63c02cbd27972 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
@@ -338,15 +338,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
index 6750b1ad71e3a..ac3b8b2074c3d 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
@@ -338,15 +338,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
index 1b3d5d14bd690..94def9f8a850c 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
@@ -1335,15 +1335,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1354,7 +1349,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
index a7d1fd622d761..90f6b838a07e9 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
@@ -1080,15 +1080,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1099,7 +1094,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
index 4321093e935fc..32e0909b5ce1e 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
@@ -1421,15 +1421,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1440,7 +1435,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
index c62acfca64fe7..307043131c605 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
@@ -345,15 +345,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
index 9f3f1a74fea3b..abfb09fb870ab 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
@@ -345,15 +345,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
index acc8c60ca5b82..18a58a4fc9f6b 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
@@ -345,15 +345,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
index 82665dda5bbd8..ac4e24ec34bc3 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
@@ -1308,15 +1308,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1327,7 +1322,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
index 1f144502fec41..f2abe617f53b6 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
@@ -1056,15 +1056,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1075,7 +1070,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
index 54d092fb4abf2..0e99c2a9946e1 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
@@ -1397,15 +1397,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1416,7 +1411,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
index 8f629923f1c0a..80f84a16d28ff 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
@@ -331,15 +331,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
index da3e230c682b5..5ad74434ca6b4 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
@@ -330,15 +330,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
index 4ebd0f8e6e8a3..63db931b30c5d 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
@@ -330,15 +330,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
index 706d3be7c3fa0..36bcfe5ff2062 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
@@ -1320,15 +1320,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1339,7 +1334,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
index 8b5bda5928ab3..2950eef13bb9e 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
@@ -1406,15 +1406,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1425,7 +1420,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
index 778fa872cd5be..7f150927d78d3 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
@@ -338,15 +338,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
index 079a30c6ae282..cf32265bc44b5 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
@@ -338,15 +338,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
index ead5adbff605a..90f19c4c5a6c8 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
@@ -1066,15 +1066,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1085,7 +1080,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
index ca5921abdb2df..389e70e9be6f2 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
@@ -1066,15 +1066,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1085,7 +1080,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
index 1acb627050be8..af588716a6777 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
@@ -1392,15 +1392,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1411,7 +1406,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
index 0eb63314e9dd8..1d1635f214c62 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
@@ -1056,15 +1056,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1075,7 +1070,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
index 4c5cacfd80319..f79ff4a8dfa4d 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
@@ -1397,15 +1397,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1416,7 +1411,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
index 5d9358cdbc8a5..a3e7b9c76a389 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
@@ -1058,15 +1058,10 @@
 {
 assert_equals
 (
-normalizeStr
-(
 results
 [
 j
 ]
-)
-normalizeStr
-(
 cplist
 [
 i
@@ -1077,7 +1072,6 @@
 .
 expected
 )
-)
 ;
 }
 )
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
index 735d16c00bd99..205c36256608a 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
@@ -330,15 +330,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
index e18b4c2e49e09..63fa893a5ebb1 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
@@ -330,15 +330,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
index 9f3dcf99fcee6..79d7132bca543 100644
--- a/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
+++ b/testing/web-platform/tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
@@ -330,15 +330,9 @@
 "
 assert_equals
 (
-normalizeStr
-(
 result
-)
-normalizeStr
-(
 expected
 )
-)
 ;
 }
 desc
diff --git a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
index 12096c7297f23..646f4d5f83ad0 100644
--- a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
+++ b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
@@ -141,10 +141,12 @@
 "
 :
 "
-&
+%
+26
 %
 23255
-;
+%
+3B
 "
 "
 windows
diff --git a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index 2743616a0bec6..f73c3b4e5fd74 100644
--- a/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -275,10 +275,12 @@ windows
 '
 :
 '
-&
+%
+26
 %
 23229
-;
+%
+3B
 '
 }
 ;
diff --git a/testing/web-platform/tests/url/README.md b/testing/web-platform/tests/url/README.md
index 31fd5e0173dfa..6abf0785082b1 100644
--- a/testing/web-platform/tests/url/README.md
+++ b/testing/web-platform/tests/url/README.md
@@ -1,3 +1,8 @@
+#
+#
+urltestdata
+.
+json
 These
 tests
 are
@@ -290,6 +295,43 @@ cannot
 be
 parsed
 .
+#
+#
+URL
+parser
+'
+s
+encoding
+argument
+Tests
+in
+/
+encoding
+and
+/
+html
+/
+infrastructure
+/
+urls
+/
+resolving
+-
+urls
+/
+query
+-
+encoding
+/
+cover
+the
+encoding
+argument
+to
+the
+URL
+parser
+.
 [
 parsing
 ]
diff --git a/testing/web-platform/tests/xhr/open-url-encoding.htm b/testing/web-platform/tests/xhr/open-url-encoding.htm
index 003a140a1df5b..1673b1a77dd91 100644
--- a/testing/web-platform/tests/xhr/open-url-encoding.htm
+++ b/testing/web-platform/tests/xhr/open-url-encoding.htm
@@ -67,72 +67,6 @@
 script
 >
 <
-link
-rel
-=
-"
-help
-"
-href
-=
-"
-https
-:
-/
-/
-xhr
-.
-spec
-.
-whatwg
-.
-org
-/
-#
-the
--
-open
-(
-)
--
-method
-"
-data
--
-tested
--
-assertations
-=
-"
-following
-:
-:
-ol
-/
-li
-[
-7
-]
-following
-:
-:
-ol
-/
-li
-[
-14
-]
-/
-ul
-/
-li
-[
-2
-]
-"
-/
->
-<
 /
 head
 >
@@ -280,12 +214,15 @@
 "
 )
 "
-&
+%
+26
 %
 2365533
-;
+%
+3B
 "
 )
+;
 }
 "
 lone