diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-animations/animation-base-response-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-animations/animation-base-response-004.html.ini
new file mode 100644
index 00000000000..6e98c32bc87
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-animations/animation-base-response-004.html.ini
@@ -0,0 +1,4 @@
+[animation-base-response-004.html]
+  [Base is responsive to font-affecting appearing via setKeyframes]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/custom-element-reaction-queue.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/custom-element-reaction-queue.html.ini
new file mode 100644
index 00000000000..bd5d04c5256
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/custom-element-reaction-queue.html.ini
@@ -0,0 +1,4 @@
+[custom-element-reaction-queue.html]
+  [Upgrading a custom element must not invoke attributeChangedCallback for the attribute that is changed during upgrading]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 1dfe13d8870..16e4765293e 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,9 +315,18 @@
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 2d5faa72ac7..ac4cbcba706 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 2023a855086..a63e414f43a 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index c9d963b55d2..af14e19a466 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,7 +7,7 @@
     expected: NOTRUN
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Area element should support autofocus]
     expected: NOTRUN
@@ -16,5 +16,5 @@
     expected: NOTRUN
 
   [Non-HTMLElement should not support autofocus]
-    expected: TIMEOUT
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 0218bc9ba9d..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 7d2b5231af2..f4f994c5d6f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini
new file mode 100644
index 00000000000..2c4a51d2910
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini
@@ -0,0 +1,4 @@
+[currentSrc-blob-cache.html]
+  [currentSrc is right even if underlying image is a shared blob]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index da6575fdae8..762254139e4 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -80,3 +80,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44054 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 18538.\n\t[18538\]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44051 more errors.\n\tMax AbsError of 1.9999794363975525e+0 at index of 19632.\n\t[19632\]\t9.9997943639755249e-1\t-1.0000000000000000e+0\t1.9999794363975525e+0\t1.9999794363975525e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 7e05d1788d4..6c35c286437 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -134,3 +134,9 @@
   [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t-1.1377083450655894e+22\t5.6332010030746460e-1\t1.1377083450655894e+22\t2.0196480552435802e+22\t9.0957000000000003e-5\n\t[31081\]\t4.5654303967702540e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.1377083450655894e+22 at index of 31080.\n\tMax RelError of 2.0196480552435802e+22 at index of 31080.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t-1.7359996676420403e+17\t5.6332010030746460e-1\t1.7359996676420403e+17\t3.0817286063368198e+17\t9.0957000000000003e-5\n\t[31081\]\t4.5750993561740953e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.7359996676420403e+17 at index of 31080.\n\tMax RelError of 3.0817286063368198e+17 at index of 31080.\n]
+    expected: FAIL
+
+  [X SNR (-301.35690681171843 dB) is not greater than or equal to 85.58. Got -301.35690681171843.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index eb05c2af50b..655a805eca9 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -114,6 +114,22 @@
        ]
       ]
      },
+     "grid-definition": {
+      "grid-add-item-with-positioned-items-crash.html": [
+       "7b2ed99f223ed4333c265f242b3f043afd9232b6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-add-positioned-block-item-after-inline-item-crash.html": [
+       "4b7aa9913a7cdf7c8156ad33419ca2349905319f",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "subgrid": {
       "contain-strict-nested-subgrid-crash.html": [
        "a98e43777eee9347ba1d69a4b133140cea0577fc",
@@ -318,6 +334,13 @@
        ]
       ]
      },
+     "effect-reference-reset-style-delete-crash.html": [
+      "e1c0eb9aeca3b5e21dfaac85b1ca7d3397f7703e",
+      [
+       null,
+       {}
+      ]
+     ],
      "feimage-circular-reference-foreign-object-crash.html": [
       "00f0e362237ab3fdb856ea648e950608e8c3f06c",
       [
@@ -124999,6 +125022,19 @@
     "css-color-adjust": {
      "rendering": {
       "dark-color-scheme": {
+       "color-scheme-change-checkbox.html": [
+        "ae0dc62b7c8760862fe6c279cec425db0afac474",
+        [
+         null,
+         [
+          [
+           "/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html",
+           "!="
+          ]
+         ],
+         {}
+        ]
+       ],
        "color-scheme-iframe-background-mismatch-alpha.html": [
         "26c58198c46b0ed2b1c6037aa0ca50ea2e059241",
         [
@@ -141728,6 +141764,19 @@
         {}
        ]
       ],
+      "grid-auto-repeat-positioned-container-001.html": [
+       "309ad85671204b52def9309a3147ee031f72948f",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-layout-auto-tracks.html": [
        "2cc3614d9ec60581f01b4e5ff7ffe624d7f3ce11",
        [
@@ -142276,6 +142325,19 @@
         {}
        ]
       ],
+      "grid-item-margins-and-writing-modes-001.html": [
+       "5209940a9699d6a108f815f81eb4d3b4527dcf79",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-item-overflow-auto-max-height-percentage.html": [
        "62273b87e49170853bc14e36ecc3fb7b148ff6ac",
        [
@@ -143355,6 +143417,19 @@
         {}
        ]
       ],
+      "remove-svg-grid-item-001.html": [
+       "5e196c82c64bb52ee5b445b664eb5bc0dbd60573",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/reference/grid-item-script-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "table-with-infinite-max-intrinsic-width.html": [
        "877e982cd4c5987f131587da33a23f3b7a49d538",
        [
@@ -143367,6 +143442,19 @@
         ],
         {}
        ]
+      ],
+      "whitespace-in-grid-item-001.html": [
+       "f79baab6f058faea696b63d4be9fa9894228e17c",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "grid-model": {
@@ -143695,6 +143783,19 @@
         {}
        ]
       ],
+      "grid-floats-no-intrude-002.html": [
+       "9c26e021050597761a8db26c8a0e71429e1323e7",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-inline-first-letter-001.html": [
        "bc62c1770d2ba46644aed25b26d3955d6745d0ea",
        [
@@ -143877,6 +143978,19 @@
         {}
        ]
       ],
+      "grid-margins-no-collapse-002.html": [
+       "f644a6fb53c970f723019e2cc0399f63585f0509",
+       [
+        null,
+        [
+         [
+          "/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "grid-multicol-001.html": [
        "553a33e6a3417557bc6fdb1f34375c4117a2e04f",
        [
@@ -148806,6 +148920,19 @@
         {}
        ]
       ],
+      "clip-path-descendant-text-mutated-001.html": [
+       "e41dacc0b54f3f1936d23b3fb6204f394395db37",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-element-userSpaceOnUse-001.html": [
        "1381f53cb0c0aefc82a91a232b712d18be625b97",
        [
@@ -176900,7 +177027,7 @@
       ]
      ],
      "text-underline-position-from-font-variable.html": [
-      "0459a2ea1d48edca515b4d14add39ffa82a4469b",
+      "dc7ede0cd1f60a21fa19bdada52fee03f1cce272",
       [
        null,
        [
@@ -234651,6 +234778,19 @@
       ]
      ],
      "reftests": {
+      "display-none-mask.html": [
+       "5a746c9fdaec71c5c530e393aaa1f641f55c89b8",
+       [
+        null,
+        [
+         [
+          "/svg/painting/reftests/display-none-mask-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "marker-path-001.svg": [
        "7fb4adf4277321eb69e50fecb9018c1950aef4ca",
        [
@@ -235645,6 +235785,19 @@
         {}
        ]
       ],
+      "use-adopted-with-external-resource.tentative.svg": [
+       "830d4555e5ada27aabb6f3cb128340646000fba9",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/green-100x100.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "use-external-resource-with-revalidation.tentative.html": [
        "d899165fa9ccef15d893b599ec6a8f4e005bcb36",
        [
@@ -285022,6 +285175,10 @@
      },
      "rendering": {
       "dark-color-scheme": {
+       "color-scheme-change-checkbox-notref.html": [
+        "921482afcdf10cc38d113d0d428e1df43d09dd66",
+        []
+       ],
        "color-scheme-iframe-background-ref.html": [
         "8cc4618ede4af030adc8fe5f119deccf3c2e3882",
         []
@@ -294411,6 +294568,10 @@
        "975c94b795c1c1e53759a5f1e0ec0f6ee1a6889f",
        []
       ],
+      "grid-auto-repeat-positioned-container-001-ref.html": [
+       "a017563aa36082944feb7fe88a50f3dcc8a50358",
+       []
+      ],
       "grid-support-named-grid-lines-002-ref.html": [
        "d65696428c2542c4851207df24e1d3638e6c49af",
        []
@@ -294439,6 +294600,10 @@
       []
      ],
      "grid-items": {
+      "grid-item-margins-and-writing-modes-001-ref.html": [
+       "86553ef6f4077f3c6bc348496e513d7960d7b79f",
+       []
+      ],
       "grid-item-overflow-auto-max-height-percentage-ref.html": [
        "96a3ca1d5032e10e0c4491cc17541084543daab2",
        []
@@ -294504,7 +294669,11 @@
         "f709bf09e5ae6bf48911b69691b0acb5c6f2760e",
         []
        ]
-      }
+      },
+      "whitespace-in-grid-item-001-ref.html": [
+       "1531d98a64f705394d4c09240e6fadd7d69fb87f",
+       []
+      ]
      },
      "grid-model": {
       "grid-container-ignores-first-letter-002-ref.html": [
@@ -294523,6 +294692,14 @@
        "a51134751616fdb1eede6a1774c3edd6571ddc28",
        []
       ],
+      "grid-floats-no-intrude-002-ref.html": [
+       "070980ed27cebf226e21583c64c39e6ac195e8dc",
+       []
+      ],
+      "grid-margins-no-collapse-002-ref.html": [
+       "ce56a5664565796e16f82f71ed1dc6b5a51db7ed",
+       []
+      ],
       "reference": {
        "100x100-grey-box-with-horizontal-scrollbar.html": [
         "ba8335873d254e66cad25c0e61d3b0173edefb16",
@@ -295762,6 +295939,10 @@
         "4337cdf63758c06d261eb42bd0abc595261350c1",
         []
        ],
+       "clip-path-descendant-text-mutated-001-ref.html": [
+        "f718ea6abfbab54333ba674ff0dcd320d8672bcd",
+        []
+       ],
        "clip-path-ellipse-ref.html": [
         "5adc91a5c00f27f0d3225c99a6c2534b5b868a8d",
         []
@@ -302390,7 +302571,7 @@
        []
       ],
       "text-underline-position-from-font-variable-ref.html": [
-       "e621545772d1baa59a8cd37c44d18384551d9d98",
+       "e9e5252194b66f348595b42ae58c0d2c823d422e",
        []
       ]
      },
@@ -309422,6 +309603,10 @@
       "4007ebba43631ad69dafe6cf3dae74481ab219af",
       []
      ],
+     "height-keyword-classes.css": [
+      "2f8477959343b306c4bed7820f0e5a77596f1c0e",
+      []
+     ],
      "import-green.css": [
       "537104e663364492c6ef388e4afce190e9c5bc58",
       []
@@ -309577,7 +309762,7 @@
       []
      ],
      "width-keyword-classes.css": [
-      "b5c84a5d5f4611ffe3570c60ab2f55cf093f8ca8",
+      "138433c11415025d431c9dab37dbcdcd557c6ffa",
       []
      ]
     },
@@ -329634,7 +329819,7 @@
      []
     ],
     "webauthn.idl": [
-     "8dceeb5768b3b31934f126d40bcce70e0209ebca",
+     "34a3df1ce1afbf925fa6166857429e5cd69660a5",
      []
     ],
     "webdriver.idl": [
@@ -338679,6 +338864,10 @@
       []
      ],
      "reftests": {
+      "display-none-mask-ref.html": [
+       "7835597d961a9c9feb0fff92b0f651e164456c12",
+       []
+      ],
       "marker-path-001-ref.svg": [
        "202ac3420dc080f85c4a2cac5e13ccbea6d0235e",
        []
@@ -339009,6 +339198,10 @@
        "etag-max-age-zero-icons.svg.headers": [
         "3f0c26c8feaf58e51ef387c972c2b772166d0fe8",
         []
+       ],
+       "sprites.svg": [
+        "f73b8851913f402aa41adac40360b15acbad1119",
+        []
        ]
       }
      },
@@ -339343,7 +339536,7 @@
       []
      ],
      "jobs.py": [
-      "3d809efa37ccff2c258343b64791762fc507a90f",
+      "a8ae5d237a448bd45f049b446827c8c73244778a",
       []
      ],
      "make_hosts_file.py": [
@@ -339428,7 +339621,7 @@
      },
      "tests": {
       "test_jobs.py": [
-       "94f7998770cf5d8bad36d188dd63e253f98199a8",
+       "3790c04e7b290aac274fa48048439759d4478f81",
        []
       ],
       "test_pr_preview.py": [
@@ -346458,12 +346651,16 @@
     "animation-model": {
      "animation-types": {
       "property-list.js": [
-       "2f91ebc372cadb044282707f6a1a3e3f1fec47f5",
+       "32de670ed3c8f302baa5f156372fbd539485840c",
        []
       ],
       "property-types.js": [
        "dba946d38869f925a990c8889a2eb06d0e2aeb21",
        []
+      ],
+      "property-utils.js": [
+       "d3a7b12a61f94653cb86e84cbbbe0d56efafe4de",
+       []
       ]
      }
     },
@@ -347519,320 +347716,272 @@
      "c7a75d7d221561df02c42470ad5e751324de645d",
      []
     ],
-    "constants.js": [
-     "28771fb0e3e96d273436446e8c254a28c92aebeb",
-     []
-    ],
-    "framework": {
-     "allowed_characters.js": [
-      "af8f45172b52b3cdc6246218c40e5484a7517a63",
+    "common": {
+     "constants.js": [
+      "9d3dd1a32defa22fd3a0cd0e17504cb4727b9622",
       []
      ],
-     "collect_garbage.js": [
-      "dc5a9caf850b967ea0779fee6b7c725376c0bbbb",
-      []
-     ],
-     "fixture.js": [
-      "11b5f405456b4d5e635571b00247cce4e1fc5942",
-      []
-     ],
-     "generate_minimal_query_list.js": [
-      "12311acac0516009516147e2914910176613dd81",
-      []
-     ],
-     "gpu": {
-      "implementation.js": [
-       "653b60ab433c04ae08af73971950d125e209f447",
-       []
-      ]
-     },
-     "id.js": [
-      "cb21a667d6035cbbf1e0a83b01f1460d2c51d927",
-      []
-     ],
-     "index.js": [
-      "c85a681688881226ebfcb5ae431196fe3ecde439",
-      []
-     ],
-     "listing.js": [
-      "856afa99c36ebae161250be0023de7f2947ec8bc",
-      []
-     ],
-     "loader.js": [
-      "328989a8d7b0a9a305953e735cd2eef58a47d8e0",
-      []
-     ],
-     "logger.js": [
-      "b3ddbb6155588bd4d15e081c06f8445313c9ef96",
-      []
-     ],
-     "params": {
-      "combine.js": [
-       "20b2be113525b20d36036fbb5de8dbabefcad6d9",
+     "framework": {
+      "allowed_characters.js": [
+       "af8f45172b52b3cdc6246218c40e5484a7517a63",
        []
       ],
-      "exclude.js": [
-       "23bc6ee0f69fa3d87853881cdf01ab224fcb58b1",
+      "collect_garbage.js": [
+       "dc5a9caf850b967ea0779fee6b7c725376c0bbbb",
        []
       ],
-      "filter.js": [
-       "6a5d99e765f4dc502223502e168b37442d735daa",
+      "fixture.js": [
+       "55f8ec48b22acdd553c093eaba8a568b0d8f1f56",
        []
       ],
-      "index.js": [
-       "de922526696d7921d2ed8139964b85996d811dc1",
+      "generate_minimal_query_list.js": [
+       "f53445457257ce9b01e3fce2270f13aac8786628",
        []
       ],
-      "options.js": [
-       "6906863880ce99d3a29a3c7021ae3859798c34eb",
-       []
-      ]
-     },
-     "test_filter": {
-      "filter_by_group.js": [
-       "b43749f9c5d700d1085b6402a086e38dcc4f2e24",
-       []
-      ],
-      "filter_one_file.js": [
-       "6c634888810bdb817c2228312290fb2394a77f59",
-       []
-      ],
-      "index.js": [
-       "743975e13d687848ba8277cdc0adac4352ad5b9e",
-       []
-      ],
-      "internal.js": [
-       "ae55718f3b3df435310bba1808adb09672b8cc8b",
-       []
-      ],
-      "load_filter.js": [
-       "787747ead06027cb07f42b3485d25e569aa37a47",
-       []
-      ]
-     },
-     "test_group.js": [
-      "643e9f60b3150dd870644888d6898a4d5451b5cc",
-      []
-     ],
-     "tree.js": [
-      "fd7e6704c7602a28b3d28b366a614ac60ce13226",
-      []
-     ],
-     "url_query.js": [
-      "1446bc7f7f74b00b74bba7b22a29c553262b3941",
-      []
-     ],
-     "util": {
-      "async_mutex.js": [
-       "cb900605bcfe77bae785c207419787e317bf1d73",
-       []
-      ],
-      "index.js": [
-       "2cba5f33998f3573db78fcef03c1e3fd535791ef",
-       []
-      ],
-      "stack.js": [
-       "92b9c0e6bbc7e612fdb3742ab4502a1cd28b7f98",
-       []
-      ],
-      "timeout.js": [
-       "e565a518efc045cfc90e7dd7b23dc65604c6b805",
-       []
-      ]
-     },
-     "version.js": [
-      "0b58dd9b3c4430d337b4a6241f2345f4073a12b9",
-      []
-     ]
-    },
-    "runtime": {
-     "helper": {
-      "options.js": [
-       "1a90beadf1ee459911b2b549fc9359b44fe37bbd",
-       []
-      ],
-      "test_worker-worker.js": [
-       "d382f1e80e4dda805aca7e41cb90273cf84147c2",
-       []
-      ],
-      "test_worker.js": [
-       "a67030056f5b8d5ed7665f9e06f9735d0e26b287",
-       []
-      ]
-     },
-     "wpt.js": [
-      "fd02f09471bc656a900714dd586101d6acb28c46",
-      []
-     ]
-    },
-    "suites": {
-     "cts": {
-      "buffers": {
-       "create_mapped.spec.js": [
-        "0231c95dab2681bda7c32db2ea3dee31072ed053",
-        []
-       ],
-       "map.spec.js": [
-        "ecbe7f9c340953d2e39e68d3f7faae5f0e20cc26",
-        []
-       ],
-       "map_detach.spec.js": [
-        "9174efca59c39c7a52b17aecb231211a214bf82f",
-        []
-       ],
-       "map_oom.spec.js": [
-        "24adf67fd6a4898690169a025c455aba8bd4ac6b",
-        []
-       ],
-       "mapping_test.js": [
-        "20d6c96ffa2ded3d25990a578d2109548a6f6966",
+      "gpu": {
+       "implementation.js": [
+        "670872b5d6e32ebf3815935fdd9fec605056a30c",
         []
        ]
       },
-      "canvas": {
-       "context_creation.spec.js": [
-        "a693b002769ae9a1e951bc1888ca49ba393df7d0",
+      "id.js": [
+       "cb21a667d6035cbbf1e0a83b01f1460d2c51d927",
+       []
+      ],
+      "listing.js": [
+       "856afa99c36ebae161250be0023de7f2947ec8bc",
+       []
+      ],
+      "loader.js": [
+       "ac175a5b85f2211a6f11c7b7c435cdc943939605",
+       []
+      ],
+      "logger.js": [
+       "3f624a86e325daaadd1990e1aa11804ea2ab16d2",
+       []
+      ],
+      "params.js": [
+       "f8e46b62dbaf0039903a0496d333de5c84315820",
+       []
+      ],
+      "params_utils.js": [
+       "cde89843f9e67d7f7e01914823fc807df2f40a66",
+       []
+      ],
+      "test_filter": {
+       "filter_by_group.js": [
+        "b43749f9c5d700d1085b6402a086e38dcc4f2e24",
+        []
+       ],
+       "filter_one_file.js": [
+        "cc261ad2ac1c9d54ddc4c8937b75a76756054433",
+        []
+       ],
+       "internal.js": [
+        "ae55718f3b3df435310bba1808adb09672b8cc8b",
+        []
+       ],
+       "load_filter.js": [
+        "2b13d9ed2c9913534108c6286bae2d77ba81ee20",
+        []
+       ],
+       "test_filter_result.js": [
+        "9e32bdbd931b8d348bfb2093b7f0cfab9dd73450",
         []
        ]
       },
-      "capability_info.js": [
-       "10947ee1367e1d943e52a605fe868a06376badbe",
+      "test_group.js": [
+       "8837b1e924a412e8fb706d2f0601b72a7a79a28a",
        []
       ],
-      "command_buffer": {
-       "basic.spec.js": [
-        "6762a563c56edafeb225df6af27bd4507825e56f",
+      "tree.js": [
+       "8f96c98074942127cd7b781778e5a17eb36f1d0d",
+       []
+      ],
+      "url_query.js": [
+       "13671ab7daca794f61efe48d0c5c9bb1369d2a75",
+       []
+      ],
+      "util": {
+       "async_mutex.js": [
+        "cb900605bcfe77bae785c207419787e317bf1d73",
         []
        ],
-       "compute": {
-        "basic.spec.js": [
-         "536f7a9003eded24dced4ebc206c78472b26acb0",
+       "stack.js": [
+        "3d0ec636d853d7b150cf921a931ce2e59963dcbc",
+        []
+       ],
+       "timeout.js": [
+        "e565a518efc045cfc90e7dd7b23dc65604c6b805",
+        []
+       ],
+       "util.js": [
+        "ca64026916c1a7319674daf254c5eeb7df5c7699",
+        []
+       ]
+      },
+      "version.js": [
+       "159b3cf420e59692ad87875ce7d760b5a8c956f8",
+       []
+      ]
+     },
+     "runtime": {
+      "helper": {
+       "options.js": [
+        "1a90beadf1ee459911b2b549fc9359b44fe37bbd",
+        []
+       ],
+       "test_worker-worker.js": [
+        "dd078c313a6287e500c902ee301c310b0c81e81f",
+        []
+       ],
+       "test_worker.js": [
+        "a67030056f5b8d5ed7665f9e06f9735d0e26b287",
+        []
+       ]
+      },
+      "wpt.js": [
+       "fd02f09471bc656a900714dd586101d6acb28c46",
+       []
+      ]
+     }
+    },
+    "webgpu": {
+     "api": {
+      "operation": {
+       "buffers": {
+        "create_mapped.spec.js": [
+         "7b2bc39aa3defbd14c1ad2dfa938ca4df6ee495d",
+         []
+        ],
+        "map.spec.js": [
+         "1c73d62a95ff82ed211a8dc6bf9b74b4c2a41fae",
+         []
+        ],
+        "map_detach.spec.js": [
+         "14d5be5a6311cd4eba637d679c7275be811aafb6",
+         []
+        ],
+        "map_oom.spec.js": [
+         "ee642a5c3b34177b815bbac26228567e25f62e37",
+         []
+        ],
+        "mapping_test.js": [
+         "b7349059035d46dffc1156314c7dfe7ec7526d54",
          []
         ]
        },
-       "copies.spec.js": [
-        "c5bae2ada80e3ac330625966d69564b3b8280726",
-        []
-       ],
-       "render": {
+       "command_buffer": {
         "basic.spec.js": [
-         "46b5c7a27c9bfc7f567de39449673494eb74c2ee",
+         "bc4020bfeb53afcaa19ccf5f155e358886ffbc29",
          []
         ],
-        "rendering.spec.js": [
-         "b26b9fbc859d5b2a5fbf79e9e1ca3f76cb02e455",
+        "copies.spec.js": [
+         "c330415d8511b9a548706b6019e1a6614804d432",
          []
         ],
-        "storeop.spec.js": [
-         "1f758cc5c2ea74d9f2e36f5dd71d321c76cde822",
-         []
-        ]
-       }
-      },
-      "copyImageBitmapToTexture.spec.js": [
-       "42ad8507ec949c55c441cc3c2808ab8d6ebee7e5",
-       []
-      ],
-      "examples.spec.js": [
-       "e57de1bfc8d9cf0c8d2264b77e68b56c6c2659f8",
-       []
-      ],
-      "fences.spec.js": [
-       "af6482fcab508705e884cd205cf31f7b9762990a",
-       []
-      ],
-      "gpu_test.js": [
-       "7ab5320d6e95c8c3914c26db5f0cc7ee7a0b0843",
-       []
-      ],
-      "index.js": [
-       "e566792357a874aa3fb106479179c26c0357c188",
-       []
-      ],
-      "resource_init": {
-       "sampled_texture_clear.spec.js": [
-        "a8fb1ad71d1ef0fa7030dd59a58733ad34fc0841",
+        "render": {
+         "basic.spec.js": [
+          "88710e8aa09287dfd612acf26976406c2576cba5",
+          []
+         ]
+        }
+       },
+       "fences.spec.js": [
+        "386530e08523bdfc9da2a4827d8a04760cab6678",
         []
        ]
       },
       "validation": {
        "createBindGroup.spec.js": [
-        "2f42a8b643d4905a5f15f3abc312e20ce569ecfa",
+        "97683cf75a92d574147a000e29a69b70e7fb97a1",
         []
        ],
        "createBindGroupLayout.spec.js": [
-        "b48db9598dd62fc933e14b08974c3aa4af6fbd63",
+        "b03e01591133aa7fd641b805a598cca328d16157",
         []
        ],
        "createPipelineLayout.spec.js": [
-        "0018c24e54075cf1551af3bbb1cb4d1977386907",
-        []
-       ],
-       "createRenderPipeline.spec.js": [
-        "e4dd32af9e8de43bc29f8bd7ced45638d7a1e6a4",
+        "f1582c4478a2074cbb37b99c32f8e4c5242116d0",
         []
        ],
        "createTexture.spec.js": [
-        "a7317a88f5badd9d65fc881a2a34a8cf652fdee0",
+        "ab4c6f866b4df74315c69f3cb8bfd483540e54ea",
         []
        ],
        "createView.spec.js": [
-        "a4fe7ac2a930ee9bec57528d743f119c8749b6fc",
+        "d23af58387440bf7b5d6953a240110a179e8379d",
         []
        ],
        "error_scope.spec.js": [
-        "6c6cfd73ae03b6fab76829aa820d106f6bbbd03b",
+        "fd69c4e13c0382d95eb2fc5dd535b48b5543c022",
         []
        ],
        "fences.spec.js": [
-        "2bc85261d3dc8107065fd957475ffd412fe071a7",
+        "7747b5e9dc8592dde77167c2696da0582e1573f0",
         []
        ],
        "queue_submit.spec.js": [
-        "410e3c26e82b82637d45a2bb01e136130d82a6aa",
-        []
-       ],
-       "render_pass.spec.js": [
-        "67f7bec6d66977fbb67539897d64ab0506a5f9f5",
+        "dbe0bb4d31ed68eec197d7a556e6f9e097b5eeb5",
         []
        ],
        "render_pass_descriptor.spec.js": [
-        "59caf533e6c3674b82ead7cd1e05048c4de3d308",
+        "7c887a1c0fd112b7d5648edc2698e0376e5f2ae5",
         []
        ],
        "setBindGroup.spec.js": [
-        "73ae4ba502ea31e07fce16dc3b64766e43d53bfa",
+        "baf590746c33c04c9fedd75b11de7873d4eeec91",
         []
        ],
        "setBlendColor.spec.js": [
-        "a04bcd038ee5f0f957772bb52a63563b400fa502",
+        "b8905453ac952131698a5b67d9b3a1f6270c9e83",
         []
        ],
        "setScissorRect.spec.js": [
-        "aec75f536a1dca7c4448b6d901060735e7d86f6c",
+        "e12c90d7cdae1c2271b9b97df8a85816c6e5e5a7",
         []
        ],
        "setStencilReference.spec.js": [
-        "3db37a4908e719212043856b9bdf5e3b31a91065",
-        []
-       ],
-       "setVertexBuffer.spec.js": [
-        "47b861501296fbe517345a54ca7198e237cdf748",
+        "cbd48aeaad532724977752e524dd106c38cd14df",
         []
        ],
        "setViewport.spec.js": [
-        "715a236b18db388750f672d1caabf1466fe46611",
+        "9a3009f38ac020893f78cc5f7ad33defaa93101d",
         []
        ],
        "validation_test.js": [
-        "c275f94a80e5b8477838f4b66e4a1c123de9dbd6",
-        []
-       ],
-       "vertex_state.spec.js": [
-        "103a11265c573e7f2873da5893fb92aedcba14ee",
+        "92d8a0699c4f2c7f1002537c97dd30bf93137b9d",
         []
        ]
       }
+     },
+     "capability_info.js": [
+      "0e336b979f8290152b0ec0e9c7993768106a2fed",
+      []
+     ],
+     "examples.spec.js": [
+      "add23f7250ee70a1f80b7ee1ca2c292e7ae3c0d6",
+      []
+     ],
+     "gpu_test.js": [
+      "0202f34fcf7429a3eb671f786c45efbacae36871",
+      []
+     ],
+     "listing.js": [
+      "5b9ef1afb0184599c0b6f33468356f21677315d5",
+      []
+     ],
+     "web-platform": {
+      "canvas": {
+       "context_creation.spec.js": [
+        "fd8593b642ed84440706ca4b1b29dc4f2e1660d5",
+        []
+       ]
+      },
+      "copyImageBitmapToTexture.spec.js": [
+       "5e84113b95ad6940517a9c3dc3339ae233b52a10",
+       []
+      ]
      }
     }
    },
@@ -381154,6 +381303,13 @@
        {}
       ]
      ],
+     "animation-base-response-004.html": [
+      "5638a572e90c745bea220e5301210541817c4593",
+      [
+       null,
+       {}
+      ]
+     ],
      "animation-before-initial-box-construction-001.html": [
       "558c5ea18699f3856c7d34b976f920b1fd7fd5b0",
       [
@@ -387364,15 +387520,50 @@
         {}
        ]
       ],
-      "flex-and-minmax-content-resolution-columns-001.html": [
+      "flex-content-distribution-001.html": [
+       "62fb46deebcd46d7275229b154e8fcf8b39b74c3",
+       [
+        null,
+        {}
+       ]
+      ],
+      "flex-content-resolution-columns-001.html": [
+       "ce70aa31de537006d2f0ec62414f7446f2839a24",
+       [
+        null,
+        {}
+       ]
+      ],
+      "flex-content-resolution-columns-002.html": [
        "b92eb9f0dddc63ca5d241c35dca2e0c32d406d24",
        [
         null,
         {}
        ]
       ],
-      "flex-and-minmax-content-resolution-rows-001.html": [
-       "ebaa2c08e4b6fff5042f4c0a4997a28f5cac293a",
+      "flex-content-resolution-rows-001.html": [
+       "d10b84014de8a3f599a9448b4f070719662685f7",
+       [
+        null,
+        {}
+       ]
+      ],
+      "flex-content-resolution-rows-002.html": [
+       "d668a93a324c365c20490d0472a23a5e084ed9b2",
+       [
+        null,
+        {}
+       ]
+      ],
+      "flex-factor-sum-less-than-1-001.html": [
+       "ad7af2d84640ab626cf783e65a2da78a137d48c6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-auto-fill-columns-001.html": [
+       "ed32ee55d5be7f19f468e2f772f3eb2fbbb2cde5",
        [
         null,
         {}
@@ -387774,6 +387965,13 @@
         {}
        ]
       ],
+      "fixed-width-intrinsic-width-should-exclude-scrollbar-001.html": [
+       "26b8f5e01dd932491bec2c365de659359dd14639",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-box-sizing-001.html": [
        "b99029293466ddfb514f401931161d75cbd5917c",
        [
@@ -387853,6 +388051,13 @@
       ]
      ],
      "layout-algorithm": {
+      "flex-and-intrinsic-sizes-001.html": [
+       "5144450dd8cb6106768d55088bd4900405be05ce",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-content-distribution-must-account-for-track-sizing-001.html": [
        "907ef68668f2cbe113674e808b4e78ae0e390100",
        [
@@ -387923,6 +388128,13 @@
         {}
        ]
       ],
+      "grid-item-margin-auto-columns-rows-001.html": [
+       "6ae1c50c220cdd07c5fb1fb266e2e2bd11bf2a4e",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-minimum-contribution-baseline-shim-vertical-lr.html": [
        "3d1949fc3fa3a1d1951dda03ed8a8bb63f31f0e1",
        [
@@ -391010,6 +391222,27 @@
        {}
       ]
      ],
+     "keyframes-003.html": [
+      "2e1d799bd0d04d25a2e8391142cac48f268eeed6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "keyframes-004.html": [
+      "67924fb01cdab74e34cf66243429775bf701c665",
+      [
+       null,
+       {}
+      ]
+     ],
+     "keyframes-005.html": [
+      "d9026d2f6aa7042ada567f866e64ab4366157843",
+      [
+       null,
+       {}
+      ]
+     ],
      "shadow-cascade-order-001.html": [
       "c51696e483374e3d7346f105a7e8b85d8fce7606",
       [
@@ -404552,7 +404785,7 @@
      ]
     ],
     "custom-element-reaction-queue.html": [
-     "737dab117d3bd8d296ca6235d04e7664e35740c0",
+     "246b15a0af36cffa0b64f1d57e4208538b92bdd7",
      [
       null,
       {}
@@ -427734,14 +427967,14 @@
       },
       "the-history-interface": {
        "001.html": [
-        "b4a5fd4bf4de7bff169409913e658af9bb81017b",
+        "6d48d108bbe84fd13c6bd46ca0650be2507525c4",
         [
          null,
          {}
         ]
        ],
        "002.html": [
-        "dcda248282f494c76ba175eb966137704fdf8010",
+        "c054246770f03330415732edf95bfddd10ffddcb",
         [
          null,
          {}
@@ -437286,6 +437519,13 @@
          ]
         ]
        },
+       "currentSrc-blob-cache.html": [
+        "a5e108dcd6e1a47ba4573f042523060fb087c376",
+        [
+         null,
+         {}
+        ]
+       ],
        "data-url.html": [
         "808b5c884c564e52beec9e42437ed5fff4264748",
         [
@@ -483455,6 +483695,13 @@
        null,
        {}
       ]
+     ],
+     "script-access.tentative.html": [
+      "3ecfce55aa3699c8af8ced49cbdad0c1b9b3d0c6",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "event-composed-path-after-dom-mutation.html": [
@@ -493534,13 +493781,6 @@
        null,
        {}
       ]
-     ],
-     "has-trust-token.tentative.https.html": [
-      "17e037f739391c5adcab67fc54dd8d4f0cb7764f",
-      [
-       null,
-       {}
-      ]
      ]
     },
     "trust-token-parameter-validation-xhr.tentative.https.html": [
@@ -499735,15 +499975,29 @@
    "web-animations": {
     "animation-model": {
      "animation-types": {
-      "accumulation-per-property.html": [
-       "420617d1194e9c5acf994b7af4a7ff54454c671f",
+      "accumulation-per-property-001.html": [
+       "a3fd115563b3c934bf3f75fad0eabde1eae7e1e9",
        [
         null,
         {}
        ]
       ],
-      "addition-per-property.html": [
-       "f17eedabbdd5035338a723e5dfe8159d79c5c554",
+      "accumulation-per-property-002.html": [
+       "5cf411edf6ed3b052fab1f76442daca66433cec0",
+       [
+        null,
+        {}
+       ]
+      ],
+      "addition-per-property-001.html": [
+       "2fbec2c4cd0a4fdc78d3c08486d34780e483e7d9",
+       [
+        null,
+        {}
+       ]
+      ],
+      "addition-per-property-002.html": [
+       "3b1c40e3c730b1428a2d4f1e4c8d70f8574c7432",
        [
         null,
         {}
@@ -499756,8 +500010,15 @@
         {}
        ]
       ],
-      "interpolation-per-property.html": [
-       "fe23d89fd06ba28ce6b293c6bea2b8fc03ee1f2d",
+      "interpolation-per-property-001.html": [
+       "97f28224733511e37bf83bc7e653a2b4ff7f88b6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "interpolation-per-property-002.html": [
+       "9ccc613cfc64dff7e4c4d5e9edf5963d3282da40",
        [
         null,
         {}
@@ -503418,137 +503679,105 @@
    },
    "webgpu": {
     "cts.html": [
-     "058d3b3c4ad6bf098529234bcae42d34c2969dac",
+     "62340be400ed172b3997a68680e7f6c9e36dfeca",
      [
-      "webgpu/cts.html?q=cts:buffers/create_mapped",
+      "webgpu/cts.html?q=webgpu:api/operation/buffers/create_mapped",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:buffers/map",
+      "webgpu/cts.html?q=webgpu:api/operation/buffers/map",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:buffers/map_detach",
+      "webgpu/cts.html?q=webgpu:api/operation/buffers/map_detach",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:buffers/map_oom",
+      "webgpu/cts.html?q=webgpu:api/operation/buffers/map_oom",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:canvas/context_creation",
+      "webgpu/cts.html?q=webgpu:api/operation/command_buffer/basic",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/basic",
+      "webgpu/cts.html?q=webgpu:api/operation/command_buffer/copies",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/compute/basic",
+      "webgpu/cts.html?q=webgpu:api/operation/command_buffer/render/basic",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/copies",
+      "webgpu/cts.html?q=webgpu:api/operation/fences",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/render/basic",
+      "webgpu/cts.html?q=webgpu:api/validation/createBindGroup",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/render/rendering",
+      "webgpu/cts.html?q=webgpu:api/validation/createBindGroupLayout",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:command_buffer/render/storeop",
+      "webgpu/cts.html?q=webgpu:api/validation/createPipelineLayout",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:copyImageBitmapToTexture",
+      "webgpu/cts.html?q=webgpu:api/validation/createTexture",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:examples",
+      "webgpu/cts.html?q=webgpu:api/validation/createView",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:fences",
+      "webgpu/cts.html?q=webgpu:api/validation/error_scope",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:resource_init/sampled_texture_clear",
+      "webgpu/cts.html?q=webgpu:api/validation/fences",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createBindGroup",
+      "webgpu/cts.html?q=webgpu:api/validation/queue_submit",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createBindGroupLayout",
+      "webgpu/cts.html?q=webgpu:api/validation/render_pass_descriptor",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createPipelineLayout",
+      "webgpu/cts.html?q=webgpu:api/validation/setBindGroup",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createRenderPipeline",
+      "webgpu/cts.html?q=webgpu:api/validation/setBlendColor",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createTexture",
+      "webgpu/cts.html?q=webgpu:api/validation/setScissorRect",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/createView",
+      "webgpu/cts.html?q=webgpu:api/validation/setStencilReference",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/error_scope",
+      "webgpu/cts.html?q=webgpu:api/validation/setViewport",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/fences",
+      "webgpu/cts.html?q=webgpu:examples",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/queue_submit",
+      "webgpu/cts.html?q=webgpu:web-platform/canvas/context_creation",
       {}
      ],
      [
-      "webgpu/cts.html?q=cts:validation/render_pass",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/render_pass_descriptor",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setBindGroup",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setBlendColor",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setScissorRect",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setStencilReference",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setVertexBuffer",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/setViewport",
-      {}
-     ],
-     [
-      "webgpu/cts.html?q=cts:validation/vertex_state",
+      "webgpu/cts.html?q=webgpu:web-platform/copyImageBitmapToTexture",
       {}
      ]
     ]
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-animations/animation-base-response-004.html.ini b/tests/wpt/metadata/css/css-animations/animation-base-response-004.html.ini
new file mode 100644
index 00000000000..6e98c32bc87
--- /dev/null
+++ b/tests/wpt/metadata/css/css-animations/animation-base-response-004.html.ini
@@ -0,0 +1,4 @@
+[animation-base-response-004.html]
+  [Base is responsive to font-affecting appearing via setKeyframes]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/custom-elements/custom-element-reaction-queue.html.ini b/tests/wpt/metadata/custom-elements/custom-element-reaction-queue.html.ini
index 03f40d084f0..ba3c2cf771c 100644
--- a/tests/wpt/metadata/custom-elements/custom-element-reaction-queue.html.ini
+++ b/tests/wpt/metadata/custom-elements/custom-element-reaction-queue.html.ini
@@ -2,3 +2,6 @@
   [Custom Elements: Each element must have its own custom element reaction queue]
     expected: FAIL
 
+  [Upgrading a custom element must not invoke attributeChangedCallback for the attribute that is changed during upgrading]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 87354d1e79a..206418892fe 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,9 +315,18 @@
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: */* text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 2d5faa72ac7..ac4cbcba706 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
+  [separate text/javascript x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..61682d248e2 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f1aa94c7ced..8b743f36e1d 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,7 +4,7 @@
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
     expected: NOTRUN
@@ -16,5 +16,5 @@
     expected: NOTRUN
 
   [Non-HTMLElement should not support autofocus]
-    expected: TIMEOUT
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 3a32693ffa8..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 2568040e6e5..e440b1e38c6 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini
new file mode 100644
index 00000000000..2c4a51d2910
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html.ini
@@ -0,0 +1,4 @@
+[currentSrc-blob-cache.html]
+  [currentSrc is right even if underlying image is a shared blob]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 8fd17170541..df5d2d1dba0 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -149,3 +149,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44054 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 18538.\n\t[18538\]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44051 more errors.\n\tMax AbsError of 1.9999794363975525e+0 at index of 19632.\n\t[19632\]\t9.9997943639755249e-1\t-1.0000000000000000e+0\t1.9999794363975525e+0\t1.9999794363975525e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index c8d7e71fc52..e3036148555 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -365,3 +365,9 @@
   [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t-1.1377083450655894e+22\t5.6332010030746460e-1\t1.1377083450655894e+22\t2.0196480552435802e+22\t9.0957000000000003e-5\n\t[31081\]\t4.5654303967702540e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.1377083450655894e+22 at index of 31080.\n\tMax RelError of 2.0196480552435802e+22 at index of 31080.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t-1.7359996676420403e+17\t5.6332010030746460e-1\t1.7359996676420403e+17\t3.0817286063368198e+17\t9.0957000000000003e-5\n\t[31081\]\t4.5750993561740953e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.7359996676420403e+17 at index of 31080.\n\tMax RelError of 3.0817286063368198e+17 at index of 31080.\n]
+    expected: FAIL
+
+  [X SNR (-301.35690681171843 dB) is not greater than or equal to 85.58. Got -301.35690681171843.]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-004.html b/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-004.html
new file mode 100644
index 00000000000..5638a572e90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-animations/animation-base-response-004.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Tests that base responds to font-affecting properties appearing via setKeyframes</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target1 {
+    font-size: 10px;
+    height: 1em;
+  }
+</style>
+<div id=target1></div>
+<script>
+  test(function() {
+    getComputedStyle(target1).height;
+
+    let animation = target1.animate([
+      { height: '50px' },
+      { height: '100px' },
+    ], {
+      duration: 1000000,
+      delay: -500000,
+      easing: 'steps(2, end)'
+    });
+
+    assert_equals(getComputedStyle(target1).height, '75px');
+
+    animation.effect.setKeyframes([
+      { fontSize: '10px' },
+      { fontSize: '20px' },
+    ]);
+
+    assert_equals(getComputedStyle(target1).height, '15px');
+  }, 'Base is responsive to font-affecting appearing via setKeyframes');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html b/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html
new file mode 100644
index 00000000000..921482afcdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox-notref.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<input type="checkbox">
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html b/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html
new file mode 100644
index 00000000000..ae0dc62b7c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-change-checkbox.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="reftest-wait">
+<head>
+  <title>CSS Color Adjustment Test: Checkbox rendering should change between dark and light schemes</title>
+  <link rel="help" href="https://drafts.csswg.org/css-color-adjust/#color-scheme-processing">
+  <link rel="mismatch" href="color-scheme-change-checkbox-notref.html">
+  <link rel="stylesheet" href="support/assert-preferred-dark.css">
+  <script src="/common/reftest-wait.js"></script>
+</head>
+<body>
+  <input type="checkbox">
+</body>
+<script>
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      document.querySelector("input").style.colorScheme = "dark";
+      takeScreenshot();
+    });
+  });
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-distribution-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-distribution-001.html
new file mode 100644
index 00000000000..62fb46deebc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-distribution-001.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<title>CSS Grid Layout Test: free space computation with flex lengths.</title>
+<link rel="author" title="Sergio Villar Senin" href="mailto:svillar@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-flex-tracks">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#fr-unit">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=150359">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test that free space is properly computed after computing fr tracks so that we could use it for content distribution." />
+
+<style>
+.freeSpaceForColumnsGrid {
+    grid-template: 100% / minmax(20px, 0.7fr);
+    width: 50px;
+    height: 100px;
+}
+
+.freeSpaceForRowsGrid {
+    grid-template: minmax(20px, 0.7fr) / 100%;
+    width: 50px;
+    height: 100px;
+}
+
+.container { position: relative; }
+
+.item {
+    width: 100%;
+    height: 50px;
+    background-color: red;
+}
+
+.item2 {
+    width: 50px;
+    height: 100%;
+    background-color: red;
+}
+
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid');">
+
+<p>Grid with justify-content: start.</p>
+<div class="container">
+    <div class="grid freeSpaceForColumnsGrid justifyContentStart">
+        <div class="item" data-offset-x="0" data-offset-y="0" data-expected-width="35" data-expected-height="50"></div>
+    </div>
+</div>
+
+<p>Grid with justify-content: center.</p>
+<div class="container">
+    <div class="grid freeSpaceForColumnsGrid justifyContentCenter">
+        <div class="item" data-offset-x="8" data-offset-y="0" data-expected-width="35" data-expected-height="50"></div>
+    </div>
+</div>
+
+<p>Grid with justify-content: end.</p>
+<div class="container">
+    <div class="grid freeSpaceForColumnsGrid justifyContentEnd">
+        <div class="item" data-offset-x="15" data-offset-y="0" data-expected-width="35" data-expected-height="50"></div>
+    </div>
+</div>
+
+<p>Grid with align-content: start.</p>
+<div class="container">
+    <div class="grid freeSpaceForRowsGrid alignContentStart">
+        <div class="item2" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="70"></div>
+    </div>
+</div>
+
+<p>Grid with align-content: center.</p>
+<div class="container">
+    <div class="grid freeSpaceForRowsGrid alignContentCenter">
+        <div class="item2" data-offset-x="0" data-offset-y="15" data-expected-width="50" data-expected-height="70"></div>
+    </div>
+</div>
+
+<p>Grid with align-content: end.</p>
+<div class="container">
+    <div class="grid freeSpaceForRowsGrid alignContentEnd">
+        <div class="item2" data-offset-x="0" data-offset-y="30" data-expected-width="50" data-expected-height="70"></div>
+    </div>
+</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html
new file mode 100644
index 00000000000..ce70aa31de5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-001.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid Layout Test: Auto repeat tracks, grid-template-columns and flexible lengths.</title>
+<link rel="author" title="Julien Chaffraix" href="mailto:jchaffraix@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizes">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#fr-unit">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=235258">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="Test that resolving auto tracks on grid items using <flex> values with grid-template-columns works properly." />
+
+<style>
+.gridFlexContent {
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: 50px;
+}
+.gridMaxFlexContent {
+    grid-template-columns: minmax(30px, 2fr);
+    grid-template-rows: 50px;
+}
+.gridTwoMaxFlexContent {
+    grid-template-columns: minmax(10px, 1fr) minmax(10px, 2fr);
+    grid-template-rows: 50px;
+}
+.gridTwoDoubleMaxFlexContent {
+    grid-template-columns: minmax(10px, 0.5fr) minmax(10px, 2fr);
+    grid-template-rows: 50px;
+}
+.gridIgnoreSecondGridItem {
+    grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr);
+    grid-template-rows: 50px;
+}
+.gridRespectBaseSize {
+    grid-template-columns: minmax(75px, 1fr) minmax(0px, 2fr);
+    grid-template-rows: 50px;
+}
+.gridRespectProportions {
+    grid-template-columns: minmax(0px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
+    grid-template-rows: 50px;
+}
+.gridRespectBaseSizeProportions {
+    grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+    grid-template-rows: 50px;
+}
+.gridRespectBaseSizeBeforeProportions {
+    grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+    grid-template-rows: 50px;
+}
+.firstRowThirdColumn {
+    background-color: yellow;
+    grid-column: 3;
+    grid-row: 1;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+  setup({ explicit_done: true });
+</script>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<div class="constrainedContainer" style="position: relative">
+    <div class="grid gridFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="50">XXX</div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="30" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX</div>
+    </div>
+</div>
+
+<div class="constrainedContainer">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="30" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 40px; height: 10px">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="40" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="width: 100px; height: 10px;">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="100" data-expected-height="50"></div>
+    </div>
+</div>
+
+
+<div class="constrainedContainer">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="10" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="10" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 60px; height: 10px">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="20" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="40" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="width: 120px; height: 10px;">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="40" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="80" data-expected-height="50"></div>
+    </div>
+</div>
+
+
+<div class="constrainedContainer">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="10" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="10" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 60px; height: 10px">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="12" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="48" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="width: 120px; height: 10px;">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="24" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="96" data-expected-height="50"></div>
+    </div>
+</div>
+
+
+<!-- Custom test for a corner case. -->
+<div style="width: 570px; height: 10px;">
+    <div class="grid gridIgnoreSecondGridItem">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="420" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="150" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Flex track length must be at least its baseSize. -->
+<div style="width: 100px; height: 10px;">
+    <div class="grid gridRespectBaseSize">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="75" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="25" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Flex track lengths must be proportional to their flex factors.. -->
+<div style="width: 275px; height: 10px;">
+    <div class="grid gridRespectProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="25" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="200" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Flex track lengths must be proportional but still respecting their base sizes. -->
+<div style="width: 350px; height: 10px;">
+    <div class="grid gridRespectBaseSizeProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="100" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="200" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Not enough space to respect proportions, because minTrackBreadh it's a harder requirement -->
+<div style="width: 275px; height: 10px;">
+    <div class="grid gridRespectBaseSizeBeforeProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="75" data-expected-height="50"></div>
+        <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="150" data-expected-height="50"></div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-and-minmax-content-resolution-columns-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-and-minmax-content-resolution-columns-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-columns-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html
new file mode 100644
index 00000000000..d10b84014de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-001.html
@@ -0,0 +1,253 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid Layout Test: Auto repeat tracks, grid-template-rows and flexible lengths.</title>
+<link rel="author" title="Julien Chaffraix" href="mailto:jchaffraix@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizes">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#fr-unit">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=235258">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="Test that resolving auto tracks on grid items using <flex> values with grid-template-rows works properly." />
+
+<style>
+.gridFlexContent {
+    grid-template-columns: 50px;
+    grid-template-rows: 1fr 1fr;
+}
+.gridMaxFlexContent {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(30px, 2fr);
+}
+.gridTwoMaxFlexContent {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, 1fr) minmax(10px, 2fr);
+}
+.gridTwoDoubleMaxFlexContent {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(10px, 0.5fr) minmax(10px, 2fr);
+}
+.gridRespectBaseSize {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(75px, 1fr) minmax(0px, 2fr);
+}
+.gridRespectProportions {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(25px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr);
+}
+.gridRespectBaseSizeProportions {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+}
+.gridRespectBaseSizeBeforeProportions {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr);
+}
+.thirdRowFirstColumn {
+    background-color: yellow;
+    grid-column: 1;
+    grid-row: 3;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+  setup({ explicit_done: true });
+</script>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<div class="grid gridFlexContent constrainedContainer" style="position: relative;">
+    <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="30">X<br>X<br>X</div>
+    <div class="sizedToGridArea secondRowFirstColumn" data-offset-x="0" data-offset-y="30" data-expected-width="50" data-expected-height="50">X<br>X<br>X<br>X<br>X</div>
+</div>
+
+<div class="constrainedContainer">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="30"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 10px; height: 40px">
+    <div class="grid gridMaxFlexContent" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="40"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 40px">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="30"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 100px;">
+    <div class="grid gridMaxFlexContent" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="100"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 100px;">
+    <div class="grid gridMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="30"></div>
+    </div>
+</div>
+
+<div class="constrainedContainer">
+    <div class="grid gridTwoMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+    </div>
+</div>
+
+<div class="constrainedContainer">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 10px; height: 60px">
+    <div class="grid gridTwoMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="40"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 60px">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 120px;">
+    <div class="grid gridTwoMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="40"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="80"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 120px;">
+    <div class="grid gridTwoMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div class="constrainedContainer">
+    <div class="grid gridTwoDoubleMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+    </div>
+</div>
+
+<!-- We normalize fraction flex factors to 1, so we don't keep exact proportions with >1 factors. -->
+<div class="constrainedContainer">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<!-- Allow the extra logical space distribution to occur. -->
+<div style="width: 10px; height: 60px">
+    <div class="grid gridTwoDoubleMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="12"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="48"></div>
+    </div>
+</div>
+
+<!-- We normalize fraction flex factors to 1, so we don't keep exact proportions with >1 factors. -->
+<div style="width: 10px; height: 60px">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 120px;">
+    <div class="grid gridTwoDoubleMaxFlexContent" style="height: 100%">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="24"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="96"></div>
+    </div>
+</div>
+
+<!-- We normalize fraction flex factors to 1, so we don't keep exact proportions with >1 factors. -->
+<div style="width: 10px; height: 120px;">
+    <div class="grid gridTwoDoubleMaxFlexContent">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+    </div>
+</div>
+
+<!-- Flex track length must be at least its baseSize. -->
+<div style="width: 10px; height: 100px;">
+    <div class="grid gridRespectBaseSize" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="75"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="25"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 100px;">
+    <div class="grid gridRespectBaseSize">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="75"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="150"></div>
+    </div>
+</div>
+
+<!-- Flex track lengths must be proportional to their flex factors.. -->
+<div style="width: 10px; height: 275px;">
+    <div class="grid gridRespectProportions" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="25"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="200"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 275px;">
+    <div class="grid gridRespectProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="25"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="13"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Flex track lengths must be proportional but still respecting their base sizes. -->
+<div style="width: 10px; height: 350px;">
+    <div class="grid gridRespectBaseSizeProportions" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="100"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="200"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 350px;">
+    <div class="grid gridRespectBaseSizeProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="25"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+    </div>
+</div>
+
+<!-- Not enough space to respect proportions, because minTrackBreadh it's a harder requirement -->
+<div style="width: 10px; height: 275px;">
+    <div class="grid gridRespectBaseSizeBeforeProportions" style="height: 100%;">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="75"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="150"></div>
+    </div>
+</div>
+
+<div style="width: 10px; height: 275px;">
+    <div class="grid gridRespectBaseSizeBeforeProportions">
+        <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="50" data-expected-height="25"></div>
+        <div class="sizedToGridArea thirdRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-and-minmax-content-resolution-rows-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html
similarity index 99%
rename from tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-and-minmax-content-resolution-rows-001.html
rename to tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html
index ebaa2c08e4b..d668a93a324 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-and-minmax-content-resolution-rows-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-content-resolution-rows-002.html
@@ -54,8 +54,6 @@
 
 <body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
 
-<p>Test that resolving auto tracks on grid items works properly.</p>
-
 <div class="constrainedContainer">
     <div class="grid gridMaxMaxContent">
         <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10">XXXXX</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html
new file mode 100644
index 00000000000..ad7af2d8464
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/flex-factor-sum-less-than-1-001.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid Layout Test: flex factor sum smaller than 1.</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#algo-find-fr-size">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#fr-unit">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=520477">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="Test that resolving auto tracks on grid items works properly even when the flex factor sum is less than 1." />
+
+<style>
+.onlyColumnFractionFlexFactors {
+    grid-template-columns: minmax(0, 0.1fr) minmax(0, 0.2fr) minmax(0, 0.3fr);
+    grid-template-rows: 50px;
+    width: 100px;
+}
+.onlyRowFractionFlexFactors {
+    grid-template-columns: 50px;
+    grid-template-rows: minmax(0, 0.1fr) minmax(0, 0.2fr) minmax(0, 0.3fr);
+    width: 50px;
+    height: 100px;
+}
+.fixedAndfractionFlexFactors {
+    grid-template-columns: 50px minmax(0, 0.2fr) 30px;
+    grid-template-rows: minmax(0, 0.1fr) 50px minmax(0, 0.3fr);
+    width: 100px;
+    height: 100px;
+}
+.zeroValueFlexFactor {
+    grid-template-columns: .0fr .2fr .3fr;
+    grid-template-rows: 50px;
+    width: 100px;
+}
+.firstRowThirdColumn {
+    background-color: yellow;
+    grid-column: 3;
+    grid-row: 1;
+}
+.secondRowThirdColumn {
+    background-color: yellow;
+    grid-column: 3;
+    grid-row: 2;
+}
+.thirdRowFirstColumn {
+    background-color: brown;
+    grid-column: 1;
+    grid-row: 3;
+}
+.thirdRowThirdColumn {
+    background-color: magenta;
+    grid-column: 3;
+    grid-row: 3;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid');">
+
+<div style="position: relative;">
+    <div class="grid onlyColumnFractionFlexFactors">
+        <div class="firstRowFirstColumn" data-expected-width="10" data-expected-height="50"></div>
+        <div class="firstRowSecondColumn" data-expected-width="20" data-expected-height="50"></div>
+        <div class="firstRowThirdColumn" data-expected-width="30" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="position: relative;">
+    <div class="grid onlyRowFractionFlexFactors">
+        <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="10"></div>
+        <div class="secondRowFirstColumn" data-expected-width="50" data-expected-height="20"></div>
+        <div class="thirdRowFirstColumn" data-expected-width="50" data-expected-height="30"></div>
+    </div>
+</div>
+
+<div style="position: relative;">
+    <div class="grid zeroValueFlexFactor">
+        <div class="firstRowFirstColumn" data-expected-width="0" data-expected-height="50"></div>
+        <div class="firstRowSecondColumn" data-expected-width="20" data-expected-height="50"></div>
+        <div class="firstRowThirdColumn" data-expected-width="30" data-expected-height="50"></div>
+    </div>
+</div>
+
+<div style="position: relative;">
+    <div class="grid fixedAndfractionFlexFactors">
+        <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="5"></div>
+        <div class="firstRowSecondColumn" data-expected-width="4" data-expected-height="5"></div>
+        <div class="firstRowThirdColumn" data-expected-width="30" data-expected-height="5"></div>
+        <div class="secondRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
+        <div class="secondRowSecondColumn" data-expected-width="4" data-expected-height="50"></div>
+        <div class="secondRowThirdColumn" data-expected-width="30" data-expected-height="50"></div>
+        <div class="thirdRowFirstColumn" data-expected-width="50" data-expected-height="15"></div>
+        <div class="thirdRowSecondColumn" data-expected-width="4" data-expected-height="15"></div>
+        <div class="thirdRowThirdColumn" data-expected-width="30" data-expected-height="15"></div>
+    </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html
new file mode 100644
index 00000000000..7b2ed99f223
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-item-with-positioned-items-crash.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: no crash with adding positioned grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-definition">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=273898">
+<meta name="assert" content="Test that adding grid items when some of them are positioned does not crash." />
+
+<style>
+#grid {
+  display: grid;
+  grid-auto-flow: dense;
+}
+
+.absolute {
+  position: absolute;
+}
+</style>
+</head>
+
+<body>
+<div id="grid">
+  <div></div>
+  <div class="absolute"></div>
+</div>
+
+<script>
+  var grid = document.getElementById("grid");
+  grid.offsetTop;
+  var newItem1 = document.createElement("div");
+  grid.appendChild(newItem1);
+  var newItem2 = document.createElement("div");
+  newItem2.className = "absolute";
+  grid.appendChild(newItem2);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html
new file mode 100644
index 00000000000..4b7aa9913a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-add-positioned-block-item-after-inline-item-crash.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: no crash with positioned block grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-definition">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=273898">
+<meta name="assert" content="Test that adding a positioned block grid item after an inline grid item does not crash." />
+
+<style>
+#grid {
+  display: grid;
+  grid-auto-flow: dense;
+}
+
+embed {
+  position: absolute;
+}
+</style>
+</head>
+
+<body>
+<div id="grid">
+    test
+</div>
+
+<script>
+  var grid = document.getElementById("grid");
+  grid.offsetTop;
+  var embed = document.createElement("embed");
+  embed.setAttribute("type", "image/png");
+  grid.appendChild(embed);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html
new file mode 100644
index 00000000000..ed32ee55d5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-fill-columns-001.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<title>CSS Grid: auto-fill columns</title>
+<link rel="author" title="Sergio Villar" href="mailto: svillar@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fill">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-auto-columns">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-auto-rows">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-columns">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-column">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-grid-column-gap">
+<link rel="help" href="https://crbug.com/619930">
+<link rel="help" href="https://crbug.com/589460">
+<meta name="assert" content="Check that auto-fill columns are properly computed in a grid container"/>
+<link href="/css/support/grid.css" rel="stylesheet">
+<style>
+
+.grid {
+    border: 2px solid magenta;
+    width: 200px;
+    position: relative;
+    justify-content: start;
+    grid-auto-columns: 157px;
+    grid-auto-rows: 25px;
+}
+
+.gridOnlyAutoRepeat { grid-template-columns: repeat(auto-fill, 30px [autobar]); }
+.gridAutoRepeatAndFixedBefore { grid-template-columns: 10px [foo] 20% [bar] repeat(auto-fill, [autofoo] 35px); }
+.gridAutoRepeatAndFixedAfter { grid-template-columns: repeat(auto-fill, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, max-content); }
+.gridAutoRepeatAndFixed { grid-template-columns: [start] repeat(2, 50px [a]) [middle] repeat(auto-fill, [autofoo] 15px [autobar]) minmax(5%, 10%) [end]; }
+.gridMultipleNames { grid-template-columns: [start] 20px [foo] 50% repeat(auto-fill, [bar] 20px [start foo]) [foo] 10% [end bar]; }
+.gridMultipleTracks { grid-template-columns: [start] 20px repeat(auto-fill, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
+
+.item { background-color: cyan; }
+
+.gap { grid-column-gap: 20px; }
+
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+<div id="log"></div>
+
+<p>This test checks that repeat(auto-fill, ) syntax works as expected.</p>
+
+<div class="grid gridOnlyAutoRepeat">
+    <div class="item" style="grid-column: 1 / span 6" data-offset-x="0" data-offset-y="0" data-expected-width="180" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridOnlyAutoRepeat">
+    <div class="item" style="grid-column: 1 / span 6 autobar" data-offset-x="0" data-offset-y="0" data-expected-width="180" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridOnlyAutoRepeat gap">
+    <div class="item" style="grid-column: 1 / span 5" data-offset-x="0" data-offset-y="0" data-expected-width="357" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridOnlyAutoRepeat gap">
+    <div class="item" style="grid-column: autobar 2 / span 3" data-offset-x="100" data-offset-y="0" data-expected-width="257" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore">
+    <div class="item" style="grid-column: 1 / span 6" data-offset-x="0" data-offset-y="0" data-expected-width="190" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore">
+    <div class="item" style="grid-column: foo / autofoo" data-offset-x="10" data-offset-y="0" data-expected-width="40" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore">
+    <div class="item" style="grid-column: bar / 5 autofoo" data-offset-x="50" data-offset-y="0" data-expected-width="297" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore gap">
+    <div class="item" style="grid-column: 1 / span 4" data-offset-x="0" data-offset-y="0" data-expected-width="180" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore gap">
+    <div class="item" style="grid-column: span 3 / 2 autofoo" data-offset-x="0" data-offset-y="0" data-expected-width="125" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedBefore gap">
+    <div class="item" style="grid-column: notPresent / 3 autofoo" data-offset-x="377" data-offset-y="0" data-expected-width="157" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter">
+    <div class="item" style="grid-column: 1 / span 4" data-offset-x="0" data-offset-y="0" data-expected-width="185" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter">
+    <div class="item" style="grid-column: first / last 2" data-offset-x="0" data-offset-y="0" data-expected-width="60" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter">
+    <div class="item" style="grid-column: last 2 / foo" data-offset-x="60" data-offset-y="0" data-expected-width="80" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter gap">
+    <div class="item" style="grid-column: 1 / span 3" data-offset-x="0" data-offset-y="0" data-expected-width="195" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter gap">
+    <div class="item" style="grid-column: 3 / span 1 bar" data-offset-x="130" data-offset-y="0" data-expected-width="222" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixedAfter gap">
+    <div class="item" style="grid-column: first / foo" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixed">
+    <div class="item" style="grid-column: 1 / span 8" data-offset-x="0" data-offset-y="0" data-expected-width="195" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixed">
+    <div class="item" style="grid-column: a / autobar 2" data-offset-x="50" data-offset-y="0" data-expected-width="80" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixed">
+    <div class="item" style="grid-column: autofoo / end" data-offset-x="100" data-offset-y="0" data-expected-width="95" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixed gap">
+    <div class="item" style="grid-column: 1 / span 4"  data-offset-x="0" data-offset-y="0" data-expected-width="195" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridAutoRepeatAndFixed gap">
+    <div class="item" style="grid-column: autobar / -1"  data-offset-x="175" data-offset-y="0" data-expected-width="20" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames">
+    <div class="item" style="grid-column: 1 / -1"  data-offset-x="0" data-offset-y="0" data-expected-width="200" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames">
+    <div class="item" style="grid-column: foo 3 / 4 bar"  data-offset-x="160" data-offset-y="0" data-expected-width="40" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames">
+    <div class="item" style="grid-column: -6 / span 2 start"  data-offset-x="20" data-offset-y="0" data-expected-width="140" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames gap">
+    <div class="item" style="grid-column: -4 / -2"  data-offset-x="40" data-offset-y="0" data-expected-width="140" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames gap">
+    <div class="item" style="grid-column: bar / foo 2"  data-offset-x="160" data-offset-y="0" data-expected-width="20" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleNames gap">
+    <div class="item" style="grid-column: foo / bar 2"  data-offset-x="40" data-offset-y="0" data-expected-width="180" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleTracks">
+    <div class="item" style="grid-column: a / 2 c"  data-offset-x="20" data-offset-y="0" data-expected-width="84" data-expected-height="25"></div>
+    <div class="item" style="grid-column: 3 / e; grid-row: 2;"  data-offset-x="52" data-offset-y="25" data-expected-width="72" data-expected-height="25"></div>
+</div>
+
+<div class="grid gridMultipleTracks gap">
+    <div class="item" style="grid-column: a / c"  data-offset-x="40" data-offset-y="0" data-expected-width="32" data-expected-height="25"></div>
+    <div class="item" style="grid-column: 3 / last; grid-row: 2;"  data-offset-x="92" data-offset-y="25" data-expected-width="115" data-expected-height="25"></div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html
new file mode 100644
index 00000000000..a017563aa36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<style>
+
+.grid {
+    width: 100px;
+    grid: repeat(5, 20px) / repeat(4, 25px);
+    justify-content: start;
+    align-content: start;
+}
+
+.item {
+    background: green;
+}
+</style>
+
+<p>Test passes if you get a grid with 5 rows of 20px and 4 columns of 25px.</p>
+
+<pre id="log">grid: 20px 20px 20px 20px 20px / 25px 25px 25px 25px;</pre>
+
+<div class="wrapper">
+    <div id="grid" class="grid">
+        <div class="item" style="grid-area: 1 / 1;"></div>
+        <div class="item" style="grid-area: 2 / 2;"></div>
+        <div class="item" style="grid-area: 3 / 3;"></div>
+        <div class="item" style="grid-area: 4 / 4;"></div>
+        <div class="item" style="grid-row: 5; grid-column: 1 / -1;"></div>
+    </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html
new file mode 100644
index 00000000000..309ad856712
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-positioned-container-001.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>CSS Grid: auto-repeat tracks on a positioned grid container.</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com"/>
+<link rel="issue" href="https://crbug.com/624301"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#repeat-notation"/>
+<link rel="match" href="grid-auto-repeat-positioned-container-001-ref.html"/>
+<meta name="assert" content="Checks that auto repeat tracks are properly computed for a positioned grid container with a definite width and height."/>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<style>
+.wrapper {
+    position: relative;
+    width: 100px;
+    height: 100px;
+}
+
+.grid {
+    position: absolute;
+    left: 0; right: 0; top: 0; bottom: 0;
+    grid: repeat(auto-fill, 20px) / repeat(auto-fill, 25px);
+    justify-content: start;
+    align-content: start;
+}
+
+.item {
+    background: green;
+}
+</style>
+
+<p>Test passes if you get a grid with 5 rows of 20px and 4 columns of 25px.</p>
+
+<pre id="log"></pre>
+
+<div class="wrapper">
+    <div id="grid" class="grid">
+        <div class="item" style="grid-area: 1 / 1;"></div>
+        <div class="item" style="grid-area: 2 / 2;"></div>
+        <div class="item" style="grid-area: 3 / 3;"></div>
+        <div class="item" style="grid-area: 4 / 4;"></div>
+        <div class="item" style="grid-row: 5; grid-column: 1 / -1;"></div>
+    </div>
+</div>
+
+<script>
+    var log = document.getElementById("log");
+
+    var grid = document.getElementById("grid");
+    var computedStyle = getComputedStyle(grid);
+
+    log.innerHTML = "grid: " + computedStyle.getPropertyValue("grid-template-rows") + " / " + computedStyle.getPropertyValue("grid-template-columns") + ";";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html
new file mode 100644
index 00000000000..86553ef6f40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001-ref.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<link href="/css/support/grid.css" rel="stylesheet">
+<link href="/fonts/ahem.css"  rel="stylesheet"/>
+<style>
+.block {
+    background-color: grey;
+    width: 80px;
+    height: 80px;
+    position: relative;
+    margin-bottom: 5px;
+    border: 1px solid;
+}
+
+.item {
+    font: 15px/1 Ahem;
+    background-color: green;
+    width: 40px;
+    height: 20px;
+    margin: 4px 8px 12px 16px;
+}
+</style>
+
+<body>
+    <div class="block">
+        <div class="item">X</div>
+    </div>
+    <div class="block verticalRL">
+        <div class="item">X</div>
+    </div>
+    <div class="block verticalLR">
+        <div class="item">X</div>
+    </div>
+    <div class="block directionRTL">
+        <div class="item">X</div>
+    </div>
+    <div class="block directionRTL verticalRL">
+        <div class="item">X</div>
+    </div>
+    <div class="block directionRTL verticalLR">
+        <div class="item">X</div>
+    </div>
+</body>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html
new file mode 100644
index 00000000000..5209940a969
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-item-margins-and-writing-modes-001.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid: Grid items and logical margins</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-template-columns">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-column">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#propdef-grid-row">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<link rel="match" href="grid-item-margins-and-writing-modes-001-ref.html">
+<meta name="assert" content="This test ensures that the border, margin, and padding
+combining with RTL direction and different writing-modes generate the proper layout."/>
+<link href="/css/support/grid.css" rel="stylesheet">
+<link href="/fonts/ahem.css"  rel="stylesheet"/>
+<style>
+.grid {
+    grid-template-columns: 80px;
+}
+
+.block {
+    background-color: grey;
+    width: 80px;
+    height: 80px;
+    position: relative;
+    margin-bottom: 5px;
+    border: 1px solid;
+}
+
+.item {
+    font: 15px/1 Ahem;
+    background-color: green;
+    grid-column: 1 / 2;
+    grid-row: 1 / 2;
+    width: 40px;
+    height: 20px;
+    margin: 4px 8px 12px 16px;
+}
+</style>
+
+<body>
+    <div class="grid block">
+        <div class="item">X</div>
+    </div>
+    <div class="grid block verticalRL">
+        <div class="item">X</div>
+    </div>
+    <div class="grid block verticalLR">
+        <div class="item">X</div>
+    </div>
+    <div class="grid block directionRTL">
+        <div class="item">X</div>
+    </div>
+    <div class="grid block directionRTL verticalRL">
+        <div class="item">X</div>
+    </div>
+    <div class="grid block directionRTL verticalLR">
+        <div class="item">X</div>
+    </div>
+</body>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/remove-svg-grid-item-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/remove-svg-grid-item-001.html
new file mode 100644
index 00000000000..5e196c82c64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/remove-svg-grid-item-001.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Grid Layout Test: Remove a first child in grid items</title>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-item">
+<link rel="stylesheet" href="/css/support/grid.css"/>
+<link rel="match" href="../reference/grid-item-script-001-ref.html">
+<meta name="assert" content="This test ensures that removing a first child element in grid items doesn't crash.">
+<link rel="stylesheet" href="/css/support/grid.css"/>
+<div class="grid">
+  <svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='190'>
+    <polygon points='100,10 40,180 190,60 10,60 160,180' style='fill:lime;stroke:purple;stroke-width:5;fill-rule:evenodd;'>
+  </svg>
+</div>
+
+<script>
+  var grid = document.getElementsByClassName("grid")[0];
+  grid.offsetTop;
+  while (grid.firstChild)
+    grid.removeChild(grid.firstChild);
+  grid.offsetTop;
+  grid.innerHTML = "Test passes if it doesn't crash.";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html
new file mode 100644
index 00000000000..1531d98a64f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<link href="/css/support/grid.css" rel="stylesheet">
+<style>
+  .item {
+    height: 100%;
+    width: 30px;
+    background: salmon;
+  }
+</style>
+<body>
+  <p>This test passes if it has the same output than the reference. As spec states that child text runs containing only white space should not rendered (just as if its text nodes were display:none).</p>
+  <div class="grid">
+    <div class="item"></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html
new file mode 100644
index 00000000000..f79baab6f05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/whitespace-in-grid-item-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid : Whitespace in grid item</title>
+<link rel="author" title="Christian Biesinger" href="mailto:cbiesinger@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-items">
+<link rel="match" href="whitespace-in-grid-item-001-ref.html">
+<link rel="help" href="https://codereview.chromium.org/16888008">
+<meta name="assert" content="Grid items shouldn't be created for white spaces."/>
+<link href="/css/support/grid.css" rel="stylesheet">
+<style>
+  .grid {
+    white-space: pre;
+  }
+  .item {
+    height: 100%;
+    width: 30px;
+    background: salmon;
+  }
+</style>
+<body>
+  <p>This test passes if it has the same output than the reference. As spec states that child text runs containing only white space should not rendered (just as if its text nodes were display:none).</p>
+  <div class="grid">
+
+    <div class="item"></div> &#9;
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html
new file mode 100644
index 00000000000..26b8f5e01dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/fixed-width-intrinsic-width-should-exclude-scrollbar-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Grid: intrinsic width of fixed-width grid items.</title>
+<link rel="author" title="Sunil Ratnu" href="mailto:sunil.ratnu@samsung.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#overflow"/>
+<meta name="assert" content="This test ensures that scrollbar width is not accounted for fixed-width grid items' intrinsic width."/>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<style>
+.grid {
+    grid-template-columns: 400px 500px;
+    grid-template-rows: 200px 300px;
+}
+
+.gridItemScrollOverflow {
+    width: 50px;
+    height: 50px;
+    overflow: scroll;
+}
+
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.grid')">
+
+<div class="grid">
+    <div class="firstRowFirstColumn gridItemScrollOverflow" data-expected-width="50" data-expected-height="50"></div>
+    <div class="firstRowSecondColumn gridItemScrollOverflow" data-expected-width="50" data-expected-height="50"></div>
+    <div class="secondRowFirstColumn gridItemScrollOverflow" data-expected-width="50" data-expected-height="50"></div>
+    <!-- Grid item itself being a grid container-->
+    <div class="grid secondRowSecondColumn gridItemScrollOverflow" data-expected-width="50" data-expected-height="50"></div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html
new file mode 100644
index 00000000000..070980ed27c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002-ref.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="/css/support/grid.css">
+<style>
+.cell {
+  width: 50px;
+  height: auto;
+  min-height: 50px
+}
+
+.invisibleFont {
+  color: lime;
+}
+
+.floatLeft {
+  float: left;
+}
+
+.clearLeft {
+  clear: left;
+}
+
+.relative {
+  position: relative;
+}
+</style>
+</head>
+
+<body>
+
+<div>This test checks that grid item sets a new formatting context for its content, preventing any 'float' protruding content on the adjoining grid item ('Float' text shouldn't overflow the first row).</div>
+
+<div>
+  <div class="cell relative floatLeft firstRowFirstColumn">
+    <div>Float</div>
+    <div>Float</div>
+    <div>Float</div>
+    <div>Float</div>
+  </div>
+  <div class="cell floatLeft firstRowSecondColumn">
+    <div class="invisibleFont">Float</div>
+    <div class="invisibleFont">Float</div>
+    <div class="invisibleFont">Float</div>
+    <div class="invisibleFont">Float</div>
+  </div>
+  <div class="cell floatLeft clearLeft secondRowFirstColumn"></div>
+  <div class="cell floatLeft secondRowSecondColumn"></div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html
new file mode 100644
index 00000000000..9c26e021050
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-floats-no-intrude-002.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Grid Layout Test: floats do not protrude content onto grid items</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-containers">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=430100">
+<link rel="match" href="grid-floats-no-intrude-002-ref.html">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
+<meta name="assert" content="Test that a grid item sets a new formatting context for its content, preventing any 'float' protruding content on the adjoining grid item." />
+
+<style>
+.grid {
+  grid-auto-columns: minmax(50px, max-content);
+  grid-auto-rows: minmax(50px, max-content);
+}
+
+.floatChild {
+  float: left;
+  clear: both;
+}
+</style>
+</head>
+
+<body>
+
+<div>This test checks that grid item sets a new formatting context for its content, preventing any 'float' protruding content on the adjoining grid item ('Float' text shouldn't overflow the first row).</div>
+
+<div class="grid fit-content">
+  <div class="firstRowFirstColumn">
+    <div class="floatChild">Float</div>
+    <div class="floatChild">Float</div>
+    <div class="floatChild">Float</div>
+    <div class="floatChild">Float</div>
+  </div>
+  <div class="firstRowSecondColumn"></div>
+  <div class="secondRowFirstColumn"></div>
+  <div class="secondRowSecondColumn"></div>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html
new file mode 100644
index 00000000000..ce56a566456
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="stylesheet" href="/css/support/grid.css">
+
+<div>This test checks that grid item's margins do not collapse with its content's margins (single margin in the first row and double between subsequent).</div>
+
+<div style="float: left">
+  <div><p>XXXXX</p></div>
+  <div style="float:left; margin:20px 0px;">XXXXX</div>
+  <div><p style="float:left; clear:both;">XXXXX</p></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html
new file mode 100644
index 00000000000..f644a6fb53c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-margins-no-collapse-002.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>CSS Grid Layout Test: grid items not collapsing</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-containers">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=430100">
+<link rel="match" href="grid-margins-no-collapse-002-ref.html">
+<link rel="stylesheet" href="/css/support/grid.css">
+<meta name="assert" content="Test that grid item's margins do not collapse with its content's margins." />
+
+<div>This test checks that grid item's margins do not collapse with its content's margins (single margin in the first row and double between subsequent).</div>
+
+<div style="display: grid;">
+  <div><p>XXXXX</p></div>
+  <div style="margin:20px 0px;">XXXXX</div>
+  <div><p>XXXXX</p></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html
new file mode 100644
index 00000000000..5144450dd8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<title>CSS Grid: track sizing algo with size restrictions and intrinsic sizes.</title>
+<link rel="author" title="Sergio Villar" href="mailto:svillar@igalia.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#layout-algorithm"/>
+<meta name="assert" content="This test ensures that fr tracks are properly sized whenever grid has intrinsic sizes."/>
+<link rel="issue" href="https://crbug.com/423743"/>
+<link href="/css/support/width-keyword-classes.css" rel="stylesheet"/>
+<link href="/css/support/height-keyword-classes.css" rel="stylesheet"/>
+<link href="/css/support/grid.css" rel="stylesheet"/>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+
+<style>
+.container {
+    width: 100px;
+    height: 100px;
+}
+
+.grid {
+  grid-template-columns: 1fr;
+  grid-template-rows: 1fr;
+}
+
+div { font: 10px/1 Ahem; }
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script type="text/javascript">
+  setup({ explicit_done: true });
+</script>
+
+<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
+
+<div class="container">
+  <div class="grid" data-expected-width="100" data-expected-height="10">
+    <div>XXX XXX</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid min-content" data-expected-width="30" data-expected-height="20">
+    <div>XXX XXX</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid max-content" data-expected-width="70" data-expected-height="10">
+    <div>XXX XXX</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid fit-content" data-expected-width="70" data-expected-height="10">
+    <div>XXX XXX</div>
+  </div>
+</div>
+
+<div class="min-content">
+    <div class="grid" data-expected-width="40" data-expected-height="50">
+        <div>XXX XXXX XX X XX XXX</div>
+    </div>
+</div>
+
+<div class="grid container" data-expected-width="100" data-expected-height="100">
+    <div style="display: grid; grid-template-columns: 3fr; grid-template-rows: 2fr;" data-expected-width="100" data-expected-height="100">
+        <div>XXX XXXX XX X XX XXX</div>
+    </div>
+</div>
+
+<div class="grid" style="grid; grid: 1fr 2fr / 2fr 1fr; width: 300px; height: 300px;" data-expected-width="300" data-expected-height="300">
+    <div class="firstRowFirstColumn" style="display: grid; grid: 1fr 3fr / 3fr 1fr;" data-expected-width="200" data-expected-height="100">
+        <div style="border: 2px solid magenta;" data-expected-width="150" data-expected-height="25">XXXX</div>
+        <div class="secondRowSecondColumn" style="border: 2px solid cyan;" data-expected-width="50" data-expected-height="75">XXXX XX XX</div>
+    </div>
+    <div class="secondRowSecondColumn" style="display: grid; grid: 3fr 4fr / 4fr 3fr;" data-expected-width="100" data-expected-height="200">
+        <div style="border: 2px solid lime;" data-expected-width="56" data-expected-height="86">XXX XX X</div>
+        <div class="secondRowSecondColumn" style="border: 2px solid navy;" data-expected-width="44" data-expected-height="114">XXXX XXX XXXX XXX XXXX</div>
+    </div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html
new file mode 100644
index 00000000000..6ae1c50c220
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<title>CSS Grid: 'auto' sizes with item's margins</title>
+<link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#layout-algorithm">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=357419">
+<meta name="assert" content="Check that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins."/>
+<link href="/css/support/grid.css" rel="stylesheet">
+<link href="/css/support/width-keyword-classes.css" rel="stylesheet">
+
+<style>
+.grid {
+    grid-template-rows: auto auto;
+    grid-template-columns: auto auto;
+}
+
+.gridItem {
+    width: 20px;
+    height: 40px;
+}
+
+.marginTop {
+    margin-top: 20px;
+}
+
+.marginBottom {
+    margin-bottom: 20px;
+}
+
+.borderTop {
+    border-top: 5px solid;
+}
+
+.borderBottom {
+    border-bottom: 5px solid;
+}
+
+.paddingTop {
+    padding-top: 10px;
+}
+
+.paddingBottom {
+    padding-bottom: 10px;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.grid')">
+<div>
+    <div class="grid fit-content" data-expected-width="40" data-expected-height="120">
+        <div class="gridItem marginTop firstRowFirstColumn"></div>
+        <div class="gridItem firstRowSecondColumn"></div>
+        <div class="gridItem marginBottom secondRowFirstColumn"></div>
+        <div class="gridItem secondRowSecondColumn"></div>
+    </div>
+</div>
+
+<div>
+    <div class="grid fit-content" data-expected-width="40" data-expected-height="120">
+        <div class="gridItem marginTop paddingTop firstRowFirstColumn"></div>
+        <div class="gridItem firstRowSecondColumn"></div>
+        <div class="gridItem borderTop borderBottom secondRowFirstColumn"></div>
+        <div class="gridItem secondRowSecondColumn"></div>
+    </div>
+</div>
+
+<div>
+    <div class="grid fit-content" data-expected-width="40" data-expected-height="120">
+        <div class="gridItem marginTop paddingTop firstRowFirstColumn"></div>
+        <div class="gridItem firstRowSecondColumn"></div>
+        <div class="gridItem borderTop borderBottom secondRowFirstColumn"></div>
+        <div class="gridItem secondRowSecondColumn"></div>
+    </div>
+</div>
+
+<div>
+    <div class="grid fit-content" data-expected-width="40" data-expected-height="120">
+        <div class="gridItem marginTop paddingTop firstRowFirstColumn"></div>
+        <div class="gridItem firstRowSecondColumn"></div>
+        <div class="gridItem paddingBottom secondRowFirstColumn"></div>
+        <div class="gridItem secondRowSecondColumn"></div>
+    </div>
+</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html
new file mode 100644
index 00000000000..e41dacc0b54
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>CSS Masking: Test ancestors update as text descendants change</title>
+<link rel="author" title="Fredrik Söderquist" href="mailto:fs@opera.com">
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=901851">
+<link rel="match" href="reference/clip-path-descendant-text-mutated-001-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<meta name="assert" content="This test ensures that ancestors are updated properly when a text descendant of clip path property changes.">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+#target {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+  border-right: 100px solid red;
+  clip-path: url(#clip);
+}
+</style>
+<div id="target"></div>
+<svg>
+  <clipPath id="clip">
+    <text id="text" y="80" font-family="Ahem" font-size="100">XX</text>
+  </clipPath>
+</svg>
+<script>
+  waitForAtLeastOneFrame().then(function() {
+      text.firstChild.data = 'X';
+      takeScreenshot();
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html
new file mode 100644
index 00000000000..f718ea6abfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/reference/clip-path-descendant-text-mutated-001-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-003.html b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-003.html
new file mode 100644
index 00000000000..2e1d799bd0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-003.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<title>CSS Test: @keyframes applies to :host.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#shadow-names">
+<div id="host"></div>
+<script>
+  test(function() {
+    host.attachShadow({ mode: "open" }).innerHTML = `
+      <style>
+        @keyframes myanim {
+          from { background: red; }
+          to { background: green; }
+        }
+        :host {
+          width: 100px;
+          height: 100px;
+          background: blue;
+          animation: myanim 10s infinite;
+        }
+      </style>
+    `;
+
+    assert_equals(document.getElementById('host').getAnimations().length, 1);
+  }, "@keyframes applies to the shadow host");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-004.html b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-004.html
new file mode 100644
index 00000000000..67924fb01cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-004.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<title>CSS Test: @keyframes applies to ::slotted.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#shadow-names">
+<div id="host"><div id="in-document"></div></div>
+<script>
+  test(function() {
+    host.attachShadow({ mode: "open" }).innerHTML = `
+      <style>
+        @keyframes myanim {
+          from { background: red; }
+          to { background: green; }
+        }
+        ::slotted(#in-document) {
+          width: 100px;
+          height: 100px;
+          background: blue;
+          animation: myanim 10s infinite;
+        }
+      </style>
+      <slot />
+    `;
+
+    assert_equals(document.getElementById('in-document').getAnimations().length, 1);
+  }, "@keyframes in shadow tree applies to the slotted element");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-005.html b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-005.html
new file mode 100644
index 00000000000..d9026d2f6aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-005.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<title>CSS Test: @keyframes should not leak out of shadow tree.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#shadow-names">
+<style>
+  #host {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    animation: myanim 10s infinite;
+  }
+</style>
+<div id="host"></div>
+<script>
+  test(function() {
+    host.attachShadow({ mode: "open" }).innerHTML = `
+      <style>
+        @keyframes myanim {
+          from { background: red; }
+          to { background: green; }
+        }
+      </style>
+    `;
+
+    assert_equals(document.getElementById('host').getAnimations().length, 0);
+  }, "@keyframes should not leak out of the shadow tree.");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html b/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html
index e621545772d..e9e5252194b 100644
--- a/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/reference/text-underline-position-from-font-variable-ref.html
@@ -18,17 +18,18 @@ src: url(../resources/UnderlineTest-Far.ttf);
 }
 
 .test {
-text-decoration: underline;
 text-underline-position: from-font;
 font-size: 64px;
 line-height: 1.8;
 }
 
 .close_underline {
+text-decoration: underline;
 font-family: underline-close;
 }
 
 .far_underline {
+text-decoration: underline;
 font-family: underline-far;
 }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html b/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html
index 0459a2ea1d4..dc7ede0cd1f 100644
--- a/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/text-underline-position-from-font-variable.html
@@ -14,18 +14,19 @@ src: url(resources/UnderlineTest-VF.ttf);
 }
 
 .test {
-text-decoration: underline;
 text-underline-position: from-font;
 font-size: 64px;
 line-height: 1.8;
 }
 
 .close_underline {
+text-decoration: underline;
 font-family: underline-variable, sans-serif;
 font-variation-settings: 'UNDO' 1;
 }
 
 .far_underline {
+text-decoration: underline;
 font-family: underline-variable, sans-serif;
 font-variation-settings: 'UNDO' 1000;
 }
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-reset-style-delete-crash.html b/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-reset-style-delete-crash.html
new file mode 100644
index 00000000000..e1c0eb9aeca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/effect-reference-reset-style-delete-crash.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>CSS Filters: Crash when a SVG filter is deleted</title>
+<link rel="author" title="Stephen White" href="mailto:senorblanco@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-1/#FilterElement">
+<link rel="issue" href="https://bugs.webkit.org/show_bug.cgi?id=90405">
+<meta name="assert" content="Check that crash doesn't happen when a SVG filter is deleted that used to be referenced by an HTML element but is no longer.">
+<body>
+  <img id="html" style="filter: url(#MyFilter);" src="support/color-palette.png">
+  <svg xmlns="http://www.w3.org/2000/svg" width="0" height="0" version="1.1" id="svg">
+    <defs>
+      <filter id="MyFilter">
+        <feColorMatrix type="hueRotate" values="180"/>
+      </filter>
+    </defs>
+  </svg>
+  <script>
+    html = document.getElementById('html');
+    html.style = "";
+    svg = document.getElementById('svg');
+    svg.parentNode.removeChild(svg);
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/support/height-keyword-classes.css b/tests/wpt/web-platform-tests/css/support/height-keyword-classes.css
new file mode 100644
index 00000000000..2f847795934
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/support/height-keyword-classes.css
@@ -0,0 +1,42 @@
+/* In the current spec for heights, min-content, max-content and fit-content are
+ * equivalent.
+ */
+
+.min-content {
+    height: min-content;
+}
+
+.max-content {
+    height: max-content;
+}
+
+.fit-content {
+    height: -moz-fit-content;
+    height: fit-content;
+}
+
+.max-height-min-content {
+    max-height: min-content;
+}
+
+.max-height-max-content {
+    max-height: max-content;
+}
+
+.max-height-fit-content {
+    max-height: -moz-fit-content;
+    max-height: fit-content;
+}
+
+.min-height-min-content {
+    min-height: min-content;
+}
+
+.min-height-max-content {
+    min-height: max-content;
+}
+
+.min-height-fit-content {
+    min-height: -moz-fit-content;
+    min-height: fit-content;
+}
diff --git a/tests/wpt/web-platform-tests/css/support/width-keyword-classes.css b/tests/wpt/web-platform-tests/css/support/width-keyword-classes.css
index b5c84a5d5f4..138433c1141 100644
--- a/tests/wpt/web-platform-tests/css/support/width-keyword-classes.css
+++ b/tests/wpt/web-platform-tests/css/support/width-keyword-classes.css
@@ -3,88 +3,44 @@
     unbreakable line box.
 */
 .min-content {
-    /* Webkit, but not actually implemented outside deprecated flexbox */
-    width: min-intrinsic;
-    width: -webkit-min-content;
-    width: -moz-min-content;
     width: min-content;
 }
 
 .max-content {
-    width: -webkit-max-content;
-    width: -moz-max-content;
     width: max-content;
 }
 
-/*
-    Identical to auto except for elements with an instrinsic width like an
-    img where this overrides the intrinsic width to get regular block "auto".
-*/
-.fill-available {
-    width: -webkit-fill-available;
-    /* Firefox is missing the fill- prefix because they followed an older spec */
-    width: -moz-available;
-    width: fill-available;
-}
-
 /*
    Shrink wrap just like floating.
    max(min-content, min(max-content, fill-available))
 */
 .fit-content {
-    /* Webkit, but only outside a deprecated flexbox. */
-    width: intrinsic;
-    width: -webkit-fit-content;
     width: -moz-fit-content;
     width: fit-content;
 }
 
 .max-width-min-content {
-    max-width: -webkit-min-content;
-    max-width: -moz-min-content;
     max-width: min-content;
 }
 
 .max-width-max-content {
-    max-width: -webkit-max-content;
-    max-width: -moz-max-content;
     max-width: max-content;
 }
 
-.max-width-fill-available {
-    max-width: -webkit-fill-available;
-    max-width: -moz-available;
-    max-width: fill-available;
-}
-
 .max-width-fit-content {
-    max-width: intrinsic;
-    max-width: -webkit-fit-content;
     max-width: -moz-fit-content;
     max-width: fit-content;
 }
 
 .min-width-min-content {
-    min-width: -webkit-min-content;
-    min-width: -moz-min-content;
     min-width: min-content;
 }
 
 .min-width-max-content {
-    min-width: -webkit-max-content;
-    min-width: -moz-max-content;
     min-width: max-content;
 }
 
-.min-width-fill-available {
-    min-width: -webkit-fill-available;
-    min-width: -moz-available;
-    min-width: fill-available;
-}
-
 .min-width-fit-content {
-    min-width: intrinsic;
-    min-width: -webkit-fit-content;
     min-width: -moz-fit-content;
     min-width: fit-content;
 }
diff --git a/tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html b/tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html
index 737dab117d3..246b15a0af3 100644
--- a/tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html
+++ b/tests/wpt/web-platform-tests/custom-elements/custom-element-reaction-queue.html
@@ -50,6 +50,39 @@ test_with_window(function (contentWindow) {
     assert_connected_log_entry(log[5], element2);
 }, 'Upgrading a custom element must invoke attributeChangedCallback and connectedCallback before start upgrading another element');
 
+test_with_window(function (contentWindow) {
+    const contentDocument = contentWindow.document;
+    contentDocument.write('<test-element>');
+
+    const element = contentDocument.querySelector('test-element');
+    assert_equals(Object.getPrototypeOf(element), contentWindow.HTMLElement.prototype);
+
+    let log = [];
+    class TestElement extends contentWindow.HTMLElement {
+        constructor() {
+            super();
+            this.id = "foo";
+            this.setAttribute('id', 'foo');
+            this.removeAttribute('id');
+            this.style.fontSize = '10px';
+            log.push(create_constructor_log(this));
+        }
+        connectedCallback(...args) {
+            log.push(create_connected_callback_log(this, ...args));
+        }
+        attributeChangedCallback(...args) {
+            log.push(create_attribute_changed_callback_log(this, ...args));
+        }
+        static get observedAttributes() { return ['id', 'style']; }
+    }
+    contentWindow.customElements.define('test-element', TestElement);
+    assert_equals(Object.getPrototypeOf(element), TestElement.prototype);
+
+    assert_equals(log.length, 2);
+    assert_constructor_log_entry(log[0], element);
+    assert_connected_log_entry(log[1], element);
+}, 'Upgrading a custom element must not invoke attributeChangedCallback for the attribute that is changed during upgrading');
+
 test_with_window(function (contentWindow) {
     const contentDocument = contentWindow.document;
     contentDocument.write('<test-element id="first-element">');
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
index b4a5fd4bf4d..6d48d108bbe 100644
--- a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/001.html
@@ -274,8 +274,8 @@ function reportload() {
             assert_false( cloneobj === iframe.contentWindow.history.state );
         }, 'history.state should be a clone of the original object, not a reference to it (2)');
         test(function () {
-            assert_false( iframe.contentWindow.history.state === ev.state );
-        }, 'history.state should be a separate clone of the object, not a reference to the object passed to the event handler');
+            assert_true( iframe.contentWindow.history.state === ev.state );
+        }, 'history.state should be identical to the object passed to the event handler unless history.state is updated');
         try {
             iframe.contentWindow.persistval = true;
             iframe.contentWindow.history.pushState('','', location.href.replace(/\/[^\/]*$/,'/blank3.html') );
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
index dcda248282f..c054246770f 100644
--- a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/002.html
@@ -249,8 +249,8 @@ function reportload() {
             assert_false( cloneobj === iframe.contentWindow.history.state );
         }, 'history.state should be a clone of the original object, not a reference to it (2)');
         test(function () {
-            assert_false( iframe.contentWindow.history.state === ev.state );
-        }, 'history.state should be a separate clone of the object, not a reference to the object passed to the event handler');
+            assert_true( iframe.contentWindow.history.state === ev.state );
+        }, 'history.state should be identical to the object passed to the event handler unless history.state is updated');
         try {
             iframe.contentWindow.persistval = true;
             iframe.contentWindow.history.replaceState('','', location.href.replace(/\/[^\/]*$/,'/blank3.html') );
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html
new file mode 100644
index 00000000000..a5e108dcd6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/currentSrc-blob-cache.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>currentSrc is right even if underlying image is a shared blob</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1625786">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<img id="first">
+<img id="second">
+<script>
+promise_test(async t => {
+  let canvas = document.createElement("canvas");
+  canvas.width = 100;
+  canvas.height = 100;
+  let ctx = canvas.getContext("2d");
+  ctx.fillStyle = "green";
+  ctx.rect(0, 0, 100, 100);
+  ctx.fill();
+
+  let blob = await new Promise(resolve => canvas.toBlob(resolve));
+
+  let first = document.querySelector("#first");
+  let second = document.querySelector("#second");
+
+  let firstLoad = new Promise(resolve => {
+    first.addEventListener("load", resolve, { once: true });
+  });
+
+  let secondLoad = new Promise(resolve => {
+    second.addEventListener("load", resolve, { once: true });
+  });
+
+  let uri1 = URL.createObjectURL(blob);
+  let uri2 = URL.createObjectURL(blob);
+  first.src = uri1;
+  second.src = uri2;
+
+  await firstLoad;
+  await secondLoad;
+
+  assert_equals(first.src, first.currentSrc);
+  assert_equals(second.src, second.currentSrc);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/webauthn.idl b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
index 8dceeb5768b..34a3df1ce1a 100644
--- a/tests/wpt/web-platform-tests/interfaces/webauthn.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
@@ -165,65 +165,6 @@ partial dictionary AuthenticationExtensionsClientInputs {
   USVString appidExclude;
 };
 
-partial dictionary AuthenticationExtensionsClientInputs {
-  USVString txAuthSimple;
-};
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  USVString txAuthSimple;
-};
-
-dictionary txAuthGenericArg {
-    required USVString contentType;    // MIME-Type of the content, e.g., "image/png"
-    required ArrayBuffer content;
-};
-
-partial dictionary AuthenticationExtensionsClientInputs {
-  txAuthGenericArg txAuthGeneric;
-};
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  ArrayBuffer txAuthGeneric;
-};
-
-typedef sequence<AAGUID> AuthenticatorSelectionList;
-
-partial dictionary AuthenticationExtensionsClientInputs {
-  AuthenticatorSelectionList authnSel;
-};
-
-typedef BufferSource      AAGUID;
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  boolean authnSel;
-};
-
-partial dictionary AuthenticationExtensionsClientInputs {
-  boolean exts;
-};
-
-typedef sequence<USVString> AuthenticationExtensionsSupported;
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  AuthenticationExtensionsSupported exts;
-};
-
-partial dictionary AuthenticationExtensionsClientInputs {
-  boolean uvi;
-};
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  ArrayBuffer uvi;
-};
-
-partial dictionary AuthenticationExtensionsClientInputs {
-  boolean loc;
-};
-
-partial dictionary AuthenticationExtensionsClientOutputs {
-  GeolocationCoordinates loc;
-};
-
 partial dictionary AuthenticationExtensionsClientInputs {
   boolean uvm;
 };
@@ -235,11 +176,6 @@ partial dictionary AuthenticationExtensionsClientOutputs {
   UvmEntries uvm;
 };
 
-dictionary AuthenticatorBiometricPerfBounds {
-    float FAR;
-    float FRR;
-};
-
 partial dictionary AuthenticationExtensionsClientInputs {
     boolean credProps;
 };
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/script-access.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/script-access.tentative.html
new file mode 100644
index 00000000000..3ecfce55aa3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/script-access.tentative.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<title>Declarative Shadow DOM</title>
+<link rel='author' title='Mason Freed' href='mailto:masonfreed@chromium.org'>
+<link rel='help' href='https://github.com/whatwg/dom/issues/831'>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<body>
+<script>
+let templatesSeen = 0;
+function myObserver(mutationsList, observer) {
+  for (let mutation of mutationsList) {
+    for (let n of mutation.addedNodes) {
+      if (n.localName === 'template') {
+        templatesSeen++;
+        switch (mutation.target.id) {
+          case 'openhost':
+          case 'closedhost':
+            const shadowroot = n.getAttribute('shadowroot');
+            assert_in_array(shadowroot, ['open','closed'], 'Declarative template should have shadowroot attribute');
+            assert_equals(n.content, null, 'Declarative template content should be null');
+            assert_equals(n.innerHTML, "", 'Declarative template innerHTML should be empty');
+
+            // Make sure removing the shadowroot attribute doesn't affect things.
+            n.removeAttribute('shadowroot');
+            assert_equals(n.content, null, 'Declarative template content should *still* be null');
+            assert_equals(n.innerHTML, "", 'Declarative template innerHTML should *still* be empty');
+            break;
+          case 'noroot':
+            // Make sure adding 'shadowroot' attribute doesn't trigger a shadow root,
+            // even if added before parsing completes.
+            n.setAttribute('shadowroot','open');
+            assert_not_equals(n.content, null, 'Regular template should have content, even after adding shadowroot attribute');
+            assert_not_equals(n.innerHTML, "", 'Regular template should have innerHTML, even after adding shadowroot attribute');
+            break;
+          default:
+            assert_unreached('Unrecognized template');
+        }
+      }
+    }
+  }
+}
+const observer = new MutationObserver(myObserver);
+observer.observe(document.body, { childList: true, subtree: true });
+assert_equals(templatesSeen, 0, 'No mutations yet');
+</script>
+
+<div id=openhost>
+  <template shadowroot=open>
+    <slot></slot>
+  </template>
+</div>
+
+<div id=closedhost>
+  <template shadowroot=closed>
+    <slot></slot>
+  </template>
+</div>
+
+<div id=noroot>
+  <template>
+    <slot></slot>
+  </template>
+</div>
+
+<script>
+test(t => {
+  t.add_cleanup(function() { observer.disconnect(); });
+
+  assert_equals(templatesSeen, 3);
+
+  // Open shadow root
+  let host = document.querySelector('#openhost');
+  assert_equals(host.querySelector('template'), null, 'No leftover template node');
+  assert_true(!!host.shadowRoot, 'Shadow root should exist');
+
+  // Closed shadow root
+  host = document.querySelector('#closedhost');
+  assert_equals(host.querySelector('template'), null, 'No leftover template node');
+  assert_true(!host.shadowRoot, 'Closed shadow root (can\'t detect)');
+
+  // No shadow root
+  host = document.querySelector('#noroot');
+  assert_true(!!host.querySelector('template'), 'Template node still present');
+  assert_true(!host.shadowRoot, 'No shadow root');
+},'Declarative Shadow DOM: template .content() should be null');
+</script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html b/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html
new file mode 100644
index 00000000000..7835597d961
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask-ref.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+</head>
+
+<body>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px;"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px;"></div>
+    </foreignObject>
+  </svg>
+
+  <!-- make sure masking actually works -->
+  <svg width="200" height="200">
+      <rect x="0" y="0" width="100" height="50" fill="red"></rect>
+      <rect x="0" y="100" width="100" height="50" fill="red"></rect>
+  </svg>
+  <svg width="200" height="200">
+      <rect x="0" y="0" width="100" height="50" fill="red"></rect>
+      <rect x="0" y="100" width="100" height="50" fill="red"></rect>
+  </svg>
+
+  <!-- make sure masking works on active content -->
+  <svg width="200" height="200">
+    <rect x="0" y="0" width="100" height="50" fill="red"></rect>
+    <rect x="0" y="100" width="100" height="50" fill="red"></rect>
+  </svg>
+  <svg width="200" height="200">
+    <rect x="0" y="0" width="100" height="50" fill="red"></rect>
+    <rect x="0" y="100" width="100" height="50" fill="red"></rect>
+  </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask.html b/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask.html
new file mode 100644
index 00000000000..5a746c9fdae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/painting/reftests/display-none-mask.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="match"  href="display-none-mask-ref.html" />
+</head>
+
+<body>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200" style="mask: url('#notfound');">
+      <div style="width: 200px; height: 200px; background: red"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200" style="mask: url('#noneMask');">
+      <div style="width: 200px; height: 200px; background: red"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red; mask: url('#notfound');"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red; mask: url('#noneMask');"></div>
+    </foreignObject>
+  </svg>
+
+  <svg width="200" height="200" style="display:none">
+    <defs>
+      <mask id="noneMask">
+        <rect x="0" y="0" width="200" height="200" fill="#4d4d4d"></rect>
+      </mask>
+    </defs>
+  </svg>
+
+  <!-- make sure masking actually works -->
+  <svg width="200" height="200">
+    <defs>
+      <mask id="aMask">
+        <rect x="0" y="0" width="100" height="50" fill="#ffffff"></rect>
+        <rect x="0" y="100" width="100" height="50" fill="#ffffff"></rect>
+      </mask>
+    </defs>
+    <foreignObject x="0" y="0" width="200" height="200" style="mask: url('#aMask');">
+      <div style="width: 200px; height: 200px; background: red;"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red; mask: url('#aMask');"></div>
+    </foreignObject>
+  </svg>
+
+  <!-- make sure masking works on active content -->
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200" style="mask: url('#aMask');">
+      <div style="width: 200px; height: 200px; background: red; will-change: transform"></div>
+    </foreignObject>
+  </svg>
+  <svg width="200" height="200">
+    <foreignObject x="0" y="0" width="200" height="200">
+      <div style="width: 200px; height: 200px; background: red; will-change: transform; mask: url('#aMask');"></div>
+    </foreignObject>
+  </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/sprites.svg b/tests/wpt/web-platform-tests/svg/struct/reftests/support/sprites.svg
new file mode 100644
index 00000000000..f73b8851913
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/support/sprites.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <rect id="green-rect" width="100" height="100" fill="green"/>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg b/tests/wpt/web-platform-tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg
new file mode 100644
index 00000000000..830d4555e5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/use-adopted-with-external-resource.tentative.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
+  <title>Adopting a &#x3c;use&#x3e; (from an inactive document) requests an external resource</title>
+  <h:link rel="match" href="reference/green-100x100.svg"/>
+  <script type="text/plain" template=""><![CDATA[
+    <svg xmlns="http://www.w3.org/2000/svg">
+      <use href="support/sprites.svg#green-rect"/>
+    </svg>]]>
+  </script>
+  <script>
+    let text = document.querySelector('script[template]').textContent;
+    let doc = new DOMParser().parseFromString(text, 'image/svg+xml');
+    document.documentElement.appendChild(doc.documentElement);
+  </script>
+</svg>
diff --git a/tests/wpt/web-platform-tests/tools/ci/jobs.py b/tests/wpt/web-platform-tests/tools/ci/jobs.py
index 3d809efa37c..a8ae5d237a4 100644
--- a/tests/wpt/web-platform-tests/tools/ci/jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/jobs.py
@@ -41,7 +41,10 @@ job_path_map = {
                      "css/css-ui/",
                      "WebIDL"],
     "wpt_integration": ["tools/"],
-    "wptrunner_infrastructure": ["infrastructure/", "tools/", "resources/"],
+    "wptrunner_infrastructure": ["infrastructure/",
+                                 "tools/",
+                                 "resources/",
+                                 "webdriver/tests/support"],
 }
 
 
diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
index 94f7998770c..3790c04e7b2 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
@@ -134,3 +134,7 @@ def test_wpt_infrastructure():
                          includes=["wptrunner_infrastructure"]) == {"wptrunner_infrastructure"}
     assert jobs.get_jobs(["infrastructure/assumptions/ahem.html"],
                          includes=["wptrunner_infrastructure"]) == {"wptrunner_infrastructure"}
+
+def test_wdspec_support():
+    assert jobs.get_jobs(["webdriver/tests/support/__init__.py"],
+                         includes=["wptrunner_infrastructure"]) == {"wptrunner_infrastructure"}
diff --git a/tests/wpt/web-platform-tests/trust-tokens/end-to-end/has-trust-token.tentative.https.html b/tests/wpt/web-platform-tests/trust-tokens/end-to-end/has-trust-token.tentative.https.html
deleted file mode 100644
index 17e037f7393..00000000000
--- a/tests/wpt/web-platform-tests/trust-tokens/end-to-end/has-trust-token.tentative.https.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Tests the Trust Token API's hasTrustToken function (tentative: the API is a prototype).</title>
-<link rel="help" href="https://github.com/WICG/trust-token-api#trust-token-redemption" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script>
-  'use strict';
-
-  promise_test((t) => {
-      return promise_rejects_js(t, TypeError, document.hasTrustToken(
-        "http://not-a-secure-url.example"));
-    },
-    'hasTrustToken requires a secure URL as its issuer argument.');
-
-  promise_test((t) => {
-      return promise_rejects_js(t, TypeError, document.hasTrustToken(
-        "file:///"));
-    },
-    'hasTrustToken requires a HTTP(S) URL as its issuer argument.');
-
-  // These hasTrustToken calls all affect global state: each call in the form
-  // of hasTrustToken(issuer) will result in |issuer| becoming associated in
-  // persistent storage with the calling top frame's origin.
-  //
-  // TODO(davidvc, crbug.com/1061764): Add a way to reset the global state after
-  // the test concludes.
-  //
-  // TODO(davidvc, crbug.com/1063140): Once it's possible to write WPTs that
-  // result in a trust token being deposited in storage, this should be
-  // expanded to cover the case where the user _does_ have a token.
-  promise_test(async (t) => {
-      let result = await document.hasTrustToken("https://issuer.example/");
-      assert_false(result, "The client should not possess any trust tokens for " +
-        "https://issuer.example since it has not executed an issuance operation" +
-        " against that issuer.");
-
-      result = await document.hasTrustToken("https://issuer2.example/");
-      assert_false(result, "The client should not possess any trust tokens for" +
-        " https://issuer2.example since it has not executed an issuance " +
-        "operation against that issuer.");
-
-      await promise_rejects_dom(t, "OperationError", document.hasTrustToken(
-          "https://issuer3.example/"),
-        "The first two hasTrustToken operations associated this top-level" +
-        " origin with the maximum number of issuers (2), so an attempt to " +
-        " execute hasTrustToken against another issuer should fail.");
-
-      result = await document.hasTrustToken("https://issuer2.example/");
-      assert_false(result, "Since this top-level origin is already associated " +
-        "with https://issuer2.example, subsequent hasTrustToken operations should " +
-        "not error out even though the top-level origin is at its " +
-        "number-of-issuers limit.");
-    }, "When given a valid, secure origin, hasTrustToken should succeed " +
-    "unless associating that origin with the top-level domain would exceed " +
-    "the top-level origin's number-of-associated-issuers limit.");
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html
new file mode 100644
index 00000000000..a3fd115563b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Accumulation for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties1, 'testAccumulation');
+}, 'Setup');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html
new file mode 100644
index 00000000000..5cf411edf6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Accumulation for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties2, 'testAccumulation');
+}, 'Setup');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property.html
deleted file mode 100644
index 420617d1194..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Accumulation for each property</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<script src="property-list.js"></script>
-<script src="property-types.js"></script>
-<style>
-html {
-  font-size: 10px;
-}
-</style>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(function() {
-  for (const property in gCSSProperties) {
-    if (!isSupported(property)) {
-      continue;
-    }
-
-    const setupFunction = gCSSProperties[property].setup;
-    for (const animationType of gCSSProperties[property].types) {
-      let typeObject;
-      let animationTypeString;
-      if (typeof animationType === 'string') {
-        typeObject = types[animationType];
-        animationTypeString = animationType;
-      } else if (typeof animationType === 'object' &&
-                 animationType.type && typeof animationType.type === 'string') {
-        typeObject = types[animationType.type];
-        animationTypeString = animationType.type;
-      }
-
-      // First, test that the animation type object has 'testAccumulation'.
-      // We use test() function here so that we can continue the remainder tests
-      // even if this test fails.
-      test(t => {
-        assert_own_property(typeObject, 'testAccumulation', animationTypeString +
-                            ' should have testAccumulation property');
-        assert_equals(typeof typeObject.testAccumulation, 'function',
-                      'testAccumulation method should be a function');
-      }, `${property} (type: ${animationTypeString}) has testAccumulation`
-         + ' function');
-
-      if (typeObject.testAccumulation &&
-          typeof typeObject.testAccumulation === 'function') {
-        typeObject.testAccumulation(property,
-                                setupFunction,
-                                animationType.options);
-      }
-    }
-  }
-}, 'Setup');
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001.html
new file mode 100644
index 00000000000..2fbec2c4cd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Addition for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties1, 'testAddition');
+}, "Setup");
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002.html
new file mode 100644
index 00000000000..3b1c40e3c73
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Addition for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties2, 'testAddition');
+}, "Setup");
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property.html
deleted file mode 100644
index f17eedabbdd..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Addition for each property</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<script src="property-list.js"></script>
-<script src="property-types.js"></script>
-<style>
-html {
-  font-size: 10px;
-}
-</style>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(function() {
-  for (const property in gCSSProperties) {
-    if (!isSupported(property)) {
-      continue;
-    }
-
-    const setupFunction = gCSSProperties[property].setup;
-    for (const animationType of gCSSProperties[property].types) {
-      let typeObject;
-      let animationTypeString;
-      if (typeof animationType === 'string') {
-        typeObject = types[animationType];
-        animationTypeString = animationType;
-      } else if (typeof animationType === 'object' &&
-                 animationType.type && typeof animationType.type === 'string') {
-        typeObject = types[animationType.type];
-        animationTypeString = animationType.type;
-      }
-
-      // First, test that the animation type object has 'testAddition'.
-      // We use test() function here so that we can continue the remainder tests
-      // even if this test fails.
-      test(t => {
-        assert_own_property(typeObject, 'testAddition', animationTypeString +
-                            ' should have testAddition property');
-        assert_equals(typeof typeObject.testAddition, 'function',
-                      'testAddition method should be a function');
-      }, `${property} (type: ${animationTypeString}) has testAddition`
-         + ' function');
-
-      if (typeObject.testAddition &&
-          typeof typeObject.testAddition === 'function') {
-        typeObject.testAddition(property,
-                                setupFunction,
-                                animationType.options);
-      }
-    }
-  }
-}, "Setup");
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html
new file mode 100644
index 00000000000..97f28224733
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Interpolation for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties1, 'testInterpolation');
+}, 'Setup');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html
new file mode 100644
index 00000000000..9ccc613cfc6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Interpolation for each property</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<script src="property-list.js"></script>
+<script src="property-types.js"></script>
+<script src="property-utils.js"></script>
+<style>
+html {
+  font-size: 10px;
+}
+</style>
+<body>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  runAnimationTypeTest(gCSSProperties2, 'testInterpolation');
+}, 'Setup');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property.html b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property.html
deleted file mode 100644
index fe23d89fd06..00000000000
--- a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Interpolation for each property</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#animation-types">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../testcommon.js"></script>
-<script src="property-list.js"></script>
-<script src="property-types.js"></script>
-<style>
-html {
-  font-size: 10px;
-}
-</style>
-<body>
-<div id="log"></div>
-<script>
-'use strict';
-
-test(function() {
-  for (const property in gCSSProperties) {
-    if (!isSupported(property)) {
-      continue;
-    }
-
-    const setupFunction = gCSSProperties[property].setup;
-    for (const animationType of gCSSProperties[property].types) {
-      let typeObject;
-      let animationTypeString;
-      if (typeof animationType === 'string') {
-        typeObject = types[animationType];
-        animationTypeString = animationType;
-      } else if (typeof animationType === 'object' &&
-                 animationType.type && typeof animationType.type === 'string') {
-        typeObject = types[animationType.type];
-        animationTypeString = animationType.type;
-      }
-
-      // First, test that the animation type object has 'testInterpolation'.
-      // We use test() function() here so that we can continue the remainder tests
-      // even if this test fails.
-      test(t => {
-        assert_own_property(typeObject, 'testInterpolation', animationTypeString +
-                            ' should have testInterpolation property');
-        assert_equals(typeof typeObject.testInterpolation, 'function',
-                      'testInterpolation method should be a function');
-      }, `${property} (type: ${animationTypeString}) has testInterpolation`
-         + ' function');
-
-      if (typeObject.testInterpolation &&
-          typeof typeObject.testInterpolation === 'function') {
-        typeObject.testInterpolation(property,
-                                     setupFunction,
-                                     animationType.options);
-      }
-    }
-  }
-}, 'Setup');
-</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js
index 2f91ebc372c..32de670ed3c 100644
--- a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-list.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const gCSSProperties = {
+const gCSSProperties1 = {
   'align-content': {
     // https://drafts.csswg.org/css-align/#propdef-align-content
     types: [
@@ -701,6 +701,9 @@ const gCSSProperties = {
       { type: 'discrete', options: [ [ '1 2', '3 4' ] ] }
     ]
   },
+};
+
+const gCSSProperties2 = {
   'inline-size': {
     // https://drafts.csswg.org/css-logical-props/#propdef-inline-size
     types: [
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-utils.js b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-utils.js
new file mode 100644
index 00000000000..d3a7b12a61f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/animation-types/property-utils.js
@@ -0,0 +1,38 @@
+'use strict';
+
+function runAnimationTypeTest(gCSSProperties, testType) {
+  for (const property in gCSSProperties) {
+    if (!isSupported(property)) {
+      continue;
+    }
+
+    const setupFunction = gCSSProperties[property].setup;
+    for (const animationType of gCSSProperties[property].types) {
+      let typeObject;
+      let animationTypeString;
+      if (typeof animationType === 'string') {
+        typeObject = types[animationType];
+        animationTypeString = animationType;
+      } else if (typeof animationType === 'object' &&
+                 animationType.type && typeof animationType.type === 'string') {
+        typeObject = types[animationType.type];
+        animationTypeString = animationType.type;
+      }
+
+      // First, test that the animation type object has 'testAccumulation', or
+      // 'testAddition', or 'testInterpolation'.
+      // We use test() function here so that we can continue the remainder tests
+      // even if this test fails.
+      test(t => {
+        assert_own_property(typeObject, testType, animationTypeString +
+                            ` should have ${testType} property`);
+        assert_equals(typeof typeObject[testType], 'function',
+                      `${testType} method should be a function`);
+      }, `${property} (type: ${animationTypeString}) has ${testType} function`);
+
+      if (typeObject[testType] && typeof typeObject[testType] === 'function') {
+        typeObject[testType](property, setupFunction, animationType.options);
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/webgpu/constants.js b/tests/wpt/web-platform-tests/webgpu/common/constants.js
similarity index 96%
rename from tests/wpt/web-platform-tests/webgpu/constants.js
rename to tests/wpt/web-platform-tests/webgpu/common/constants.js
index 28771fb0e3e..9d3dd1a32de 100644
--- a/tests/wpt/web-platform-tests/webgpu/constants.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/constants.js
@@ -2,12 +2,12 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-// https://github.com/gpuweb/gpuweb/blob/402b69138fbedf4a3c9c85cd1bf7e1cc27c1b34e/spec/index.bs
+// https://github.com/gpuweb/gpuweb/blob/0a48816412b5d08a5fb8b89005e019165a1a2c63/spec/index.bs
 // String enums
 export let ExtensionName;
 
 (function (ExtensionName) {
-  ExtensionName["AnisotropicFiltering"] = "anisotropic-filtering";
+  ExtensionName["TextureCompressionBC"] = "texture-compression-bc";
 })(ExtensionName || (ExtensionName = {}));
 
 export let AddressMode;
@@ -25,8 +25,10 @@ export let BindingType;
   BindingType["StorageBuffer"] = "storage-buffer";
   BindingType["ReadonlyStorageBuffer"] = "readonly-storage-buffer";
   BindingType["Sampler"] = "sampler";
+  BindingType["ComparisonSampler"] = "comparison-sampler";
   BindingType["SampledTexture"] = "sampled-texture";
-  BindingType["StorageTexture"] = "storage-texture";
+  BindingType["ReadonlyStorageTexture"] = "readonly-storage-texture";
+  BindingType["WriteonlyStorageTexture"] = "writeonly-storage-texture";
 })(BindingType || (BindingType = {}));
 
 export let BlendFactor;
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/allowed_characters.js b/tests/wpt/web-platform-tests/webgpu/common/framework/allowed_characters.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/allowed_characters.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/allowed_characters.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/collect_garbage.js b/tests/wpt/web-platform-tests/webgpu/common/framework/collect_garbage.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/collect_garbage.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/collect_garbage.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/fixture.js b/tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js
similarity index 98%
rename from tests/wpt/web-platform-tests/webgpu/framework/fixture.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js
index 11b5f405456..55f8ec48b22 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/fixture.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/fixture.js
@@ -4,7 +4,7 @@
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { assert } from './util/index.js';
+import { assert } from './util/util.js';
 export class SkipTestCase extends Error {} // A Fixture is a class used to instantiate each test case at run time.
 // A new instance of the Fixture is created for every single test case
 // (i.e. every time the test function is run).
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/generate_minimal_query_list.js b/tests/wpt/web-platform-tests/webgpu/common/framework/generate_minimal_query_list.js
similarity index 98%
rename from tests/wpt/web-platform-tests/webgpu/framework/generate_minimal_query_list.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/generate_minimal_query_list.js
index 12311acac05..f5344545725 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/generate_minimal_query_list.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/generate_minimal_query_list.js
@@ -3,7 +3,7 @@
 **/
 
 import { Logger } from './logger.js';
-import { makeFilter } from './test_filter/index.js';
+import { makeFilter } from './test_filter/load_filter.js';
 import { treeFromFilterResults } from './tree.js';
 
 function makeQuerySplitterTree(caselist, expectationStrings) {
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/gpu/implementation.js b/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js
similarity index 90%
rename from tests/wpt/web-platform-tests/webgpu/framework/gpu/implementation.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js
index 653b60ab433..670872b5d6e 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/gpu/implementation.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/gpu/implementation.js
@@ -3,7 +3,7 @@
 **/
 
 /// <reference types="@webgpu/types" />
-import { assert } from '../util/index.js';
+import { assert } from '../util/util.js';
 let impl = undefined;
 export function getGPU() {
   if (impl) {
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/id.js b/tests/wpt/web-platform-tests/webgpu/common/framework/id.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/id.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/id.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/listing.js b/tests/wpt/web-platform-tests/webgpu/common/framework/listing.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/listing.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/listing.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/loader.js b/tests/wpt/web-platform-tests/webgpu/common/framework/loader.js
similarity index 87%
rename from tests/wpt/web-platform-tests/webgpu/framework/loader.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/loader.js
index 328989a8d7b..ac175a5b85f 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/loader.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/loader.js
@@ -4,7 +4,7 @@
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { loadFilter } from './test_filter/index.js';
+import { loadFilter } from './test_filter/load_filter.js';
 
 function* concat(lists) {
   for (const specs of lists) {
@@ -14,11 +14,11 @@ function* concat(lists) {
 
 class DefaultTestFileLoader {
   async listing(suite) {
-    return (await import(`../suites/${suite}/index.js`)).listing;
+    return (await import(`../../${suite}/listing.js`)).listing;
   }
 
   import(path) {
-    return import('../suites/' + path);
+    return import('../../' + path);
   }
 
 }
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/logger.js b/tests/wpt/web-platform-tests/webgpu/common/framework/logger.js
similarity index 95%
rename from tests/wpt/web-platform-tests/webgpu/framework/logger.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/logger.js
index b3ddbb61555..3f624a86e32 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/logger.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/logger.js
@@ -5,9 +5,10 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { SkipTestCase } from './fixture.js';
-import { extractPublicParams } from './params/index.js';
+import { extractPublicParams } from './params_utils.js';
 import { makeQueryString } from './url_query.js';
-import { assert, getStackTrace, now } from './util/index.js';
+import { getStackTrace } from './util/stack.js';
+import { assert, now } from './util/util.js';
 import { version } from './version.js';
 export class LogMessageWithStack extends Error {
   constructor(name, ex, includeStack = true) {
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/params.js b/tests/wpt/web-platform-tests/webgpu/common/framework/params.js
new file mode 100644
index 00000000000..f8e46b62dba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/params.js
@@ -0,0 +1,135 @@
+/**
+* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
+**/
+
+let _Symbol$iterator, _Symbol$iterator2, _Symbol$iterator3, _Symbol$iterator4;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { paramsEquals } from './params_utils.js';
+import { assert } from './util/util.js';
+export function poptions(name, values) {
+  return new POptions(name, values);
+}
+export function pbool(name) {
+  return new POptions(name, [false, true]);
+}
+export function pexclude(params, exclude) {
+  return new PExclude(params, exclude);
+}
+export function pfilter(cases, pred) {
+  return new PFilter(cases, pred);
+}
+export function pcombine(...params) {
+  return new PCombine(params);
+}
+_Symbol$iterator = Symbol.iterator;
+
+class POptions {
+  constructor(name, values) {
+    _defineProperty(this, "name", void 0);
+
+    _defineProperty(this, "values", void 0);
+
+    this.name = name;
+    this.values = values;
+  }
+
+  *[_Symbol$iterator]() {
+    for (const value of this.values) {
+      yield {
+        [this.name]: value
+      };
+    }
+  }
+
+}
+
+_Symbol$iterator2 = Symbol.iterator;
+
+class PExclude {
+  constructor(cases, exclude) {
+    _defineProperty(this, "cases", void 0);
+
+    _defineProperty(this, "exclude", void 0);
+
+    this.cases = cases;
+    this.exclude = Array.from(exclude);
+  }
+
+  *[_Symbol$iterator2]() {
+    for (const p of this.cases) {
+      if (this.exclude.every(e => !paramsEquals(p, e))) {
+        yield p;
+      }
+    }
+  }
+
+}
+
+_Symbol$iterator3 = Symbol.iterator;
+
+class PFilter {
+  constructor(cases, pred) {
+    _defineProperty(this, "cases", void 0);
+
+    _defineProperty(this, "pred", void 0);
+
+    this.cases = cases;
+    this.pred = pred;
+  }
+
+  *[_Symbol$iterator3]() {
+    for (const p of this.cases) {
+      if (this.pred(p)) {
+        yield p;
+      }
+    }
+  }
+
+}
+
+_Symbol$iterator4 = Symbol.iterator;
+
+class PCombine {
+  constructor(params) {
+    _defineProperty(this, "params", void 0);
+
+    this.params = params;
+  }
+
+  [_Symbol$iterator4]() {
+    return PCombine.cartesian(this.params);
+  }
+
+  static merge(a, b) {
+    for (const key of Object.keys(a)) {
+      assert(!b.hasOwnProperty(key), 'Duplicate key: ' + key);
+    }
+
+    return { ...a,
+      ...b
+    };
+  }
+
+  static *cartesian(iters) {
+    if (iters.length === 0) {
+      return;
+    }
+
+    if (iters.length === 1) {
+      yield* iters[0];
+      return;
+    }
+
+    const [as, ...rest] = iters;
+
+    for (const a of as) {
+      for (const b of PCombine.cartesian(rest)) {
+        yield PCombine.merge(a, b);
+      }
+    }
+  }
+
+}
+//# sourceMappingURL=params.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/params/index.js b/tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js
similarity index 85%
rename from tests/wpt/web-platform-tests/webgpu/framework/params/index.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js
index de922526696..cde89843f9e 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/params/index.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/params_utils.js
@@ -2,11 +2,7 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { objectEquals } from '../util/index.js';
-export * from './combine.js';
-export * from './exclude.js';
-export * from './filter.js';
-export * from './options.js';
+import { objectEquals } from './util/util.js';
 export function extractPublicParams(params) {
   const publicParams = {};
 
@@ -73,4 +69,4 @@ export function paramsSupersets(sup, sub) {
 
   return true;
 }
-//# sourceMappingURL=index.js.map
\ No newline at end of file
+//# sourceMappingURL=params_utils.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/filter_by_group.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/filter_by_group.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/test_filter/filter_by_group.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/filter_by_group.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/filter_one_file.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/filter_one_file.js
similarity index 98%
rename from tests/wpt/web-platform-tests/webgpu/framework/test_filter/filter_one_file.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/filter_one_file.js
index 6c634888810..cc261ad2ac1 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/filter_one_file.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/filter_one_file.js
@@ -5,7 +5,7 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { testSpecEquals } from '../id.js';
-import { paramsEquals, paramsSupersets } from '../params/index.js';
+import { paramsEquals, paramsSupersets } from '../params_utils.js';
 
 class FilterOneFile {
   constructor(specId) {
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/internal.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/internal.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/test_filter/internal.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/internal.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/load_filter.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/load_filter.js
similarity index 75%
rename from tests/wpt/web-platform-tests/webgpu/framework/test_filter/load_filter.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/load_filter.js
index 787747ead06..2b13d9ed2c9 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/load_filter.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/load_filter.js
@@ -3,21 +3,21 @@
 **/
 
 import { allowedTestNameCharacters } from '../allowed_characters.js';
-import { assert, unreachable } from '../util/index.js';
+import { assert, unreachable } from '../util/util.js';
 import { FilterByGroup } from './filter_by_group.js';
 import { FilterByParamsExact, FilterByParamsMatch, FilterByTestMatch } from './filter_one_file.js';
 // Each filter is of one of the forms below (urlencoded).
 export function makeFilter(filter) {
   const i1 = filter.indexOf(':');
-  assert(i1 !== -1, 'Test queries must fully specify their suite name (e.g. "cts:")');
+  assert(i1 !== -1, 'Test queries must fully specify their suite name (e.g. "webgpu:")');
   const suite = filter.substring(0, i1);
   const i2 = filter.indexOf(':', i1 + 1);
 
   if (i2 === -1) {
-    // - cts:
-    // - cts:buf
-    // - cts:buffers/
-    // - cts:buffers/map
+    // - webgpu:
+    // - webgpu:buf
+    // - webgpu:buffers/
+    // - webgpu:buffers/map
     const groupPrefix = filter.substring(i1 + 1);
     return new FilterByGroup(suite, groupPrefix);
   }
@@ -27,8 +27,8 @@ export function makeFilter(filter) {
   const i3sub = filter.substring(i2 + 1).search(endOfTestName);
 
   if (i3sub === -1) {
-    // - cts:buffers/mapWriteAsync:
-    // - cts:buffers/mapWriteAsync:b
+    // - webgpu:buffers/mapWriteAsync:
+    // - webgpu:buffers/mapWriteAsync:b
     const testPrefix = filter.substring(i2 + 1);
     return new FilterByTestMatch({
       suite,
@@ -46,17 +46,17 @@ export function makeFilter(filter) {
   }
 
   if (token === '~') {
-    // - cts:buffers/mapWriteAsync:basic~
-    // - cts:buffers/mapWriteAsync:basic~{}
-    // - cts:buffers/mapWriteAsync:basic~{filter:"params"}
+    // - webgpu:buffers/mapWriteAsync:basic~
+    // - webgpu:buffers/mapWriteAsync:basic~{}
+    // - webgpu:buffers/mapWriteAsync:basic~{filter:"params"}
     return new FilterByParamsMatch({
       suite,
       path
     }, test, params);
   } else if (token === '=') {
-    // - cts:buffers/mapWriteAsync:basic=
-    // - cts:buffers/mapWriteAsync:basic={}
-    // - cts:buffers/mapWriteAsync:basic={exact:"params"}
+    // - webgpu:buffers/mapWriteAsync:basic=
+    // - webgpu:buffers/mapWriteAsync:basic={}
+    // - webgpu:buffers/mapWriteAsync:basic={exact:"params"}
     return new FilterByParamsExact({
       suite,
       path
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/test_filter_result.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/test_filter_result.js
new file mode 100644
index 00000000000..9e32bdbd931
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/test_filter/test_filter_result.js
@@ -0,0 +1,4 @@
+/**
+* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
+**/
+//# sourceMappingURL=test_filter_result.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_group.js b/tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js
similarity index 97%
rename from tests/wpt/web-platform-tests/webgpu/framework/test_group.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js
index 643e9f60b31..8837b1e924a 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/test_group.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/test_group.js
@@ -5,9 +5,9 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { allowedTestNameCharacters } from './allowed_characters.js';
-import { extractPublicParams, paramsEquals } from './params/index.js';
+import { extractPublicParams, paramsEquals } from './params_utils.js';
 import { checkPublicParamType } from './url_query.js';
-import { assert } from './util/index.js';
+import { assert } from './util/util.js';
 const validNames = new RegExp('^[' + allowedTestNameCharacters + ']+$');
 export class TestGroup {
   constructor(fixture) {
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/tree.js b/tests/wpt/web-platform-tests/webgpu/common/framework/tree.js
similarity index 97%
rename from tests/wpt/web-platform-tests/webgpu/framework/tree.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/tree.js
index fd7e6704c76..8f96c980749 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/tree.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/tree.js
@@ -2,7 +2,7 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { stringifyPublicParams } from './params/index.js';
+import { stringifyPublicParams } from './params_utils.js';
 
 // e.g. iteratePath('a/b/c/d', ':') yields ['a/', 'a/b/', 'a/b/c/', 'a/b/c/d:']
 function* iteratePath(path, terminator) {
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/url_query.js b/tests/wpt/web-platform-tests/webgpu/common/framework/url_query.js
similarity index 91%
rename from tests/wpt/web-platform-tests/webgpu/framework/url_query.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/url_query.js
index 1446bc7f7f7..13671ab7dac 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/url_query.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/url_query.js
@@ -2,8 +2,8 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { stringifyPublicParams } from './params/index.js';
-import { unreachable } from './util/index.js';
+import { stringifyPublicParams } from './params_utils.js';
+import { unreachable } from './util/util.js';
 export function encodeSelectively(s) {
   let ret = encodeURIComponent(s);
   ret = ret.replace(/%22/g, '"');
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/util/async_mutex.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/async_mutex.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/util/async_mutex.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/util/async_mutex.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/util/stack.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js
similarity index 69%
rename from tests/wpt/web-platform-tests/webgpu/framework/util/stack.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js
index 92b9c0e6bbc..3d0ec636d85 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/util/stack.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/util/stack.js
@@ -3,8 +3,8 @@
 **/
 
 // Takes a stack trace, and extracts only the first continuous range of lines
-// containing '/suites/', which should provide only the useful part of the stack
-// to the caller (for logging).
+// containing '/(webgpu|unittests)/', which should provide only the useful part
+// of the stack to the caller (for logging).
 export function getStackTrace(e) {
   if (!e.stack) {
     return '';
@@ -14,11 +14,11 @@ export function getStackTrace(e) {
   const stack = [];
   const moreStack = [];
   let found = false;
-  const suitesRegex = /[\/\\]suites[\/\\]/;
+  const commonRegex = /[\/\\](webgpu|unittests)[\/\\]/;
 
   for (let i = 0; i < parts.length; ++i) {
     const part = parts[i].trim();
-    const isSuites = suitesRegex.test(part);
+    const isSuites = commonRegex.test(part); // approximate
 
     if (found && !isSuites) {
       moreStack.push(part);
@@ -40,38 +40,38 @@ export function getStackTrace(e) {
 //
 // Node fail()
 // > Error:
-// >    at CaseRecorder.fail (/Users/kainino/src/cts-experiment/src/framework/logger.ts:99:30)
-// >    at RunCaseSpecific.exports.g.test.t [as fn] (/Users/kainino/src/cts-experiment/src/suites/unittests/logger.spec.ts:80:7)
-// x    at RunCaseSpecific.run (/Users/kainino/src/cts-experiment/src/framework/test_group.ts:121:18)
+// >    at CaseRecorder.fail (/Users/kainino/src/cts/src/common/framework/logger.ts:99:30)
+// >    at RunCaseSpecific.exports.g.test.t [as fn] (/Users/kainino/src/cts/src/unittests/logger.spec.ts:80:7)
+// x    at RunCaseSpecific.run (/Users/kainino/src/cts/src/common/framework/test_group.ts:121:18)
 // x    at processTicksAndRejections (internal/process/task_queues.js:86:5)
 //
 // Node throw
 // > Error: hello
-// >     at RunCaseSpecific.g.test.t [as fn] (/Users/kainino/src/cts-experiment/src/suites/unittests/test_group.spec.ts:51:11)
-// x     at RunCaseSpecific.run (/Users/kainino/src/cts-experiment/src/framework/test_group.ts:121:18)
+// >     at RunCaseSpecific.g.test.t [as fn] (/Users/kainino/src/cts/src/unittests/test_group.spec.ts:51:11)
+// x     at RunCaseSpecific.run (/Users/kainino/src/cts/src/common/framework/test_group.ts:121:18)
 // x     at processTicksAndRejections (internal/process/task_queues.js:86:5)
 //
 // Firefox fail()
 // > fail@http://localhost:8080/out/framework/logger.js:104:30
 // > expect@http://localhost:8080/out/framework/default_fixture.js:59:16
-// > @http://localhost:8080/out/suites/unittests/util.spec.js:35:5
+// > @http://localhost:8080/out/unittests/util.spec.js:35:5
 // x run@http://localhost:8080/out/framework/test_group.js:119:18
 //
 // Firefox throw
-// > @http://localhost:8080/out/suites/unittests/test_group.spec.js:48:11
+// > @http://localhost:8080/out/unittests/test_group.spec.js:48:11
 // x run@http://localhost:8080/out/framework/test_group.js:119:18
 //
 // Safari fail()
 // > fail@http://localhost:8080/out/framework/logger.js:104:39
 // > expect@http://localhost:8080/out/framework/default_fixture.js:59:20
-// > http://localhost:8080/out/suites/unittests/util.spec.js:35:11
+// > http://localhost:8080/out/unittests/util.spec.js:35:11
 // x http://localhost:8080/out/framework/test_group.js:119:20
 // x asyncFunctionResume@[native code]
 // x [native code]
 // x promiseReactionJob@[native code]
 //
 // Safari throw
-// > http://localhost:8080/out/suites/unittests/test_group.spec.js:48:20
+// > http://localhost:8080/out/unittests/test_group.spec.js:48:20
 // x http://localhost:8080/out/framework/test_group.js:119:20
 // x asyncFunctionResume@[native code]
 // x [native code]
@@ -81,18 +81,18 @@ export function getStackTrace(e) {
 // x Error
 // x     at CaseRecorder.fail (http://localhost:8080/out/framework/logger.js:104:30)
 // x     at DefaultFixture.expect (http://localhost:8080/out/framework/default_fixture.js:59:16)
-// >     at RunCaseSpecific.fn (http://localhost:8080/out/suites/unittests/util.spec.js:35:5)
+// >     at RunCaseSpecific.fn (http://localhost:8080/out/unittests/util.spec.js:35:5)
 // x     at RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:18)
 // x     at async runCase (http://localhost:8080/out/runtime/standalone.js:37:17)
 // x     at async http://localhost:8080/out/runtime/standalone.js:102:7
 //
 // Chrome throw
 // x Error: hello
-// >     at RunCaseSpecific.fn (http://localhost:8080/out/suites/unittests/test_group.spec.js:48:11)
+// >     at RunCaseSpecific.fn (http://localhost:8080/out/unittests/test_group.spec.js:48:11)
 // x     at RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:18)"
 // x     at async Promise.all (index 0)
-// x     at async TestGroupTest.run (http://localhost:8080/out/suites/unittests/test_group_test.js:6:5)
-// x     at async RunCaseSpecific.fn (http://localhost:8080/out/suites/unittests/test_group.spec.js:53:15)
+// x     at async TestGroupTest.run (http://localhost:8080/out/unittests/test_group_test.js:6:5)
+// x     at async RunCaseSpecific.fn (http://localhost:8080/out/unittests/test_group.spec.js:53:15)
 // x     at async RunCaseSpecific.run (http://localhost:8080/out/framework/test_group.js:119:7)
 // x     at async runCase (http://localhost:8080/out/runtime/standalone.js:37:17)
 // x     at async http://localhost:8080/out/runtime/standalone.js:102:7
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/util/timeout.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/timeout.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/framework/util/timeout.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/util/timeout.js
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/util/index.js b/tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js
similarity index 96%
rename from tests/wpt/web-platform-tests/webgpu/framework/util/index.js
rename to tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js
index 2cba5f33998..ca64026916c 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/util/index.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/util/util.js
@@ -3,7 +3,6 @@
 **/
 
 import { timeout } from './timeout.js';
-export * from './stack.js';
 export function assert(condition, msg) {
   if (!condition) {
     throw new Error(msg);
@@ -46,4 +45,4 @@ export function objectEquals(x, y) {
 export function range(n, fn) {
   return [...new Array(n)].map((_, i) => fn(i));
 }
-//# sourceMappingURL=index.js.map
\ No newline at end of file
+//# sourceMappingURL=util.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/common/framework/version.js b/tests/wpt/web-platform-tests/webgpu/common/framework/version.js
new file mode 100644
index 00000000000..159b3cf420e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgpu/common/framework/version.js
@@ -0,0 +1,3 @@
+// AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
+
+export const version = '8b01e69c5c7447d2560323f8d2da319db580e733';
diff --git a/tests/wpt/web-platform-tests/webgpu/runtime/helper/options.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/options.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/runtime/helper/options.js
rename to tests/wpt/web-platform-tests/webgpu/common/runtime/helper/options.js
diff --git a/tests/wpt/web-platform-tests/webgpu/runtime/helper/test_worker-worker.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js
similarity index 94%
rename from tests/wpt/web-platform-tests/webgpu/runtime/helper/test_worker-worker.js
rename to tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js
index d382f1e80e4..dd078c313a6 100644
--- a/tests/wpt/web-platform-tests/webgpu/runtime/helper/test_worker-worker.js
+++ b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker-worker.js
@@ -2,9 +2,9 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { assert } from '../../framework/index.js';
 import { TestLoader } from '../../framework/loader.js';
 import { Logger } from '../../framework/logger.js';
+import { assert } from '../../framework/util/util.js';
 // should be DedicatedWorkerGlobalScope
 const log = new Logger();
 const loader = new TestLoader();
diff --git a/tests/wpt/web-platform-tests/webgpu/runtime/helper/test_worker.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/runtime/helper/test_worker.js
rename to tests/wpt/web-platform-tests/webgpu/common/runtime/helper/test_worker.js
diff --git a/tests/wpt/web-platform-tests/webgpu/runtime/wpt.js b/tests/wpt/web-platform-tests/webgpu/common/runtime/wpt.js
similarity index 100%
rename from tests/wpt/web-platform-tests/webgpu/runtime/wpt.js
rename to tests/wpt/web-platform-tests/webgpu/common/runtime/wpt.js
diff --git a/tests/wpt/web-platform-tests/webgpu/cts.html b/tests/wpt/web-platform-tests/webgpu/cts.html
index 058d3b3c4ad..62340be400e 100644
--- a/tests/wpt/web-platform-tests/webgpu/cts.html
+++ b/tests/wpt/web-platform-tests/webgpu/cts.html
@@ -46,37 +46,29 @@
 </style>
 
 <textarea id=results></textarea>
-<script type=module src=/webgpu/runtime/wpt.js></script>
-<meta name=variant content='?q=cts:buffers/create_mapped'>
-<meta name=variant content='?q=cts:buffers/map'>
-<meta name=variant content='?q=cts:buffers/map_detach'>
-<meta name=variant content='?q=cts:buffers/map_oom'>
-<meta name=variant content='?q=cts:canvas/context_creation'>
-<meta name=variant content='?q=cts:command_buffer/basic'>
-<meta name=variant content='?q=cts:command_buffer/compute/basic'>
-<meta name=variant content='?q=cts:command_buffer/copies'>
-<meta name=variant content='?q=cts:command_buffer/render/basic'>
-<meta name=variant content='?q=cts:command_buffer/render/rendering'>
-<meta name=variant content='?q=cts:command_buffer/render/storeop'>
-<meta name=variant content='?q=cts:copyImageBitmapToTexture'>
-<meta name=variant content='?q=cts:examples'>
-<meta name=variant content='?q=cts:fences'>
-<meta name=variant content='?q=cts:resource_init/sampled_texture_clear'>
-<meta name=variant content='?q=cts:validation/createBindGroup'>
-<meta name=variant content='?q=cts:validation/createBindGroupLayout'>
-<meta name=variant content='?q=cts:validation/createPipelineLayout'>
-<meta name=variant content='?q=cts:validation/createRenderPipeline'>
-<meta name=variant content='?q=cts:validation/createTexture'>
-<meta name=variant content='?q=cts:validation/createView'>
-<meta name=variant content='?q=cts:validation/error_scope'>
-<meta name=variant content='?q=cts:validation/fences'>
-<meta name=variant content='?q=cts:validation/queue_submit'>
-<meta name=variant content='?q=cts:validation/render_pass'>
-<meta name=variant content='?q=cts:validation/render_pass_descriptor'>
-<meta name=variant content='?q=cts:validation/setBindGroup'>
-<meta name=variant content='?q=cts:validation/setBlendColor'>
-<meta name=variant content='?q=cts:validation/setScissorRect'>
-<meta name=variant content='?q=cts:validation/setStencilReference'>
-<meta name=variant content='?q=cts:validation/setVertexBuffer'>
-<meta name=variant content='?q=cts:validation/setViewport'>
-<meta name=variant content='?q=cts:validation/vertex_state'>
+<script type=module src=/webgpu/common/runtime/wpt.js></script>
+<meta name=variant content='?q=webgpu:api/operation/buffers/create_mapped'>
+<meta name=variant content='?q=webgpu:api/operation/buffers/map'>
+<meta name=variant content='?q=webgpu:api/operation/buffers/map_detach'>
+<meta name=variant content='?q=webgpu:api/operation/buffers/map_oom'>
+<meta name=variant content='?q=webgpu:api/operation/command_buffer/basic'>
+<meta name=variant content='?q=webgpu:api/operation/command_buffer/copies'>
+<meta name=variant content='?q=webgpu:api/operation/command_buffer/render/basic'>
+<meta name=variant content='?q=webgpu:api/operation/fences'>
+<meta name=variant content='?q=webgpu:api/validation/createBindGroup'>
+<meta name=variant content='?q=webgpu:api/validation/createBindGroupLayout'>
+<meta name=variant content='?q=webgpu:api/validation/createPipelineLayout'>
+<meta name=variant content='?q=webgpu:api/validation/createTexture'>
+<meta name=variant content='?q=webgpu:api/validation/createView'>
+<meta name=variant content='?q=webgpu:api/validation/error_scope'>
+<meta name=variant content='?q=webgpu:api/validation/fences'>
+<meta name=variant content='?q=webgpu:api/validation/queue_submit'>
+<meta name=variant content='?q=webgpu:api/validation/render_pass_descriptor'>
+<meta name=variant content='?q=webgpu:api/validation/setBindGroup'>
+<meta name=variant content='?q=webgpu:api/validation/setBlendColor'>
+<meta name=variant content='?q=webgpu:api/validation/setScissorRect'>
+<meta name=variant content='?q=webgpu:api/validation/setStencilReference'>
+<meta name=variant content='?q=webgpu:api/validation/setViewport'>
+<meta name=variant content='?q=webgpu:examples'>
+<meta name=variant content='?q=webgpu:web-platform/canvas/context_creation'>
+<meta name=variant content='?q=webgpu:web-platform/copyImageBitmapToTexture'>
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/index.js b/tests/wpt/web-platform-tests/webgpu/framework/index.js
deleted file mode 100644
index c85a6816888..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export * from './fixture.js';
-export * from './params/index.js';
-export * from './test_group.js';
-export * from './util/index.js'; // Well-typed WebGPU constants
-
-import * as C from '../constants.js';
-export { C };
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/params/combine.js b/tests/wpt/web-platform-tests/webgpu/framework/params/combine.js
deleted file mode 100644
index 20b2be11352..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/params/combine.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-let _Symbol$iterator;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { assert } from '../util/index.js';
-export function pcombine(...params) {
-  return new PCombine(params);
-}
-
-function merge(a, b) {
-  for (const key of Object.keys(a)) {
-    assert(!b.hasOwnProperty(key), 'Duplicate key: ' + key);
-  }
-
-  return { ...a,
-    ...b
-  };
-}
-
-function* cartesian(iters) {
-  if (iters.length === 0) {
-    return;
-  }
-
-  if (iters.length === 1) {
-    yield* iters[0];
-    return;
-  }
-
-  const [as, ...rest] = iters;
-
-  for (const a of as) {
-    for (const b of cartesian(rest)) {
-      yield merge(a, b);
-    }
-  }
-}
-
-_Symbol$iterator = Symbol.iterator;
-
-class PCombine {
-  constructor(params) {
-    _defineProperty(this, "params", void 0);
-
-    this.params = params;
-  }
-
-  [_Symbol$iterator]() {
-    return cartesian(this.params);
-  }
-
-}
-//# sourceMappingURL=combine.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/params/exclude.js b/tests/wpt/web-platform-tests/webgpu/framework/params/exclude.js
deleted file mode 100644
index 23bc6ee0f69..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/params/exclude.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-let _Symbol$iterator;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { paramsEquals } from './index.js';
-export function pexclude(params, exclude) {
-  return new PExclude(params, exclude);
-}
-_Symbol$iterator = Symbol.iterator;
-
-class PExclude {
-  constructor(cases, exclude) {
-    _defineProperty(this, "cases", void 0);
-
-    _defineProperty(this, "exclude", void 0);
-
-    this.cases = cases;
-    this.exclude = Array.from(exclude);
-  }
-
-  *[_Symbol$iterator]() {
-    for (const p of this.cases) {
-      if (this.exclude.every(e => !paramsEquals(p, e))) {
-        yield p;
-      }
-    }
-  }
-
-}
-//# sourceMappingURL=exclude.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/params/filter.js b/tests/wpt/web-platform-tests/webgpu/framework/params/filter.js
deleted file mode 100644
index 6a5d99e765f..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/params/filter.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-let _Symbol$iterator;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-export function pfilter(cases, pred) {
-  return new PFilter(cases, pred);
-}
-_Symbol$iterator = Symbol.iterator;
-
-class PFilter {
-  constructor(cases, pred) {
-    _defineProperty(this, "cases", void 0);
-
-    _defineProperty(this, "pred", void 0);
-
-    this.cases = cases;
-    this.pred = pred;
-  }
-
-  *[_Symbol$iterator]() {
-    for (const p of this.cases) {
-      if (this.pred(p)) {
-        yield p;
-      }
-    }
-  }
-
-}
-//# sourceMappingURL=filter.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/params/options.js b/tests/wpt/web-platform-tests/webgpu/framework/params/options.js
deleted file mode 100644
index 6906863880c..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/params/options.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-let _Symbol$iterator;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-export function poptions(name, values) {
-  return new POptions(name, values);
-}
-export function pbool(name) {
-  return new POptions(name, [false, true]);
-}
-_Symbol$iterator = Symbol.iterator;
-
-class POptions {
-  constructor(name, values) {
-    _defineProperty(this, "name", void 0);
-
-    _defineProperty(this, "values", void 0);
-
-    this.name = name;
-    this.values = values;
-  }
-
-  *[_Symbol$iterator]() {
-    for (const value of this.values) {
-      yield {
-        [this.name]: value
-      };
-    }
-  }
-
-}
-//# sourceMappingURL=options.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/index.js b/tests/wpt/web-platform-tests/webgpu/framework/test_filter/index.js
deleted file mode 100644
index 743975e13d6..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/test_filter/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export { loadFilter, makeFilter } from './load_filter.js'; // Result of iterating a test filter. Contains a loaded spec (.spec.ts) file and its id.
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/version.js b/tests/wpt/web-platform-tests/webgpu/framework/version.js
deleted file mode 100644
index 0b58dd9b3c4..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/framework/version.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
-
-export const version = '84ee597cdeae08bb26e578fc66a35bcf35f633f4';
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
deleted file mode 100644
index 536f7a9003e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-Basic command buffer compute tests.
-`;
-import { TestGroup } from '../../../../framework/index.js';
-import { GPUTest } from '../../gpu_test.js';
-export const g = new TestGroup(GPUTest);
-g.test('memcpy', async t => {
-  const data = new Uint32Array([0x01020304]);
-  const src = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.STORAGE
-  });
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE
-  });
-  src.setSubData(0, data);
-  const bgl = t.device.createBindGroupLayout({
-    bindings: [{
-      binding: 0,
-      visibility: 4,
-      type: 'storage-buffer'
-    }, {
-      binding: 1,
-      visibility: 4,
-      type: 'storage-buffer'
-    }]
-  });
-  const bg = t.device.createBindGroup({
-    bindings: [{
-      binding: 0,
-      resource: {
-        buffer: src,
-        offset: 0,
-        size: 4
-      }
-    }, {
-      binding: 1,
-      resource: {
-        buffer: dst,
-        offset: 0,
-        size: 4
-      }
-    }],
-    layout: bgl
-  });
-  const module = t.createShaderModule({
-    code:
-    /* GLSL(
-     *       'compute',
-     *       `#version 310 es
-     *         layout(std140, set = 0, binding = 0) buffer Src {
-     *           int value;
-     *         } src;
-     *         layout(std140, set = 0, binding = 1) buffer Dst {
-     *           int value;
-     *         } dst;
-     *
-     *         void main() {
-     *           dst.value = src.value;
-     *         }
-     *       `
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 18, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 1, 310, 262149, 4, 1852399981, 0, 196613, 7, 7631684, 327686, 7, 0, 1970037110, 101, 196613, 9, 7631716, 196613, 11, 6517331, 327686, 11, 0, 1970037110, 101, 196613, 13, 6517363, 327752, 7, 0, 35, 0, 196679, 7, 3, 262215, 9, 34, 0, 262215, 9, 33, 1, 327752, 11, 0, 35, 0, 196679, 11, 3, 262215, 13, 34, 0, 262215, 13, 33, 0, 131091, 2, 196641, 3, 2, 262165, 6, 32, 1, 196638, 7, 6, 262176, 8, 2, 7, 262203, 8, 9, 2, 262187, 6, 10, 0, 196638, 11, 6, 262176, 12, 2, 11, 262203, 12, 13, 2, 262176, 14, 2, 6, 327734, 2, 4, 0, 3, 131320, 5, 327745, 14, 15, 13, 10, 262205, 6, 16, 15, 327745, 14, 17, 9, 10, 196670, 17, 16, 65789, 65592])
-  });
-  const pl = t.device.createPipelineLayout({
-    bindGroupLayouts: [bgl]
-  });
-  const pipeline = t.device.createComputePipeline({
-    computeStage: {
-      module,
-      entryPoint: 'main'
-    },
-    layout: pl
-  });
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginComputePass();
-  pass.setPipeline(pipeline);
-  pass.setBindGroup(0, bg);
-  pass.dispatch(1, 1, 1);
-  pass.endPass();
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, data);
-});
-//# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
deleted file mode 100644
index b26b9fbc859..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = ``;
-import { TestGroup } from '../../../../framework/index.js';
-import { GPUTest } from '../../gpu_test.js';
-export const g = new TestGroup(GPUTest);
-g.test('fullscreen quad', async t => {
-  const dst = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const colorAttachment = t.device.createTexture({
-    format: 'rgba8unorm',
-    size: {
-      width: 1,
-      height: 1,
-      depth: 1
-    },
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.OUTPUT_ATTACHMENT
-  });
-  const colorAttachmentView = colorAttachment.createView();
-  const vertexModule = t.createShaderModule({
-    code:
-    /* GLSL(
-     *       'vertex',
-     *       `#version 310 es
-     *         void main() {
-     *           const vec2 pos[3] = vec2[3](
-     *               vec2(-1.f, -3.f), vec2(3.f, 1.f), vec2(-1.f, 1.f));
-     *           gl_Position = vec4(pos[gl_VertexIndex], 0.f, 1.f);
-     *         }
-     *       `
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 10, 26, 196611, 1, 310, 262149, 4, 1852399981, 0, 393221, 8, 1348430951, 1700164197, 2019914866, 0, 393222, 8, 0, 1348430951, 1953067887, 7237481, 458758, 8, 1, 1348430951, 1953393007, 1702521171, 0, 196613, 10, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 8, 0, 11, 0, 327752, 8, 1, 11, 1, 196679, 8, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262174, 8, 7, 6, 262176, 9, 3, 8, 262203, 9, 10, 3, 262165, 11, 32, 1, 262187, 11, 12, 0, 262167, 13, 6, 2, 262165, 14, 32, 0, 262187, 14, 15, 3, 262172, 16, 13, 15, 262187, 6, 17, 3212836864, 262187, 6, 18, 3225419776, 327724, 13, 19, 17, 18, 262187, 6, 20, 1077936128, 262187, 6, 21, 1065353216, 327724, 13, 22, 20, 21, 327724, 13, 23, 17, 21, 393260, 16, 24, 19, 22, 23, 262176, 25, 1, 11, 262203, 25, 26, 1, 262176, 28, 7, 16, 262176, 30, 7, 13, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 11, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 13, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 21, 327745, 37, 38, 10, 12, 196670, 38, 36, 65789, 65592])
-  });
-  const fragmentModule = t.createShaderModule({
-    code:
-    /* GLSL(
-     *       'fragment',
-     *       `#version 310 es
-     *         precision mediump float;
-     *         layout(location = 0) out vec4 fragColor;
-     *         void main() {
-     *           fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-     *         }
-     *       `
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 1, 310, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 196679, 9, 0, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 0, 262187, 6, 11, 1065353216, 458796, 7, 12, 10, 11, 10, 11, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
-  });
-  const pl = t.device.createPipelineLayout({
-    bindGroupLayouts: []
-  });
-  const pipeline = t.device.createRenderPipeline({
-    vertexStage: {
-      module: vertexModule,
-      entryPoint: 'main'
-    },
-    fragmentStage: {
-      module: fragmentModule,
-      entryPoint: 'main'
-    },
-    layout: pl,
-    primitiveTopology: 'triangle-list',
-    rasterizationState: {
-      frontFace: 'ccw'
-    },
-    colorStates: [{
-      format: 'rgba8unorm',
-      alphaBlend: {},
-      colorBlend: {}
-    }],
-    vertexState: {
-      indexFormat: 'uint16',
-      vertexBuffers: []
-    }
-  });
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: colorAttachmentView,
-      storeOp: 'store',
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    }]
-  });
-  pass.setPipeline(pipeline);
-  pass.draw(3, 1, 0, 0);
-  pass.endPass();
-  encoder.copyTextureToBuffer({
-    texture: colorAttachment,
-    mipLevel: 0,
-    origin: {
-      x: 0,
-      y: 0,
-      z: 0
-    }
-  }, {
-    buffer: dst,
-    rowPitch: 256,
-    imageHeight: 1
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.expectContents(dst, new Uint8Array([0x00, 0xff, 0x00, 0xff]));
-});
-//# sourceMappingURL=rendering.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
deleted file mode 100644
index 1f758cc5c2e..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-renderPass store op test that drawn quad is either stored or cleared based on storeop`;
-import { TestGroup } from '../../../../framework/index.js';
-import { GPUTest } from '../../gpu_test.js';
-export const g = new TestGroup(GPUTest);
-g.test('storeOp controls whether 1x1 drawn quad is stored', async t => {
-  const renderTexture = t.device.createTexture({
-    size: {
-      width: 1,
-      height: 1,
-      depth: 1
-    },
-    format: 'r8unorm',
-    usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.OUTPUT_ATTACHMENT
-  }); // create render pipeline
-
-  const vertexModule = t.createShaderModule({
-    code:
-    /* GLSL(
-     *       'vertex',
-     *       `#version 450
-     *       const vec2 pos[3] = vec2[3](
-     *                               vec2( 1.0f, -1.0f),
-     *                               vec2( 1.0f,  1.0f),
-     *                               vec2(-1.0f,  1.0f)
-     *                               );
-     *
-     *       void main() {
-     *           gl_Position = vec4(pos[gl_VertexIndex], 0.0, 1.0);
-     *       }`
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 26, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262187, 8, 17, 3, 262172, 18, 16, 17, 262187, 6, 19, 1065353216, 262187, 6, 20, 3212836864, 327724, 16, 21, 19, 20, 327724, 16, 22, 19, 19, 327724, 16, 23, 20, 19, 393260, 18, 24, 21, 22, 23, 262176, 25, 1, 14, 262203, 25, 26, 1, 262176, 28, 7, 18, 262176, 30, 7, 16, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 14, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 16, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 19, 327745, 37, 38, 13, 15, 196670, 38, 36, 65789, 65592])
-  });
-  const fragmentModule = t.createShaderModule({
-    code:
-    /* GLSL(
-     *       'fragment',
-     *       `#version 450
-     *       layout(location = 0) out vec4 fragColor;
-     *       void main() {
-     *           fragColor = vec4(1.0, 0.0, 0.0, 1.0);
-     *       }`
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 1065353216, 262187, 6, 11, 0, 458796, 7, 12, 10, 11, 11, 10, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
-  });
-  const renderPipeline = t.device.createRenderPipeline({
-    vertexStage: {
-      module: vertexModule,
-      entryPoint: 'main'
-    },
-    fragmentStage: {
-      module: fragmentModule,
-      entryPoint: 'main'
-    },
-    layout: t.device.createPipelineLayout({
-      bindGroupLayouts: []
-    }),
-    primitiveTopology: 'triangle-list',
-    colorStates: [{
-      format: 'r8unorm'
-    }]
-  }); // encode pass and submit
-
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginRenderPass({
-    colorAttachments: [{
-      attachment: renderTexture.createView(),
-      storeOp: t.params.storeOp,
-      loadValue: {
-        r: 0.0,
-        g: 0.0,
-        b: 0.0,
-        a: 0.0
-      }
-    }]
-  });
-  pass.setPipeline(renderPipeline);
-  pass.draw(3, 1, 0, 0);
-  pass.endPass();
-  const dstBuffer = t.device.createBuffer({
-    size: 4,
-    usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.COPY_SRC
-  });
-  encoder.copyTextureToBuffer({
-    texture: renderTexture
-  }, {
-    buffer: dstBuffer,
-    rowPitch: 256,
-    imageHeight: 1
-  }, {
-    width: 1,
-    height: 1,
-    depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]); // expect the buffer to be clear
-
-  const expectedContent = new Uint32Array([t.params._expected]);
-  t.expectContents(dstBuffer, expectedContent);
-}).params([{
-  storeOp: 'store',
-  _expected: 255
-}, //
-{
-  storeOp: 'clear',
-  _expected: 0
-}]);
-//# sourceMappingURL=storeop.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js
deleted file mode 100644
index e566792357a..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/index.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// AUTO-GENERATED - DO NOT EDIT. See src/tools/gen_listings.ts.
-
-export const listing = [
-  {
-    "path": "",
-    "description": "WebGPU conformance test suite."
-  },
-  {
-    "path": "buffers/",
-    "description": "GPUBuffer tests."
-  },
-  {
-    "path": "buffers/create_mapped",
-    "description": ""
-  },
-  {
-    "path": "buffers/map",
-    "description": ""
-  },
-  {
-    "path": "buffers/map_detach",
-    "description": ""
-  },
-  {
-    "path": "buffers/map_oom",
-    "description": ""
-  },
-  {
-    "path": "canvas/context_creation",
-    "description": ""
-  },
-  {
-    "path": "command_buffer/basic",
-    "description": "Basic tests."
-  },
-  {
-    "path": "command_buffer/compute/basic",
-    "description": "Basic command buffer compute tests."
-  },
-  {
-    "path": "command_buffer/copies",
-    "description": "copy{Buffer,Texture}To{Buffer,Texture} tests."
-  },
-  {
-    "path": "command_buffer/render/basic",
-    "description": "Basic command buffer rendering tests."
-  },
-  {
-    "path": "command_buffer/render/rendering",
-    "description": ""
-  },
-  {
-    "path": "command_buffer/render/storeop",
-    "description": "renderPass store op test that drawn quad is either stored or cleared based on storeop"
-  },
-  {
-    "path": "copyImageBitmapToTexture",
-    "description": "copy imageBitmap To texture tests."
-  },
-  {
-    "path": "examples",
-    "description": "Examples of writing CTS tests with various features.\n\nStart here when looking for examples of basic framework usage."
-  },
-  {
-    "path": "fences",
-    "description": ""
-  },
-  {
-    "path": "resource_init/sampled_texture_clear",
-    "description": "computePass test that sampled texture is cleared"
-  },
-  {
-    "path": "validation/createBindGroup",
-    "description": "createBindGroup validation tests."
-  },
-  {
-    "path": "validation/createBindGroupLayout",
-    "description": "createBindGroupLayout validation tests."
-  },
-  {
-    "path": "validation/createPipelineLayout",
-    "description": "createPipelineLayout validation tests."
-  },
-  {
-    "path": "validation/createRenderPipeline",
-    "description": "createRenderPipeline validation tests."
-  },
-  {
-    "path": "validation/createTexture",
-    "description": "createTexture validation tests."
-  },
-  {
-    "path": "validation/createView",
-    "description": "createView validation tests."
-  },
-  {
-    "path": "validation/error_scope",
-    "description": "error scope validation tests."
-  },
-  {
-    "path": "validation/fences",
-    "description": "fences validation tests."
-  },
-  {
-    "path": "validation/queue_submit",
-    "description": "queue submit validation tests."
-  },
-  {
-    "path": "validation/render_pass",
-    "description": "render pass validation tests."
-  },
-  {
-    "path": "validation/render_pass_descriptor",
-    "description": "render pass descriptor validation tests."
-  },
-  {
-    "path": "validation/setBindGroup",
-    "description": "setBindGroup validation tests."
-  },
-  {
-    "path": "validation/setBlendColor",
-    "description": "setBlendColor validation tests."
-  },
-  {
-    "path": "validation/setScissorRect",
-    "description": "setScissorRect validation tests."
-  },
-  {
-    "path": "validation/setStencilReference",
-    "description": "setStencilReference validation tests."
-  },
-  {
-    "path": "validation/setVertexBuffer",
-    "description": "setVertexBuffer validation tests."
-  },
-  {
-    "path": "validation/setViewport",
-    "description": "setViewport validation tests."
-  },
-  {
-    "path": "validation/vertex_state",
-    "description": "vertexState validation tests."
-  }
-];
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
deleted file mode 100644
index a8fb1ad71d1..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-computePass test that sampled texture is cleared`;
-import { TestGroup } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
-export const g = new TestGroup(GPUTest);
-g.test('compute pass test that sampled texture is cleared', async t => {
-  const texture = t.device.createTexture({
-    size: {
-      width: 256,
-      height: 256,
-      depth: 1
-    },
-    format: 'r8unorm',
-    usage: GPUTextureUsage.SAMPLED
-  });
-  const bufferTex = t.device.createBuffer({
-    size: 4 * 256 * 256,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
-  });
-  const sampler = t.device.createSampler();
-  const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'sampled-texture'
-    }, {
-      binding: 1,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'storage-buffer'
-    }, {
-      binding: 2,
-      visibility: GPUShaderStage.COMPUTE,
-      type: 'sampler'
-    }]
-  }); // create compute pipeline
-
-  const computeModule = t.device.createShaderModule({
-    code:
-    /* GLSL(
-     *       'compute',
-     *       `#version 450
-     *       layout(binding = 0) uniform texture2D sampleTex;
-     *       layout(std430, binding = 1) buffer BufferTex {
-     *          vec4 result;
-     *       } bufferTex;
-     *       layout(binding = 2) uniform sampler sampler0;
-     *       void main() {
-     *          bufferTex.result =
-     *                texelFetch(sampler2D(sampleTex, sampler0), ivec2(0,0), 0);
-     *       }`
-     *     )
-     */
-    new Uint32Array([119734787, 65536, 524296, 29, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 8, 1717990722, 1700033125, 120, 327686, 8, 0, 1970496882, 29804, 327685, 10, 1717990754, 1700033125, 120, 327685, 15, 1886216563, 1700029804, 120, 327685, 19, 1886216563, 812803436, 0, 327752, 8, 0, 35, 0, 196679, 8, 3, 262215, 10, 34, 0, 262215, 10, 33, 1, 262215, 15, 34, 0, 262215, 15, 33, 0, 262215, 19, 34, 0, 262215, 19, 33, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 2, 8, 262203, 9, 10, 2, 262165, 11, 32, 1, 262187, 11, 12, 0, 589849, 13, 6, 1, 0, 0, 0, 1, 0, 262176, 14, 0, 13, 262203, 14, 15, 0, 131098, 17, 262176, 18, 0, 17, 262203, 18, 19, 0, 196635, 21, 13, 262167, 23, 11, 2, 327724, 23, 24, 12, 12, 262176, 27, 2, 7, 327734, 2, 4, 0, 3, 131320, 5, 262205, 13, 16, 15, 262205, 17, 20, 19, 327766, 21, 22, 16, 20, 262244, 13, 25, 22, 458847, 7, 26, 25, 24, 2, 12, 327745, 27, 28, 10, 12, 196670, 28, 26, 65789, 65592])
-  });
-  const pipelineLayout = t.device.createPipelineLayout({
-    bindGroupLayouts: [bindGroupLayout]
-  });
-  const computePipeline = t.device.createComputePipeline({
-    computeStage: {
-      module: computeModule,
-      entryPoint: 'main'
-    },
-    layout: pipelineLayout
-  }); // create bindgroup
-
-  const bindGroup = t.device.createBindGroup({
-    layout: bindGroupLayout,
-    bindings: [{
-      binding: 0,
-      resource: texture.createView()
-    }, {
-      binding: 1,
-      resource: {
-        buffer: bufferTex,
-        offset: 0,
-        size: 4 * 256 * 256
-      }
-    }, {
-      binding: 2,
-      resource: sampler
-    }]
-  }); // encode the pass and submit
-
-  const encoder = t.device.createCommandEncoder();
-  const pass = encoder.beginComputePass();
-  pass.setPipeline(computePipeline);
-  pass.setBindGroup(0, bindGroup);
-  pass.dispatch(256, 256, 1);
-  pass.endPass();
-  const commands = encoder.finish();
-  t.device.defaultQueue.submit([commands]);
-  await t.expectContents(bufferTex, new Uint32Array([0]));
-});
-//# sourceMappingURL=sampled_texture_clear.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js
deleted file mode 100644
index e4dd32af9e8..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-createRenderPipeline validation tests.
-`;
-import { TestGroup, poptions } from '../../../framework/index.js';
-import { kTextureFormatInfo, kTextureFormats } from '../capability_info.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  async init() {
-    await super.init();
-    await this.initGLSL();
-  }
-
-  getDescriptor(options = {}) {
-    const defaultColorStates = [{
-      format: 'rgba8unorm'
-    }];
-    const {
-      primitiveTopology = 'triangle-list',
-      colorStates = defaultColorStates,
-      sampleCount = 1,
-      depthStencilState
-    } = options;
-    const format = colorStates.length ? colorStates[0].format : 'rgba8unorm';
-    return {
-      vertexStage: this.getVertexStage(),
-      fragmentStage: this.getFragmentStage(format),
-      layout: this.getPipelineLayout(),
-      primitiveTopology,
-      colorStates,
-      sampleCount,
-      depthStencilState
-    };
-  }
-
-  getVertexStage() {
-    return {
-      module: this.createShaderModule({
-        code:
-        /* GLSL(
-         *           'vertex',
-         *           `#version 450
-         *             void main() {
-         *               gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
-         *             }
-         *           `
-         *         )
-         */
-        new Uint32Array([119734787, 65536, 524296, 21, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 0, 4, 1852399981, 0, 13, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262187, 6, 16, 0, 262187, 6, 17, 1065353216, 458796, 7, 18, 16, 16, 16, 17, 262176, 19, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 327745, 19, 20, 13, 15, 196670, 20, 18, 65789, 65592])
-      }),
-      entryPoint: 'main'
-    };
-  }
-
-  getFragmentStage(format) {
-    let fragColorType;
-
-    if (format.endsWith('sint')) {
-      fragColorType = 'ivec4';
-    } else if (format.endsWith('uint')) {
-      fragColorType = 'uvec4';
-    } else {
-      fragColorType = 'vec4';
-    }
-
-    const code = `
-      #version 450
-      layout(location = 0) out ${fragColorType} fragColor;
-      void main() {
-        fragColor = ${fragColorType}(0.0, 1.0, 0.0, 1.0);
-      }
-    `;
-    return {
-      module: this.makeShaderModuleFromGLSL('fragment', code),
-      entryPoint: 'main'
-    };
-  }
-
-  getPipelineLayout() {
-    return this.device.createPipelineLayout({
-      bindGroupLayouts: []
-    });
-  }
-
-  createTexture(params) {
-    const {
-      format,
-      sampleCount
-    } = params;
-    return this.device.createTexture({
-      size: {
-        width: 4,
-        height: 4,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT,
-      format,
-      sampleCount
-    });
-  }
-
-}
-
-export const g = new TestGroup(F);
-g.test('basic use of createRenderPipeline', t => {
-  const descriptor = t.getDescriptor();
-  t.device.createRenderPipeline(descriptor);
-});
-g.test('at least one color state is required', async t => {
-  const goodDescriptor = t.getDescriptor({
-    colorStates: [{
-      format: 'rgba8unorm'
-    }]
-  }); // Control case
-
-  t.device.createRenderPipeline(goodDescriptor); // Fail because lack of color states
-
-  const badDescriptor = t.getDescriptor({
-    colorStates: []
-  });
-  t.expectValidationError(() => {
-    t.device.createRenderPipeline(badDescriptor);
-  });
-});
-g.test('color formats must be renderable', async t => {
-  const format = t.params.format;
-  const info = kTextureFormatInfo[format];
-  const descriptor = t.getDescriptor({
-    colorStates: [{
-      format
-    }]
-  });
-
-  if (info.renderable && info.color) {
-    // Succeeds when color format is renderable
-    t.device.createRenderPipeline(descriptor);
-  } else {
-    // Fails because when format is non-renderable
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-}).params(poptions('format', kTextureFormats));
-g.test('sample count must be valid', async t => {
-  const {
-    sampleCount,
-    _success
-  } = t.params;
-  const descriptor = t.getDescriptor({
-    sampleCount
-  });
-
-  if (_success) {
-    // Succeeds when sample count is valid
-    t.device.createRenderPipeline(descriptor);
-  } else {
-    // Fails when sample count is not 4 or 1
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-}).params([{
-  sampleCount: 0,
-  _success: false
-}, {
-  sampleCount: 1,
-  _success: true
-}, {
-  sampleCount: 2,
-  _success: false
-}, {
-  sampleCount: 3,
-  _success: false
-}, {
-  sampleCount: 4,
-  _success: true
-}, {
-  sampleCount: 8,
-  _success: false
-}, {
-  sampleCount: 16,
-  _success: false
-}]);
-g.test('sample count must be equal to the one of every attachment in the render pass', async t => {
-  const {
-    attachmentSamples,
-    pipelineSamples,
-    _success
-  } = t.params;
-  const colorTexture = t.createTexture({
-    format: 'rgba8unorm',
-    sampleCount: attachmentSamples
-  });
-  const depthStencilTexture = t.createTexture({
-    format: 'depth24plus-stencil8',
-    sampleCount: attachmentSamples
-  });
-  const renderPassDescriptorWithoutDepthStencil = {
-    colorAttachments: [{
-      attachment: colorTexture.createView(),
-      loadValue: {
-        r: 1.0,
-        g: 0.0,
-        b: 0.0,
-        a: 1.0
-      }
-    }]
-  };
-  const renderPassDescriptorWithDepthStencilOnly = {
-    colorAttachments: [],
-    depthStencilAttachment: {
-      attachment: depthStencilTexture.createView(),
-      depthLoadValue: 1.0,
-      depthStoreOp: 'store',
-      stencilLoadValue: 0,
-      stencilStoreOp: 'store'
-    }
-  };
-  const pipelineWithoutDepthStencil = t.device.createRenderPipeline(t.getDescriptor({
-    sampleCount: pipelineSamples
-  }));
-  const pipelineWithDepthStencilOnly = t.device.createRenderPipeline(t.getDescriptor({
-    colorStates: [],
-    depthStencilState: {
-      format: 'depth24plus-stencil8'
-    },
-    sampleCount: pipelineSamples
-  }));
-
-  for (const {
-    renderPassDescriptor,
-    pipeline
-  } of [{
-    renderPassDescriptor: renderPassDescriptorWithoutDepthStencil,
-    pipeline: pipelineWithoutDepthStencil
-  }, {
-    renderPassDescriptor: renderPassDescriptorWithDepthStencilOnly,
-    pipeline: pipelineWithDepthStencilOnly
-  }]) {
-    const commandEncoder = t.device.createCommandEncoder();
-    const renderPass = commandEncoder.beginRenderPass(renderPassDescriptor);
-    renderPass.setPipeline(pipeline);
-    renderPass.endPass();
-    t.expectValidationError(() => {
-      commandEncoder.finish();
-    }, !_success);
-  }
-}).params([{
-  attachmentSamples: 4,
-  pipelineSamples: 4,
-  _success: true
-}, // It is allowed to use multisampled render pass and multisampled render pipeline.
-{
-  attachmentSamples: 4,
-  pipelineSamples: 1,
-  _success: false
-}, // It is not allowed to use multisampled render pass and non-multisampled render pipeline.
-{
-  attachmentSamples: 1,
-  pipelineSamples: 4,
-  _success: false
-} // It is not allowed to use non-multisampled render pass and multisampled render pipeline.
-]);
-//# sourceMappingURL=createRenderPipeline.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js
deleted file mode 100644
index 67f7bec6d66..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-render pass validation tests.
-`;
-import { TestGroup } from '../../../framework/index.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  getUniformBuffer() {
-    return this.device.createBuffer({
-      size: 4 * Float32Array.BYTES_PER_ELEMENT,
-      usage: GPUBufferUsage.UNIFORM
-    });
-  }
-
-  createRenderPipeline(pipelineLayout) {
-    const vertexModule = this.createShaderModule({
-      code:
-      /* GLSL(
-       *         'vertex',
-       *         `#version 450
-       *           layout (set = 0, binding = 0) uniform vertexUniformBuffer {
-       *               mat2 transform;
-       *           };
-       *           void main() {
-       *               const vec2 pos[3] = vec2[3](vec2(-1.f, -1.f), vec2(1.f, -1.f), vec2(-1.f, 1.f));
-       *               gl_Position = vec4(transform * pos[gl_VertexIndex], 0.f, 1.f);
-       *           }
-       *         `
-       *       )
-       */
-      new Uint32Array([119734787, 65536, 524296, 47, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 33, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 458757, 18, 1953654134, 1851095141, 1919903337, 1718960749, 7497062, 393222, 18, 0, 1851880052, 1919903347, 109, 196613, 20, 0, 393221, 33, 1449094247, 1702130277, 1684949368, 30821, 327685, 36, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262216, 18, 0, 5, 327752, 18, 0, 35, 0, 327752, 18, 0, 7, 16, 196679, 18, 2, 262215, 20, 34, 0, 262215, 20, 33, 0, 262215, 33, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262168, 17, 16, 2, 196638, 18, 17, 262176, 19, 2, 18, 262203, 19, 20, 2, 262176, 21, 2, 17, 262187, 8, 24, 3, 262172, 25, 16, 24, 262187, 6, 26, 3212836864, 327724, 16, 27, 26, 26, 262187, 6, 28, 1065353216, 327724, 16, 29, 28, 26, 327724, 16, 30, 26, 28, 393260, 25, 31, 27, 29, 30, 262176, 32, 1, 14, 262203, 32, 33, 1, 262176, 35, 7, 25, 262176, 37, 7, 16, 262187, 6, 41, 0, 262176, 45, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 35, 36, 7, 327745, 21, 22, 20, 15, 262205, 17, 23, 22, 262205, 14, 34, 33, 196670, 36, 31, 327745, 37, 38, 36, 34, 262205, 16, 39, 38, 327825, 16, 40, 23, 39, 327761, 6, 42, 40, 0, 327761, 6, 43, 40, 1, 458832, 7, 44, 42, 43, 41, 28, 327745, 45, 46, 13, 15, 196670, 46, 44, 65789, 65592])
-    });
-    const fragmentModule = this.createShaderModule({
-      code:
-      /* GLSL(
-       *         'fragment',
-       *         `#version 450
-       *           layout (set = 1, binding = 0) uniform fragmentUniformBuffer {
-       *             vec4 color;
-       *           };
-       *           layout(location = 0) out vec4 fragColor;
-       *           void main() {
-       *           }
-       *         `
-       *       )
-       */
-      new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 12, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 524293, 8, 1734439526, 1953391981, 1718185557, 1114468975, 1701209717, 114, 327686, 8, 0, 1869377379, 114, 196613, 10, 0, 327685, 12, 1734439526, 1869377347, 114, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 1, 262215, 10, 33, 0, 262215, 12, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 2, 8, 262203, 9, 10, 2, 262176, 11, 3, 7, 262203, 11, 12, 3, 327734, 2, 4, 0, 3, 131320, 5, 65789, 65592])
-    });
-    const pipeline = this.device.createRenderPipeline({
-      vertexStage: {
-        module: vertexModule,
-        entryPoint: 'main'
-      },
-      fragmentStage: {
-        module: fragmentModule,
-        entryPoint: 'main'
-      },
-      layout: pipelineLayout,
-      primitiveTopology: 'triangle-list',
-      colorStates: [{
-        format: 'rgba8unorm'
-      }]
-    });
-    return pipeline;
-  }
-
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = new TestGroup(F);
-g.test('it is invalid to draw in a render pass with missing bind groups', async t => {
-  const {
-    setBindGroup1,
-    setBindGroup2,
-    _success
-  } = t.params;
-  const uniformBuffer = t.getUniformBuffer();
-  const bindGroupLayout1 = t.device.createBindGroupLayout({
-    bindings: [{
-      binding: 0,
-      visibility: GPUShaderStage.VERTEX,
-      type: 'uniform-buffer'
-    }]
-  });
-  const bindGroup1 = t.device.createBindGroup({
-    bindings: [{
-      binding: 0,
-      resource: {
-        buffer: uniformBuffer
-      }
-    }],
-    layout: bindGroupLayout1
-  });
-  const bindGroupLayout2 = t.device.createBindGroupLayout({
-    bindings: [{
-      binding: 0,
-      visibility: GPUShaderStage.FRAGMENT,
-      type: 'uniform-buffer'
-    }]
-  });
-  const bindGroup2 = t.device.createBindGroup({
-    bindings: [{
-      binding: 0,
-      resource: {
-        buffer: uniformBuffer
-      }
-    }],
-    layout: bindGroupLayout2
-  });
-  const pipelineLayout = t.device.createPipelineLayout({
-    bindGroupLayouts: [bindGroupLayout1, bindGroupLayout2]
-  });
-  const pipeline = t.createRenderPipeline(pipelineLayout);
-  const commandEncoder = t.device.createCommandEncoder();
-  const renderPass = t.beginRenderPass(commandEncoder);
-  renderPass.setPipeline(pipeline);
-
-  if (setBindGroup1) {
-    renderPass.setBindGroup(0, bindGroup1);
-  }
-
-  if (setBindGroup2) {
-    renderPass.setBindGroup(1, bindGroup2);
-  }
-
-  renderPass.draw(3, 1, 0, 0);
-  renderPass.endPass();
-  t.expectValidationError(() => {
-    commandEncoder.finish();
-  }, !_success);
-}).params([{
-  setBindGroup1: true,
-  setBindGroup2: true,
-  _success: true
-}, {
-  setBindGroup1: true,
-  setBindGroup2: false,
-  _success: false
-}, {
-  setBindGroup1: false,
-  setBindGroup2: true,
-  _success: false
-}, {
-  setBindGroup1: false,
-  setBindGroup2: false,
-  _success: false
-}]);
-//# sourceMappingURL=render_pass.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js
deleted file mode 100644
index 47b86150129..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-setVertexBuffer validation tests.
-`;
-import { TestGroup, range } from '../../../framework/index.js';
-import { ValidationTest } from './validation_test.js';
-
-class F extends ValidationTest {
-  async init() {
-    await super.init();
-    await this.initGLSL();
-  }
-
-  getVertexBuffer() {
-    return this.device.createBuffer({
-      size: 256,
-      usage: GPUBufferUsage.VERTEX
-    });
-  }
-
-  createRenderPipeline(bufferCount) {
-    const descriptor = {
-      vertexStage: this.getVertexStage(bufferCount),
-      fragmentStage: this.getFragmentStage(),
-      layout: this.getPipelineLayout(),
-      primitiveTopology: 'triangle-list',
-      colorStates: [{
-        format: 'rgba8unorm'
-      }],
-      vertexState: {
-        vertexBuffers: [{
-          arrayStride: 3 * 4,
-          attributes: range(bufferCount, i => ({
-            format: 'float3',
-            offset: 0,
-            shaderLocation: i
-          }))
-        }]
-      }
-    };
-    return this.device.createRenderPipeline(descriptor);
-  }
-
-  getVertexStage(bufferCount) {
-    const code = `
-      #version 450
-      ${range(bufferCount, i => `\nlayout(location = ${i}) in vec3 a_position${i};`).join('')}
-      void main() {
-        gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
-       }
-    `;
-    return {
-      module: this.makeShaderModuleFromGLSL('vertex', code),
-      entryPoint: 'main'
-    };
-  }
-
-  getFragmentStage() {
-    const code = `
-      #version 450
-      layout(location = 0) out vec4 fragColor;
-      void main() {
-        fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-      }
-    `;
-    return {
-      module: this.makeShaderModuleFromGLSL('fragment', code),
-      entryPoint: 'main'
-    };
-  }
-
-  getPipelineLayout() {
-    return this.device.createPipelineLayout({
-      bindGroupLayouts: []
-    });
-  }
-
-  beginRenderPass(commandEncoder) {
-    const attachmentTexture = this.device.createTexture({
-      format: 'rgba8unorm',
-      size: {
-        width: 16,
-        height: 16,
-        depth: 1
-      },
-      usage: GPUTextureUsage.OUTPUT_ATTACHMENT
-    });
-    return commandEncoder.beginRenderPass({
-      colorAttachments: [{
-        attachment: attachmentTexture.createView(),
-        loadValue: {
-          r: 1.0,
-          g: 0.0,
-          b: 0.0,
-          a: 1.0
-        }
-      }]
-    });
-  }
-
-}
-
-export const g = new TestGroup(F);
-g.test('vertex buffers inherit from previous pipeline', async t => {
-  const pipeline1 = t.createRenderPipeline(1);
-  const pipeline2 = t.createRenderPipeline(2);
-  const vertexBuffer1 = t.getVertexBuffer();
-  const vertexBuffer2 = t.getVertexBuffer();
-  {
-    // Check failure when vertex buffer is not set
-    const commandEncoder = t.device.createCommandEncoder();
-    const renderPass = t.beginRenderPass(commandEncoder);
-    renderPass.setPipeline(pipeline1);
-    renderPass.draw(3, 1, 0, 0);
-    renderPass.endPass();
-    t.expectValidationError(() => {
-      commandEncoder.finish();
-    });
-  }
-  {
-    // Check success when vertex buffer is inherited from previous pipeline
-    const commandEncoder = t.device.createCommandEncoder();
-    const renderPass = t.beginRenderPass(commandEncoder);
-    renderPass.setPipeline(pipeline2);
-    renderPass.setVertexBuffer(0, vertexBuffer1);
-    renderPass.setVertexBuffer(1, vertexBuffer2);
-    renderPass.draw(3, 1, 0, 0);
-    renderPass.setPipeline(pipeline1);
-    renderPass.draw(3, 1, 0, 0);
-    renderPass.endPass();
-    commandEncoder.finish();
-  }
-});
-g.test('vertex buffers do not inherit between render passes', async t => {
-  const pipeline1 = t.createRenderPipeline(1);
-  const pipeline2 = t.createRenderPipeline(2);
-  const vertexBuffer1 = t.getVertexBuffer();
-  const vertexBuffer2 = t.getVertexBuffer();
-  {
-    // Check success when vertex buffer is set for each render pass
-    const commandEncoder = t.device.createCommandEncoder();
-    {
-      const renderPass = t.beginRenderPass(commandEncoder);
-      renderPass.setPipeline(pipeline2);
-      renderPass.setVertexBuffer(0, vertexBuffer1);
-      renderPass.setVertexBuffer(1, vertexBuffer2);
-      renderPass.draw(3, 1, 0, 0);
-      renderPass.endPass();
-    }
-    {
-      const renderPass = t.beginRenderPass(commandEncoder);
-      renderPass.setPipeline(pipeline1);
-      renderPass.setVertexBuffer(0, vertexBuffer1);
-      renderPass.draw(3, 1, 0, 0);
-      renderPass.endPass();
-    }
-    commandEncoder.finish();
-  }
-  {
-    // Check failure because vertex buffer is not inherited in second subpass
-    const commandEncoder = t.device.createCommandEncoder();
-    {
-      const renderPass = t.beginRenderPass(commandEncoder);
-      renderPass.setPipeline(pipeline2);
-      renderPass.setVertexBuffer(0, vertexBuffer1);
-      renderPass.setVertexBuffer(1, vertexBuffer2);
-      renderPass.draw(3, 1, 0, 0);
-      renderPass.endPass();
-    }
-    {
-      const renderPass = t.beginRenderPass(commandEncoder);
-      renderPass.setPipeline(pipeline1);
-      renderPass.draw(3, 1, 0, 0);
-      renderPass.endPass();
-    }
-    t.expectValidationError(() => {
-      commandEncoder.finish();
-    });
-  }
-});
-//# sourceMappingURL=setVertexBuffer.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js
deleted file mode 100644
index 103a11265c5..00000000000
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js
+++ /dev/null
@@ -1,646 +0,0 @@
-/**
-* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
-**/
-
-export const description = `
-vertexState validation tests.
-`;
-import { C, TestGroup } from '../../../framework/index.js';
-import { ValidationTest } from './validation_test.js';
-const MAX_VERTEX_ATTRIBUTES = 16;
-const MAX_VERTEX_BUFFER_END = 2048;
-const MAX_VERTEX_BUFFER_ARRAY_STRIDE = 2048;
-const MAX_VERTEX_BUFFERS = 16;
-const SIZEOF_FLOAT = Float32Array.BYTES_PER_ELEMENT;
-const VERTEX_SHADER_CODE_WITH_NO_INPUT = `
-  #version 450
-  void main() {
-    gl_Position = vec4(0.0);
-  }
-`;
-
-function clone(descriptor) {
-  return JSON.parse(JSON.stringify(descriptor));
-}
-
-class F extends ValidationTest {
-  async init() {
-    await super.init();
-    await this.initGLSL();
-  }
-
-  getDescriptor(vertexState, vertexShaderCode) {
-    const descriptor = {
-      vertexStage: this.getVertexStage(vertexShaderCode),
-      fragmentStage: this.getFragmentStage(),
-      layout: this.getPipelineLayout(),
-      primitiveTopology: 'triangle-list',
-      colorStates: [{
-        format: 'rgba8unorm'
-      }],
-      vertexState
-    };
-    return descriptor;
-  }
-
-  getVertexStage(code) {
-    return {
-      module: this.makeShaderModuleFromGLSL('vertex', code),
-      entryPoint: 'main'
-    };
-  }
-
-  getFragmentStage() {
-    const code = `
-      #version 450
-      layout(location = 0) out vec4 fragColor;
-      void main() {
-        fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-      }
-    `;
-    return {
-      module: this.makeShaderModuleFromGLSL('fragment', code),
-      entryPoint: 'main'
-    };
-  }
-
-  getPipelineLayout() {
-    return this.device.createPipelineLayout({
-      bindGroupLayouts: []
-    });
-  }
-
-}
-
-export const g = new TestGroup(F);
-g.test('an empty vertex input is valid', t => {
-  const vertexState = {};
-  const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-  t.device.createRenderPipeline(descriptor);
-});
-g.test('a null buffer is valid', t => {
-  {
-    // One null buffer is OK
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: []
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    //  One null buffer followed by a buffer is OK
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: []
-      }, {
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: 0
-        }]
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    //  One null buffer sitting between buffers is OK
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: 0
-        }]
-      }, {
-        arrayStride: 0,
-        attributes: []
-      }, {
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: 1
-        }]
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-});
-g.test('pipeline vertex buffers are backed by attributes in vertex input', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 2 * SIZEOF_FLOAT,
-      attributes: [{
-        format: 'float',
-        offset: 0,
-        shaderLocation: 0
-      }, {
-        format: 'float',
-        offset: 0,
-        shaderLocation: 1
-      }]
-    }]
-  };
-  {
-    // Control case: pipeline with one input per attribute
-    const code = `
-      #version 450
-      layout(location = 0) in vec4 a;
-      layout(location = 1) in vec4 b;
-      void main() {
-          gl_Position = vec4(0.0);
-      }
-    `;
-    const descriptor = t.getDescriptor(vertexState, code);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Check it is valid for the pipeline to use a subset of the VertexState
-    const code = `
-      #version 450
-      layout(location = 0) in vec4 a;
-      void main() {
-          gl_Position = vec4(0.0);
-      }
-    `;
-    const descriptor = t.getDescriptor(vertexState, code);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Check for an error when the pipeline uses an attribute not in the vertex input
-    const code = `
-      #version 450
-      layout(location = 2) in vec4 a;
-      void main() {
-          gl_Position = vec4(0.0);
-      }
-    `;
-    const descriptor = t.getDescriptor(vertexState, code);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('an arrayStride of 0 is valid', t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: 0,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  {
-    // Works ok without attributes
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Works ok with attributes at a large-ish offset
-    vertexState.vertexBuffers[0].attributes[0].offset = 128;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-});
-g.test('offset should be within vertex buffer arrayStride if arrayStride is not zero', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 2 * SIZEOF_FLOAT,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: 0,
-        shaderLocation: 0
-      }, {
-        format: C.VertexFormat.Float,
-        offset: SIZEOF_FLOAT,
-        shaderLocation: 1
-      }]
-    }]
-  };
-  {
-    // Control case, setting correct arrayStride and offset
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test vertex attribute offset exceed vertex buffer arrayStride range
-    const badVertexState = clone(vertexState);
-    badVertexState.vertexBuffers[0].attributes[1].format = C.VertexFormat.Float2;
-    const descriptor = t.getDescriptor(badVertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-  {
-    // Test vertex attribute offset exceed vertex buffer arrayStride range
-    const badVertexState = clone(vertexState);
-    badVertexState.vertexBuffers[0].arrayStride = SIZEOF_FLOAT;
-    const descriptor = t.getDescriptor(badVertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-  {
-    // It's OK if arrayStride is zero
-    const goodVertexState = clone(vertexState);
-    goodVertexState.vertexBuffers[0].arrayStride = 0;
-    const descriptor = t.getDescriptor(goodVertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-});
-g.test('check two attributes overlapping', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 2 * SIZEOF_FLOAT,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: 0,
-        shaderLocation: 0
-      }, {
-        format: C.VertexFormat.Float,
-        offset: SIZEOF_FLOAT,
-        shaderLocation: 1
-      }]
-    }]
-  };
-  {
-    // Control case, setting correct arrayStride and offset
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test two attributes overlapping
-    const badVertexState = clone(vertexState);
-    badVertexState.vertexBuffers[0].attributes[0].format = C.VertexFormat.Int2;
-    const descriptor = t.getDescriptor(badVertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check out of bounds condition on total number of vertex buffers', async t => {
-  const vertexBuffers = [];
-
-  for (let i = 0; i < MAX_VERTEX_BUFFERS; i++) {
-    vertexBuffers.push({
-      arrayStride: 0,
-      attributes: [{
-        format: 'float',
-        offset: 0,
-        shaderLocation: i
-      }]
-    });
-  }
-
-  {
-    // Control case, setting max vertex buffer number
-    const vertexState = {
-      vertexBuffers
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test vertex buffer number exceed the limit
-    const vertexState = {
-      vertexBuffers: [...vertexBuffers, {
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: MAX_VERTEX_BUFFERS
-        }]
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check out of bounds on number of vertex attributes on a single vertex buffer', async t => {
-  const vertexAttributes = [];
-
-  for (let i = 0; i < MAX_VERTEX_ATTRIBUTES; i++) {
-    vertexAttributes.push({
-      format: 'float',
-      offset: 0,
-      shaderLocation: i
-    });
-  }
-
-  {
-    // Control case, setting max vertex buffer number
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: vertexAttributes
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test vertex attribute number exceed the limit
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: [...vertexAttributes, {
-          format: 'float',
-          offset: 0,
-          shaderLocation: MAX_VERTEX_ATTRIBUTES
-        }]
-      }]
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check out of bounds on number of vertex attributes across vertex buffers', async t => {
-  const vertexBuffers = [];
-
-  for (let i = 0; i < MAX_VERTEX_ATTRIBUTES; i++) {
-    vertexBuffers.push({
-      arrayStride: 0,
-      attributes: [{
-        format: 'float',
-        offset: 0,
-        shaderLocation: i
-      }]
-    });
-  }
-
-  {
-    // Control case, setting max vertex buffer number
-    const vertexState = {
-      vertexBuffers
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test vertex attribute number exceed the limit
-    vertexBuffers[MAX_VERTEX_ATTRIBUTES - 1].attributes.push({
-      format: 'float',
-      offset: 0,
-      shaderLocation: MAX_VERTEX_ATTRIBUTES
-    });
-    const vertexState = {
-      vertexBuffers
-    };
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check out of bounds condition on input strides', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: MAX_VERTEX_BUFFER_ARRAY_STRIDE,
-      attributes: []
-    }]
-  };
-  {
-    // Control case, setting max input arrayStride
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test input arrayStride OOB
-    vertexState.vertexBuffers[0].arrayStride = MAX_VERTEX_BUFFER_ARRAY_STRIDE + 4;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check multiple of 4 bytes constraint on input arrayStride', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 4,
-      attributes: [{
-        format: C.VertexFormat.Uchar2,
-        offset: 0,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  {
-    // Control case, setting input arrayStride 4 bytes
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test input arrayStride not multiple of 4 bytes
-    vertexState.vertexBuffers[0].arrayStride = 2;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('identical duplicate attributes are invalid', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: 0,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  {
-    // Control case, setting attribute 0
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Oh no, attribute 0 is set twice
-    vertexState.vertexBuffers[0].attributes.push({
-      format: C.VertexFormat.Float,
-      offset: 0,
-      shaderLocation: 0
-    });
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('we cannot set same shader location', async t => {
-  {
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: [{
-          format: C.VertexFormat.Float,
-          offset: 0,
-          shaderLocation: 0
-        }, {
-          format: C.VertexFormat.Float,
-          offset: SIZEOF_FLOAT,
-          shaderLocation: 1
-        }]
-      }]
-    };
-    {
-      // Control case, setting different shader locations in two attributes
-      const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-      t.device.createRenderPipeline(descriptor);
-    }
-    {
-      // Test same shader location in two attributes in the same buffer
-      vertexState.vertexBuffers[0].attributes[1].shaderLocation = 0;
-      const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-      t.expectValidationError(() => {
-        t.device.createRenderPipeline(descriptor);
-      });
-    }
-  }
-  {
-    const vertexState = {
-      vertexBuffers: [{
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: 0
-        }]
-      }, {
-        arrayStride: 0,
-        attributes: [{
-          format: 'float',
-          offset: 0,
-          shaderLocation: 0
-        }]
-      }]
-    }; // Test same shader location in two attributes in different buffers
-
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check out of bounds condition on attribute shader location', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: 0,
-        shaderLocation: MAX_VERTEX_ATTRIBUTES - 1
-      }]
-    }]
-  };
-  {
-    // Control case, setting last attribute shader location
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test attribute location OOB
-    vertexState.vertexBuffers[0].attributes[0].shaderLocation = MAX_VERTEX_ATTRIBUTES;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check attribute offset out of bounds', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: C.VertexFormat.Float2,
-        offset: MAX_VERTEX_BUFFER_END - 2 * SIZEOF_FLOAT,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  {
-    // Control case, setting max attribute offset to MAX_VERTEX_BUFFER_END - 8
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Control case, setting attribute offset to 8
-    vertexState.vertexBuffers[0].attributes[0].offset = 8;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test attribute offset out of bounds
-    vertexState.vertexBuffers[0].attributes[0].offset = MAX_VERTEX_BUFFER_END - 4;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check multiple of 4 bytes constraint on offset', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: C.VertexFormat.Float,
-        offset: SIZEOF_FLOAT,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  {
-    // Control case, setting offset 4 bytes
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.device.createRenderPipeline(descriptor);
-  }
-  {
-    // Test offset of 2 bytes with uchar2 format
-    vertexState.vertexBuffers[0].attributes[0].offset = 2;
-    vertexState.vertexBuffers[0].attributes[0].format = C.VertexFormat.Uchar2;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-  {
-    // Test offset of 2 bytes with float format
-    vertexState.vertexBuffers[0].attributes[0].offset = 2;
-    vertexState.vertexBuffers[0].attributes[0].format = C.VertexFormat.Float;
-    const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-    t.expectValidationError(() => {
-      t.device.createRenderPipeline(descriptor);
-    });
-  }
-});
-g.test('check attribute offset overflow', async t => {
-  const vertexState = {
-    vertexBuffers: [{
-      arrayStride: 0,
-      attributes: [{
-        format: 'float',
-        offset: Number.MAX_SAFE_INTEGER,
-        shaderLocation: 0
-      }]
-    }]
-  };
-  const descriptor = t.getDescriptor(vertexState, VERTEX_SHADER_CODE_WITH_NO_INPUT);
-  t.expectValidationError(() => {
-    t.device.createRenderPipeline(descriptor);
-  });
-});
-//# sourceMappingURL=vertex_state.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js
similarity index 79%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js
index 0231c95dab2..7b2bc39aa3d 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/create_mapped.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/create_mapped.spec.js
@@ -3,7 +3,8 @@
 **/
 
 export const description = ``;
-import { TestGroup, pbool, pcombine, poptions } from '../../../framework/index.js';
+import { pbool, pcombine, poptions } from '../../../../common/framework/params.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
 import { MappingTest } from './mapping_test.js';
 export const g = new TestGroup(MappingTest);
 g.test('createBufferMapped', async t => {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js
similarity index 90%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js
index ecbe7f9c340..1c73d62a95f 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map.spec.js
@@ -3,7 +3,8 @@
 **/
 
 export const description = ``;
-import { TestGroup, pbool, pcombine, poptions } from '../../../framework/index.js';
+import { pbool, pcombine, poptions } from '../../../../common/framework/params.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
 import { MappingTest } from './mapping_test.js';
 export const g = new TestGroup(MappingTest);
 g.test('mapWriteAsync', async t => {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js
similarity index 94%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js
index 9174efca59c..14d5be5a631 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_detach.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_detach.spec.js
@@ -3,8 +3,8 @@
 **/
 
 export const description = ``;
-import { TestGroup } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
+import { GPUTest } from '../../../gpu_test.js';
 
 class F extends GPUTest {
   checkDetach(buffer, arrayBuffer, unmap, destroy) {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js
similarity index 86%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js
index 24adf67fd6a..ee642a5c3b3 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/map_oom.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/map_oom.spec.js
@@ -3,8 +3,8 @@
 **/
 
 export const description = ``;
-import { TestGroup } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
+import { GPUTest } from '../../../gpu_test.js';
 
 function getBufferDesc() {
   return {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/mapping_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js
similarity index 95%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/mapping_test.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js
index 20d6c96ffa2..b7349059035 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/buffers/mapping_test.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/buffers/mapping_test.js
@@ -2,7 +2,7 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { GPUTest } from '../gpu_test.js';
+import { GPUTest } from '../../../gpu_test.js';
 export class MappingTest extends GPUTest {
   checkMapWrite(buffer, mappedContents, size) {
     this.checkMapWriteZeroed(mappedContents, size);
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js
similarity index 64%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js
index 6762a563c56..bc4020bfeb5 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/basic.spec.js
@@ -5,12 +5,12 @@
 export const description = `
 Basic tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
+import { GPUTest } from '../../../gpu_test.js';
 export const g = new TestGroup(GPUTest);
 g.test('empty', async t => {
   const encoder = t.device.createCommandEncoder();
   const cmd = encoder.finish();
-  t.device.defaultQueue.submit([cmd]); // TODO: test that submit() succeeded.
+  t.device.defaultQueue.submit([cmd]);
 });
 //# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js
similarity index 93%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js
index c5bae2ada80..c330415d851 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/copies.spec.js
@@ -5,8 +5,8 @@
 export const description = `
 copy{Buffer,Texture}To{Buffer,Texture} tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
+import { TestGroup } from '../../../../common/framework/test_group.js';
+import { GPUTest } from '../../../gpu_test.js';
 export const g = new TestGroup(GPUTest);
 g.test('b2b', async t => {
   const data = new Uint32Array([0x01020304]);
@@ -49,8 +49,7 @@ g.test('b2t2b', async t => {
   const encoder = t.device.createCommandEncoder();
   encoder.copyBufferToTexture({
     buffer: src,
-    rowPitch: 256,
-    imageHeight: 1
+    bytesPerRow: 256
   }, {
     texture: mid,
     mipLevel: 0,
@@ -74,8 +73,7 @@ g.test('b2t2b', async t => {
     }
   }, {
     buffer: dst,
-    rowPitch: 256,
-    imageHeight: 1
+    bytesPerRow: 256
   }, {
     width: 1,
     height: 1,
@@ -110,8 +108,7 @@ g.test('b2t2t2b', async t => {
   const encoder = t.device.createCommandEncoder();
   encoder.copyBufferToTexture({
     buffer: src,
-    rowPitch: 256,
-    imageHeight: 1
+    bytesPerRow: 256
   }, {
     texture: mid1,
     mipLevel: 0,
@@ -156,8 +153,7 @@ g.test('b2t2t2b', async t => {
     }
   }, {
     buffer: dst,
-    rowPitch: 256,
-    imageHeight: 1
+    bytesPerRow: 256
   }, {
     width: 1,
     height: 1,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js
similarity index 89%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js
index 46b5c7a27c9..88710e8aa09 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/command_buffer/render/basic.spec.js
@@ -5,8 +5,8 @@
 export const description = `
 Basic command buffer rendering tests.
 `;
-import { TestGroup } from '../../../../framework/index.js';
-import { GPUTest } from '../../gpu_test.js';
+import { TestGroup } from '../../../../../common/framework/test_group.js';
+import { GPUTest } from '../../../../gpu_test.js';
 export const g = new TestGroup(GPUTest);
 g.test('clear', async t => {
   const dst = t.device.createBuffer({
@@ -47,8 +47,7 @@ g.test('clear', async t => {
     }
   }, {
     buffer: dst,
-    rowPitch: 256,
-    imageHeight: 1
+    bytesPerRow: 256
   }, {
     width: 1,
     height: 1,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js
similarity index 93%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js
index af6482fcab5..386530e0852 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/fences.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/operation/fences.spec.js
@@ -3,9 +3,10 @@
 **/
 
 export const description = ``;
-import { attemptGarbageCollection } from '../../framework/collect_garbage.js';
-import { TestGroup, raceWithRejectOnTimeout } from '../../framework/index.js';
-import { GPUTest } from './gpu_test.js';
+import { attemptGarbageCollection } from '../../../common/framework/collect_garbage.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { raceWithRejectOnTimeout } from '../../../common/framework/util/util.js';
+import { GPUTest } from '../../gpu_test.js';
 export const g = new TestGroup(GPUTest);
 g.test('initial/no descriptor', t => {
   const fence = t.queue.createFence();
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js
similarity index 88%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js
index 2f42a8b643d..97683cf75a9 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroup.spec.js
@@ -5,8 +5,11 @@
 export const description = `
 createBindGroup validation tests.
 `;
-import { C, TestGroup, pcombine, poptions, unreachable } from '../../../framework/index.js';
-import { kBindingTypes } from '../capability_info.js';
+import * as C from '../../../common/constants.js';
+import { pcombine, poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { unreachable } from '../../../common/framework/util/util.js';
+import { kBindingTypes } from '../../capability_info.js';
 import { BindingResourceType, ValidationTest, resourceBindingMatches } from './validation_test.js';
 
 function clone(descriptor) {
@@ -16,14 +19,14 @@ function clone(descriptor) {
 export const g = new TestGroup(ValidationTest);
 g.test('binding count mismatch', async t => {
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE,
       type: 'storage-buffer'
     }]
   });
   const goodDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: {
         buffer: t.getStorageBuffer()
@@ -35,7 +38,7 @@ g.test('binding count mismatch', async t => {
   t.device.createBindGroup(goodDescriptor); // Another binding is not expected.
 
   const badDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: {
         buffer: t.getStorageBuffer()
@@ -55,14 +58,14 @@ g.test('binding count mismatch', async t => {
 });
 g.test('binding must be present in layout', async t => {
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE,
       type: 'storage-buffer'
     }]
   });
   const goodDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: {
         buffer: t.getStorageBuffer()
@@ -74,7 +77,7 @@ g.test('binding must be present in layout', async t => {
   t.device.createBindGroup(goodDescriptor); // Binding index 0 must be present.
 
   const badDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 1,
       resource: {
         buffer: t.getStorageBuffer()
@@ -90,7 +93,7 @@ g.test('buffer binding must contain exactly one buffer of its type', t => {
   const bindingType = t.params.bindingType;
   const resourceType = t.params.resourceType;
   const layout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE,
       type: bindingType
@@ -101,7 +104,7 @@ g.test('buffer binding must contain exactly one buffer of its type', t => {
   t.expectValidationError(() => {
     t.device.createBindGroup({
       layout,
-      bindings: [{
+      entries: [{
         binding: 0,
         resource
       }]
@@ -112,7 +115,7 @@ g.test('texture binding must have correct usage', async t => {
   const type = t.params.type;
   const usage = t.params._usage;
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.FRAGMENT,
       type
@@ -129,7 +132,7 @@ g.test('texture binding must have correct usage', async t => {
   }; // Control case
 
   t.device.createBindGroup({
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: t.device.createTexture(goodDescriptor).createView()
     }],
@@ -144,7 +147,7 @@ g.test('texture binding must have correct usage', async t => {
       yield GPUTextureUsage.SAMPLED;
     }
 
-    if (type !== 'storage-texture') {
+    if (type !== 'readonly-storage-texture' && type !== 'writeonly-storage-texture') {
       yield GPUTextureUsage.STORAGE;
     }
 
@@ -157,7 +160,7 @@ g.test('texture binding must have correct usage', async t => {
     badDescriptor.usage = mismatchedTextureUsage;
     t.expectValidationError(() => {
       t.device.createBindGroup({
-        bindings: [{
+        entries: [{
           binding: 0,
           resource: t.device.createTexture(badDescriptor).createView()
         }],
@@ -177,7 +180,7 @@ g.test('texture must have correct component type', async t => {
     textureComponentType
   } = t.params;
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.FRAGMENT,
       type: 'sampled-texture',
@@ -208,7 +211,7 @@ g.test('texture must have correct component type', async t => {
   }; // Control case
 
   t.device.createBindGroup({
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: t.device.createTexture(goodDescriptor).createView()
     }],
@@ -235,7 +238,7 @@ g.test('texture must have correct component type', async t => {
     badDescriptor.format = mismatchedTextureFormat;
     t.expectValidationError(() => {
       t.device.createBindGroup({
-        bindings: [{
+        entries: [{
           binding: 0,
           resource: t.device.createTexture(badDescriptor).createView()
         }],
@@ -247,11 +250,11 @@ g.test('texture must have correct component type', async t => {
 
 g.test('texture must have correct dimension', async t => {
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.FRAGMENT,
       type: 'sampled-texture',
-      textureDimension: '2d'
+      viewDimension: '2d'
     }]
   });
   const goodDescriptor = {
@@ -260,13 +263,12 @@ g.test('texture must have correct dimension', async t => {
       height: 16,
       depth: 1
     },
-    arrayLayerCount: 1,
     format: C.TextureFormat.RGBA8Unorm,
     usage: GPUTextureUsage.SAMPLED
   }; // Control case
 
   t.device.createBindGroup({
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: t.device.createTexture(goodDescriptor).createView()
     }],
@@ -274,10 +276,10 @@ g.test('texture must have correct dimension', async t => {
   }); // Mismatched texture binding formats are not valid.
 
   const badDescriptor = clone(goodDescriptor);
-  badDescriptor.arrayLayerCount = 2;
+  badDescriptor.size.depth = 2;
   t.expectValidationError(() => {
     t.device.createBindGroup({
-      bindings: [{
+      entries: [{
         binding: 0,
         resource: t.device.createTexture(badDescriptor).createView()
       }],
@@ -292,7 +294,7 @@ g.test('buffer offset and size for bind groups match', async t => {
     _success
   } = t.params;
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE,
       type: 'storage-buffer'
@@ -303,7 +305,7 @@ g.test('buffer offset and size for bind groups match', async t => {
     usage: GPUBufferUsage.STORAGE
   });
   const descriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: {
         buffer,
@@ -333,7 +335,41 @@ g.test('buffer offset and size for bind groups match', async t => {
   size: 256,
   _success: true
 }, // offset 256 (aligned) is valid
-// unaligned buffer offset is invalid
+// Touching the end of the buffer
+{
+  offset: 0,
+  size: 1024,
+  _success: true
+}, {
+  offset: 0,
+  size: undefined,
+  _success: true
+}, {
+  offset: 256 * 3,
+  size: 256,
+  _success: true
+}, {
+  offset: 256 * 3,
+  size: undefined,
+  _success: true
+}, // Zero-sized bindings
+{
+  offset: 0,
+  size: 0,
+  _success: true
+}, {
+  offset: 256,
+  size: 0,
+  _success: true
+}, {
+  offset: 1024,
+  size: 0,
+  _success: true
+}, {
+  offset: 1024,
+  size: undefined,
+  _success: true
+}, // Unaligned buffer offset is invalid
 {
   offset: 1,
   size: 256,
@@ -350,31 +386,7 @@ g.test('buffer offset and size for bind groups match', async t => {
   offset: 255,
   size: 256,
   _success: false
-}, {
-  offset: 0,
-  size: 256,
-  _success: true
-}, // touching the start of the buffer works
-{
-  offset: 256 * 3,
-  size: 256,
-  _success: true
-}, // touching the end of the buffer works
-{
-  offset: 1024,
-  size: 0,
-  _success: true
-}, // touching the end of the buffer works
-{
-  offset: 0,
-  size: 1024,
-  _success: true
-}, // touching the full buffer works
-{
-  offset: 0,
-  size: undefined,
-  _success: true
-}, // touching the full buffer works
+}, // Out-of-bounds
 {
   offset: 256 * 5,
   size: 0,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js
similarity index 86%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js
index b48db9598dd..b03e0159113 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createBindGroupLayout.spec.js
@@ -5,8 +5,10 @@
 export const description = `
 createBindGroupLayout validation tests.
 `;
-import { C, TestGroup, poptions } from '../../../framework/index.js';
-import { kBindingTypeInfo, kBindingTypes, kMaxBindingsPerBindGroup, kPerStageBindingLimits, kShaderStages } from '../capability_info.js';
+import * as C from '../../../common/constants.js';
+import { poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { kBindingTypeInfo, kBindingTypes, kMaxBindingsPerBindGroup, kPerStageBindingLimits, kShaderStages } from '../../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 function clone(descriptor) {
@@ -16,7 +18,7 @@ function clone(descriptor) {
 export const g = new TestGroup(ValidationTest);
 g.test('some binding index was specified more than once', async t => {
   const goodDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE,
       type: C.BindingType.StorageBuffer
@@ -29,7 +31,7 @@ g.test('some binding index was specified more than once', async t => {
 
   t.device.createBindGroupLayout(goodDescriptor);
   const badDescriptor = clone(goodDescriptor);
-  badDescriptor.bindings[1].binding = 0; // Binding index 0 can't be specified twice.
+  badDescriptor.entries[1].binding = 0; // Binding index 0 can't be specified twice.
 
   t.expectValidationError(() => {
     t.device.createBindGroupLayout(badDescriptor);
@@ -37,7 +39,7 @@ g.test('some binding index was specified more than once', async t => {
 });
 g.test('Visibility of bindings can be 0', async t => {
   t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: 0,
       type: 'storage-buffer'
@@ -61,7 +63,7 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
   }
 
   const goodDescriptor = {
-    bindings: [...maxDynamicBufferBindings, {
+    entries: [...maxDynamicBufferBindings, {
       binding: maxDynamicBufferBindings.length,
       visibility: GPUShaderStage.COMPUTE,
       type,
@@ -72,7 +74,7 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
   t.device.createBindGroupLayout(goodDescriptor); // Dynamic buffers exceed maximum in a bind group layout.
 
   const badDescriptor = clone(goodDescriptor);
-  badDescriptor.bindings[maxDynamicBufferCount].hasDynamicOffset = true;
+  badDescriptor.entries[maxDynamicBufferCount].hasDynamicOffset = true;
   t.expectValidationError(() => {
     t.device.createBindGroupLayout(badDescriptor);
   });
@@ -87,7 +89,7 @@ g.test('dynamic set to true is allowed only for buffers', async t => {
   const type = t.params.type;
   const success = kBindingTypeInfo[type].type === 'buffer';
   const descriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.FRAGMENT,
       type,
@@ -107,18 +109,17 @@ let kCasesForMaxResourcesPerStageTests;
   //   - If extraTypeSame, any of the binding types which counts toward the same limit as |type|.
   //     (i.e. 'storage-buffer' <-> 'readonly-storage-buffer').
   //   - Otherwise, an arbitrary other type.
-  function pickExtraBindingTypes(type, extraTypeSame) {
-    if (extraTypeSame) {
-      switch (type) {
-        case 'storage-buffer':
-        case 'readonly-storage-buffer':
-          return ['storage-buffer', 'readonly-storage-buffer'];
+  function* pickExtraBindingTypes(bindingType, extraTypeSame) {
+    const info = kBindingTypeInfo[bindingType];
 
-        default:
-          return [type];
+    if (extraTypeSame) {
+      for (const extraBindingType of kBindingTypes) {
+        if (info.perStageLimitType === kBindingTypeInfo[extraBindingType].perStageLimitType) {
+          yield extraBindingType;
+        }
       }
     } else {
-      return type === 'sampler' ? ['sampled-texture'] : ['sampler'];
+      yield info.perStageLimitType === 'sampler' ? 'sampled-texture' : 'sampler';
     }
   }
 
@@ -167,12 +168,12 @@ g.test('max resources per stage/in bind group layout', async t => {
   }
 
   const goodDescriptor = {
-    bindings: maxResourceBindings
+    entries: maxResourceBindings
   }; // Control
 
   t.device.createBindGroupLayout(goodDescriptor);
   const newDescriptor = clone(goodDescriptor);
-  newDescriptor.bindings.push({
+  newDescriptor.entries.push({
     binding: maxedCount,
     visibility: extraVisibility,
     type: extraType
@@ -204,14 +205,14 @@ g.test('max resources per stage/in pipeline layout', async t => {
   }
 
   const goodLayout = t.device.createBindGroupLayout({
-    bindings: maxResourceBindings
+    entries: maxResourceBindings
   }); // Control
 
   t.device.createPipelineLayout({
     bindGroupLayouts: [goodLayout]
   });
   const extraLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: extraVisibility,
       type: extraType
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js
similarity index 91%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js
index 0018c24e540..f1582c4478a 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createPipelineLayout.spec.js
@@ -5,8 +5,9 @@
 export const description = `
 createPipelineLayout validation tests.
 `;
-import { TestGroup, pbool, pcombine, poptions } from '../../../framework/index.js';
-import { kBindingTypeInfo, kBindingTypes, kShaderStageCombinations } from '../capability_info.js';
+import { pbool, pcombine, poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { kBindingTypeInfo, kBindingTypes, kShaderStageCombinations } from '../../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 function clone(descriptor) {
@@ -32,10 +33,10 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
   }
 
   const maxDynamicBufferBindGroupLayout = t.device.createBindGroupLayout({
-    bindings: maxDynamicBufferBindings
+    entries: maxDynamicBufferBindings
   });
   const goodDescriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility,
       type,
@@ -49,7 +50,7 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
   t.device.createPipelineLayout(goodPipelineLayoutDescriptor); // Check dynamic buffers exceed maximum in pipeline layout.
 
   const badDescriptor = clone(goodDescriptor);
-  badDescriptor.bindings[0].hasDynamicOffset = true;
+  badDescriptor.entries[0].hasDynamicOffset = true;
   const badPipelineLayoutDescriptor = {
     bindGroupLayouts: [maxDynamicBufferBindGroupLayout, t.device.createBindGroupLayout(badDescriptor)]
   };
@@ -64,7 +65,7 @@ g.test('visibility and dynamic offsets', t => {
   const visibility = t.params.visibility;
   const info = kBindingTypeInfo[type];
   const descriptor = {
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility,
       type,
@@ -83,7 +84,7 @@ g.test('visibility and dynamic offsets', t => {
 pbool('hasDynamicOffset'), poptions('visibility', kShaderStageCombinations)));
 g.test('number of bind group layouts exceeds the maximum value', async t => {
   const bindGroupLayoutDescriptor = {
-    bindings: []
+    entries: []
   }; // 4 is the maximum number of bind group layouts.
 
   const maxBindGroupLayouts = [1, 2, 3, 4].map(() => t.device.createBindGroupLayout(bindGroupLayoutDescriptor));
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js
similarity index 95%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js
index a7317a88f5b..ab4c6f866b4 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createTexture.spec.js
@@ -5,8 +5,9 @@
 export const description = `
 createTexture validation tests.
 `;
-import { TestGroup, poptions } from '../../../framework/index.js';
-import { kTextureFormatInfo, kTextureFormats } from '../capability_info.js';
+import { poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { kTextureFormatInfo, kTextureFormats } from '../../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
@@ -23,9 +24,8 @@ class F extends ValidationTest {
       size: {
         width,
         height,
-        depth: 1
+        depth: arrayLayerCount
       },
-      arrayLayerCount,
       mipLevelCount,
       sampleCount,
       dimension: '2d',
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js
similarity index 98%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js
index a4fe7ac2a93..d23af583874 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/createView.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 createView validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 const ARRAY_LAYER_COUNT_2D = 6;
 const MIP_LEVEL_COUNT = 6;
@@ -24,9 +24,8 @@ class F extends ValidationTest {
       size: {
         width,
         height,
-        depth: 1
+        depth: arrayLayerCount
       },
-      arrayLayerCount,
       mipLevelCount,
       sampleCount,
       dimension: '2d',
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js
similarity index 89%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js
index 6c6cfd73ae0..fd69c4e13c0 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/error_scope.spec.js
@@ -7,21 +7,28 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 export const description = `
 error scope validation tests.
 `;
-import { getGPU } from '../../../framework/gpu/implementation.js';
-import { Fixture, TestGroup, raceWithRejectOnTimeout } from '../../../framework/index.js';
+import { Fixture } from '../../../common/framework/fixture.js';
+import { getGPU } from '../../../common/framework/gpu/implementation.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
+import { assert, raceWithRejectOnTimeout } from '../../../common/framework/util/util.js';
 
 class F extends Fixture {
   constructor(...args) {
     super(...args);
 
-    _defineProperty(this, "device", undefined);
+    _defineProperty(this, "_device", undefined);
+  }
+
+  get device() {
+    assert(this._device !== undefined);
+    return this._device;
   }
 
   async init() {
     super.init();
     const gpu = getGPU();
     const adapter = await gpu.requestAdapter();
-    this.device = await adapter.requestDevice();
+    this._device = await adapter.requestDevice();
   }
 
   createErrorBuffer() {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js
similarity index 97%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js
index 2bc85261d3d..7747b5e9dc8 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/fences.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 fences validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 export const g = new TestGroup(ValidationTest); // TODO: Remove if https://github.com/gpuweb/gpuweb/issues/377 is decided
 
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/queue_submit.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js
similarity index 94%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/queue_submit.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js
index 410e3c26e82..dbe0bb4d31e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/queue_submit.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/queue_submit.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 queue submit validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 export const g = new TestGroup(ValidationTest);
 g.test('submitting with a mapped buffer is disallowed', async t => {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass_descriptor.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js
similarity index 99%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass_descriptor.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js
index 59caf533e6c..7c887a1c0fd 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass_descriptor.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/render_pass_descriptor.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 render pass descriptor validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
@@ -23,10 +23,9 @@ class F extends ValidationTest {
       size: {
         width,
         height,
-        depth: 1
+        depth: arrayLayerCount
       },
       format,
-      arrayLayerCount,
       mipLevelCount,
       sampleCount,
       usage
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBindGroup.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js
similarity index 96%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBindGroup.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js
index 73ae4ba502e..baf590746c3 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBindGroup.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBindGroup.spec.js
@@ -5,7 +5,8 @@
 export const description = `
 setBindGroup validation tests.
 `;
-import { TestGroup, pcombine, poptions } from '../../../framework/index.js';
+import { pcombine, poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
@@ -60,11 +61,11 @@ class F extends ValidationTest {
 export const g = new TestGroup(F);
 g.test('dynamic offsets passed but not expected/compute pass', async t => {
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: []
+    entries: []
   });
   const bindGroup = t.device.createBindGroup({
     layout: bindGroupLayout,
-    bindings: []
+    entries: []
   });
   const {
     type
@@ -109,7 +110,7 @@ g.test('dynamic offsets match expectations in pass encoder', async t => {
   const MIN_DYNAMIC_BUFFER_OFFSET_ALIGNMENT = 256;
   const BINDING_SIZE = 9;
   const bindGroupLayout = t.device.createBindGroupLayout({
-    bindings: [{
+    entries: [{
       binding: 0,
       visibility: GPUShaderStage.COMPUTE | GPUShaderStage.FRAGMENT,
       type: 'uniform-buffer',
@@ -131,7 +132,7 @@ g.test('dynamic offsets match expectations in pass encoder', async t => {
   });
   const bindGroup = t.device.createBindGroup({
     layout: bindGroupLayout,
-    bindings: [{
+    entries: [{
       binding: 0,
       resource: {
         buffer: uniformBuffer,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBlendColor.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js
similarity index 95%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBlendColor.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js
index a04bcd038ee..b8905453ac9 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setBlendColor.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setBlendColor.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 setBlendColor validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js'; // TODO: Move beginRenderPass to a Fixture class.
 
 class F extends ValidationTest {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setScissorRect.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js
similarity index 96%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setScissorRect.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js
index aec75f536a1..e12c90d7cda 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setScissorRect.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setScissorRect.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 setScissorRect validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 const TEXTURE_WIDTH = 16;
 const TEXTURE_HEIGHT = 16; // TODO: Move this fixture class to a common file.
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setStencilReference.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js
similarity index 90%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setStencilReference.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js
index 3db37a4908e..cbd48aeaad5 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setStencilReference.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setStencilReference.spec.js
@@ -5,7 +5,8 @@
 export const description = `
 setStencilReference validation tests.
 `;
-import { TestGroup, poptions } from '../../../framework/index.js';
+import { poptions } from '../../../common/framework/params.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js'; // TODO: Move this fixture class to a common file.
 
 class F extends ValidationTest {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setViewport.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js
similarity index 97%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setViewport.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js
index 715a236b18d..9a3009f38ac 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setViewport.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/setViewport.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 setViewport validation tests.
 `;
-import { TestGroup } from '../../../framework/index.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 import { ValidationTest } from './validation_test.js';
 const TEXTURE_WIDTH = 16;
 const TEXTURE_HEIGHT = 16; // TODO: Move this fixture class to a common file.
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/validation_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js
similarity index 95%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/validation/validation_test.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js
index c275f94a80e..92d8a0699c4 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/validation_test.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/api/validation/validation_test.js
@@ -2,8 +2,8 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { unreachable } from '../../../framework/index.js';
-import { GPUTest } from '../gpu_test.js';
+import { unreachable } from '../../../common/framework/util/util.js';
+import { GPUTest } from '../../gpu_test.js';
 export let BindingResourceType;
 
 (function (BindingResourceType) {
@@ -29,7 +29,8 @@ export function resourceBindingMatches(b, r) {
     case 'sampler':
       return r === 'sampler';
 
-    case 'storage-texture':
+    case 'readonly-storage-texture':
+    case 'writeonly-storage-texture':
       return r === 'storage-textureview';
 
     case 'uniform-buffer':
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js b/tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js
similarity index 90%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js
index 10947ee1367..0e336b979f8 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/capability_info.js
@@ -2,7 +2,7 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-import { C } from '../../framework/index.js'; // Textures
+import * as C from '../common/constants.js'; // Textures
 
 export const kTextureFormatInfo =
 /* prettier-ignore */
@@ -182,7 +182,7 @@ export const kPerStageBindingLimits =
   'storage-texture': 4
 };
 const kStagesAll = C.ShaderStage.Vertex | C.ShaderStage.Fragment | C.ShaderStage.Compute;
-const kStagesNonVertex = C.ShaderStage.Fragment | C.ShaderStage.Compute;
+const kStagesCompute = C.ShaderStage.Compute;
 export const kBindingTypeInfo =
 /* prettier-ignore */
 {
@@ -194,7 +194,7 @@ export const kBindingTypeInfo =
   },
   'storage-buffer': {
     type: 'buffer',
-    validStages: kStagesNonVertex,
+    validStages: kStagesCompute,
     perStageLimitType: 'storage-buffer',
     maxDynamicCount: 4
   },
@@ -210,13 +210,25 @@ export const kBindingTypeInfo =
     perStageLimitType: 'sampler',
     maxDynamicCount: 0
   },
+  'comparison-sampler': {
+    type: 'sampler',
+    validStages: kStagesAll,
+    perStageLimitType: 'sampler',
+    maxDynamicCount: 0
+  },
   'sampled-texture': {
     type: 'texture',
     validStages: kStagesAll,
     perStageLimitType: 'sampled-texture',
     maxDynamicCount: 0
   },
-  'storage-texture': {
+  'writeonly-storage-texture': {
+    type: 'texture',
+    validStages: kStagesCompute,
+    perStageLimitType: 'storage-texture',
+    maxDynamicCount: 0
+  },
+  'readonly-storage-texture': {
     type: 'texture',
     validStages: kStagesAll,
     perStageLimitType: 'storage-texture',
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/examples.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js
similarity index 82%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/examples.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js
index e57de1bfc8d..add23f7250e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/examples.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/examples.spec.js
@@ -7,18 +7,18 @@ Examples of writing CTS tests with various features.
 
 Start here when looking for examples of basic framework usage.
 `;
-import { TestGroup } from '../../framework/index.js';
+import { TestGroup } from '../common/framework/test_group.js';
 import { GPUTest } from './gpu_test.js'; // To run these tests in the standalone runner, run `grunt build` or `grunt pre` then open:
-// - http://localhost:8080/?runnow=1&q=cts:examples:
+// - http://localhost:8080/?runnow=1&q=webgpu:examples:
 // To run in WPT, copy/symlink the out-wpt/ directory as the webgpu/ directory in WPT, then open:
-// - (wpt server url)/webgpu/cts.html?q=cts:examples:
+// - (wpt server url)/webgpu/cts.html?q=webgpu:examples:
 //
 // Tests here can be run individually or in groups:
-// - ?q=cts:examples:basic/async=
-// - ?q=cts:examples:basic/
-// - ?q=cts:examples:
+// - ?q=webgpu:examples:basic/async=
+// - ?q=webgpu:examples:basic/
+// - ?q=webgpu:examples:
 
-export const g = new TestGroup(GPUTest); // Note: spaces in test names are replaced with underscores: cts:examples:test_name=
+export const g = new TestGroup(GPUTest); // Note: spaces in test names are replaced with underscores: webgpu:examples:test_name=
 
 g.test('test name', t => {});
 g.test('basic', t => {
@@ -47,8 +47,8 @@ g.test('basic/async', async t => {
 // They can also be private by starting with an underscore (_result), which passes
 // them into the test but does not make them part of the case name:
 //
-// - cts:examples:basic/params={"x":2,"y":4}    runs with t.params = {x: 2, y: 5, _result: 6}.
-// - cts:examples:basic/params={"x":-10,"y":18} runs with t.params = {x: -10, y: 18, _result: 8}.
+// - webgpu:examples:basic/params={"x":2,"y":4}    runs with t.params = {x: 2, y: 5, _result: 6}.
+// - webgpu:examples:basic/params={"x":-10,"y":18} runs with t.params = {x: -10, y: 18, _result: 8}.
 
 g.test('basic/params', t => {
   t.expect(t.params.x + t.params.y === t.params._result);
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js b/tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js
similarity index 74%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js
index 7ab5320d6e9..0202f34fcf7 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/gpu_test.js
@@ -4,9 +4,9 @@
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { getGPU } from '../../framework/gpu/implementation.js';
-import { Fixture, assert, unreachable } from '../../framework/index.js';
-let glslangInstance;
+import { Fixture } from '../common/framework/fixture.js';
+import { getGPU } from '../common/framework/gpu/implementation.js';
+import { assert, unreachable } from '../common/framework/util/util.js';
 
 class DevicePool {
   constructor() {
@@ -53,36 +53,42 @@ export class GPUTest extends Fixture {
   constructor(...args) {
     super(...args);
 
-    _defineProperty(this, "device", undefined);
-
-    _defineProperty(this, "queue", undefined);
+    _defineProperty(this, "objects", undefined);
 
     _defineProperty(this, "initialized", false);
+  }
 
-    _defineProperty(this, "supportsSPIRV", true);
+  get device() {
+    assert(this.objects !== undefined);
+    return this.objects.device;
+  }
+
+  get queue() {
+    assert(this.objects !== undefined);
+    return this.objects.queue;
   }
 
   async init() {
     await super.init();
-    this.device = await devicePool.acquire();
-    this.queue = this.device.defaultQueue;
-    const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
-    if (isSafari) {
-      this.supportsSPIRV = false;
-    }
+    const device = await devicePool.acquire();
+    const queue = device.defaultQueue;
+    this.objects = {
+      device,
+      queue
+    };
 
     try {
-      await this.device.popErrorScope();
+      await device.popErrorScope();
       unreachable('There was an error scope on the stack at the beginning of the test');
     } catch (ex) {}
 
-    this.device.pushErrorScope('out-of-memory');
-    this.device.pushErrorScope('validation');
+    device.pushErrorScope('out-of-memory');
+    device.pushErrorScope('validation');
     this.initialized = true;
   }
 
   async finalize() {
+    // Note: finalize is called even if init was unsuccessful.
     await super.finalize();
 
     if (this.initialized) {
@@ -101,47 +107,11 @@ export class GPUTest extends Fixture {
       }
     }
 
-    if (this.device) {
-      devicePool.release(this.device);
+    if (this.objects) {
+      devicePool.release(this.objects.device);
     }
   }
 
-  async initGLSL() {
-    if (!glslangInstance) {
-      const glslangPath = '../../glslang.js';
-      let glslangModule;
-
-      try {
-        glslangModule = (await import(glslangPath)).default;
-      } catch (ex) {
-        this.skip('glslang is not available');
-      }
-
-      await new Promise(resolve => {
-        glslangModule().then(glslang => {
-          glslangInstance = glslang;
-          resolve();
-        });
-      });
-    }
-  }
-
-  createShaderModule(desc) {
-    if (!this.supportsSPIRV) {
-      this.skip('SPIR-V not available');
-    }
-
-    return this.device.createShaderModule(desc);
-  }
-
-  makeShaderModuleFromGLSL(stage, glsl) {
-    assert(glslangInstance !== undefined, 'GLSL compiler is not instantiated. Run `await t.initGLSL()` first');
-    const code = glslangInstance.compileGLSL(glsl, stage, false);
-    return this.device.createShaderModule({
-      code
-    });
-  }
-
   createCopyForMapRead(src, size) {
     const dst = this.device.createBuffer({
       size,
diff --git a/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js b/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js
new file mode 100644
index 00000000000..5b9ef1afb01
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/listing.js
@@ -0,0 +1,152 @@
+// AUTO-GENERATED - DO NOT EDIT. See src/common/tools/gen_listings.ts.
+
+export const listing = [
+  {
+    "path": "",
+    "description": "WebGPU conformance test suite."
+  },
+  {
+    "path": "api/",
+    "description": "Tests for full coverage of the Javascript API surface of WebGPU."
+  },
+  {
+    "path": "api/operation/",
+    "description": "Tests that check the result of performing valid WebGPU operations, taking advantage of\nparameterization to exercise interactions between features."
+  },
+  {
+    "path": "api/operation/buffers/",
+    "description": "GPUBuffer tests."
+  },
+  {
+    "path": "api/operation/buffers/create_mapped",
+    "description": ""
+  },
+  {
+    "path": "api/operation/buffers/map",
+    "description": ""
+  },
+  {
+    "path": "api/operation/buffers/map_detach",
+    "description": ""
+  },
+  {
+    "path": "api/operation/buffers/map_oom",
+    "description": ""
+  },
+  {
+    "path": "api/operation/command_buffer/basic",
+    "description": "Basic tests."
+  },
+  {
+    "path": "api/operation/command_buffer/copies",
+    "description": "copy{Buffer,Texture}To{Buffer,Texture} tests."
+  },
+  {
+    "path": "api/operation/command_buffer/render/basic",
+    "description": "Basic command buffer rendering tests."
+  },
+  {
+    "path": "api/operation/fences",
+    "description": ""
+  },
+  {
+    "path": "api/regression/",
+    "description": "One-off tests that reproduce API bugs found in implementations to prevent the bugs from\nappearing again."
+  },
+  {
+    "path": "api/validation/",
+    "description": "Positive and negative tests for all the validation rules of the API."
+  },
+  {
+    "path": "api/validation/createBindGroup",
+    "description": "createBindGroup validation tests."
+  },
+  {
+    "path": "api/validation/createBindGroupLayout",
+    "description": "createBindGroupLayout validation tests."
+  },
+  {
+    "path": "api/validation/createPipelineLayout",
+    "description": "createPipelineLayout validation tests."
+  },
+  {
+    "path": "api/validation/createTexture",
+    "description": "createTexture validation tests."
+  },
+  {
+    "path": "api/validation/createView",
+    "description": "createView validation tests."
+  },
+  {
+    "path": "api/validation/error_scope",
+    "description": "error scope validation tests."
+  },
+  {
+    "path": "api/validation/fences",
+    "description": "fences validation tests."
+  },
+  {
+    "path": "api/validation/queue_submit",
+    "description": "queue submit validation tests."
+  },
+  {
+    "path": "api/validation/render_pass_descriptor",
+    "description": "render pass descriptor validation tests."
+  },
+  {
+    "path": "api/validation/setBindGroup",
+    "description": "setBindGroup validation tests."
+  },
+  {
+    "path": "api/validation/setBlendColor",
+    "description": "setBlendColor validation tests."
+  },
+  {
+    "path": "api/validation/setScissorRect",
+    "description": "setScissorRect validation tests."
+  },
+  {
+    "path": "api/validation/setStencilReference",
+    "description": "setStencilReference validation tests."
+  },
+  {
+    "path": "api/validation/setViewport",
+    "description": "setViewport validation tests."
+  },
+  {
+    "path": "examples",
+    "description": "Examples of writing CTS tests with various features.\n\nStart here when looking for examples of basic framework usage."
+  },
+  {
+    "path": "idl/",
+    "description": "Tests to check that the WebGPU IDL is correctly implemented, for examples that objects exposed\nexactly the correct members, and that methods throw when passed incomplete dictionaries."
+  },
+  {
+    "path": "shader/",
+    "description": "Tests for full coverage of the shaders that can be passed to WebGPU."
+  },
+  {
+    "path": "shader/execution/",
+    "description": "Tests that check the result of valid shader execution."
+  },
+  {
+    "path": "shader/regression/",
+    "description": "One-off tests that reproduce shader bugs found in implementations to prevent the bugs from\nappearing again."
+  },
+  {
+    "path": "shader/validation/",
+    "description": "Positive and negative tests for all the validation rules of the shading language."
+  },
+  {
+    "path": "web-platform/",
+    "description": "Tests for Web platform-specific interactions like GPUSwapChain and canvas, WebXR,\nImageBitmaps, and video APIs."
+  },
+  {
+    "path": "web-platform/canvas/context_creation",
+    "description": ""
+  },
+  {
+    "path": "web-platform/copyImageBitmapToTexture",
+    "description": "copy imageBitmap To texture tests."
+  }
+];
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/canvas/context_creation.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js
similarity index 83%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/canvas/context_creation.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js
index a693b002769..fd8593b642e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/canvas/context_creation.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/canvas/context_creation.spec.js
@@ -3,7 +3,8 @@
 **/
 
 export const description = ``;
-import { Fixture, TestGroup } from '../../../framework/index.js';
+import { Fixture } from '../../../common/framework/fixture.js';
+import { TestGroup } from '../../../common/framework/test_group.js';
 export const g = new TestGroup(Fixture);
 g.test('canvas element getContext returns GPUCanvasContext', async t => {
   if (typeof document === 'undefined') {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js
similarity index 92%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js
rename to tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js
index 42ad8507ec9..5e84113b95a 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/webgpu/web-platform/copyImageBitmapToTexture.spec.js
@@ -5,8 +5,9 @@
 export const description = `
 copy imageBitmap To texture tests.
 `;
-import { TestGroup, pcombine, poptions } from '../../framework/index.js';
-import { GPUTest } from './gpu_test.js';
+import { pcombine, poptions } from '../../common/framework/params.js';
+import { TestGroup } from '../../common/framework/test_group.js';
+import { GPUTest } from '../gpu_test.js';
 
 function calculateRowPitch(width, bytesPerPixel) {
   const bytesPerRow = width * bytesPerPixel; // Rounds up to a multiple of 256 according to WebGPU requirements.
@@ -66,9 +67,9 @@ class F extends GPUTest {
     this.device.defaultQueue.copyImageBitmapToTexture(imageBitmapCopyView, dstTextureCopyView, copySize);
     const imageBitmap = imageBitmapCopyView.imageBitmap;
     const dstTexture = dstTextureCopyView.texture;
-    const rowPitchValue = calculateRowPitch(imageBitmap.width, bytesPerPixel);
+    const bytesPerRow = calculateRowPitch(imageBitmap.width, bytesPerPixel);
     const testBuffer = this.device.createBuffer({
-      size: rowPitchValue * imageBitmap.height,
+      size: bytesPerRow * imageBitmap.height,
       usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
     });
     const encoder = this.device.createCommandEncoder();
@@ -82,8 +83,7 @@ class F extends GPUTest {
       }
     }, {
       buffer: testBuffer,
-      rowPitch: rowPitchValue,
-      imageHeight: 0
+      bytesPerRow
     }, {
       width: imageBitmap.width,
       height: imageBitmap.height,
@@ -100,7 +100,7 @@ g.test('from ImageData', async t => {
   const {
     width,
     height
-  } = t.params; // The texture format is rgba8uint, so the bytes per pixel is 4.
+  } = t.params; // The texture format is rgba8unorm, so the bytes per pixel is 4.
 
   const bytesPerPixel = 4;
   const imagePixels = new Uint8ClampedArray(bytesPerPixel * width * height);
@@ -163,7 +163,7 @@ g.test('from canvas', async t => {
   if (imageCanvasContext === null) {
     t.skip('OffscreenCanvas "2d" context not available');
     return;
-  } // The texture format is rgba8uint, so the bytes per pixel is 4.
+  } // The texture format is rgba8unorm, so the bytes per pixel is 4.
 
 
   const bytesPerPixel = 4; // Generate original data.