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
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 7c466cf783f..cb2edcb5dcd 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -1,13 +1,10 @@
 [inline-negative-margin-001.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 2]
-    expected: FAIL
-
   [[data-expected-height\] 7]
     expected: FAIL
 
+  [[data-expected-height\] 4]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini
new file mode 100644
index 00000000000..502ba2d782b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini
@@ -0,0 +1,2 @@
+[order-painting.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini
new file mode 100644
index 00000000000..4da9c87d072
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini
@@ -0,0 +1,13 @@
+[percentage-heights-013.html]
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-001.html.ini
new file mode 100644
index 00000000000..dbdea2ef97f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-001.html.ini
@@ -0,0 +1,4 @@
+[percentage-size-quirks-001.html]
+  [.flexbox 8]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    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 b3d30b5580b..ba5c4a4dc55 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
@@ -312,9 +312,6 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
@@ -327,3 +324,12 @@
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain ]
+    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/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2b6af33d8..f29162631b3 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener of discarded nested browsing context]
     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 af14e19a466..f45aaafe1c5 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
@@ -1,20 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..1b74d6e073d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
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 7a36937927c..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,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.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/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
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 659d83f0afc..a9307009885 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
@@ -47,3 +47,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 42287 more errors.\n\tMax AbsError of 1.9900983572006226e+0 at index of 41022.\n\t[41022\]\t-9.9751412868499756e-1\t9.9258422851562500e-1\t1.9900983572006226e+0\t2.0049667323212912e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-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 44040 more errors.\n\tMax AbsError of 1.9986916780471802e+0 at index of 40045.\n\t[40045\]\t9.9994289875030518e-1\t-9.9874877929687500e-1\t1.9986916780471802e+0\t2.0011956154322119e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 14112.\n\t[14112\]\t-9.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 b8b6960bbd7..6fb2b870d71 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
@@ -80,3 +80,6 @@
   [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\]\t1.1879997299240753e-31\t5.6332010030746460e-1\t5.6332010030746460e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5617870207630095e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 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.9928361959874244e-24\t5.6332010030746460e-1\t5.6332010030746460e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5652902669238215e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 at index of 31080.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
index 6d92f8835c6..10dda3a6659 100644
--- a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index d16e86f65bf..34e8e585750 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -131540,7 +131540,7 @@
       ]
      ],
      "auto-margins-001.html": [
-      "3a90ef2be84635834c5c3f7114451c8e8c437ac7",
+      "2db97ae169474bacde61d781b5597e18f7cf454f",
       [
        null,
        [
@@ -136834,6 +136834,19 @@
        ]
       ]
      },
+     "order-painting.html": [
+      "68e0fd6aac3c629eeb3252971fa5fea49c46b489",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/reference/order-painting-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflow-auto-001.html": [
       "08c1bdbafabad98e7d823c47246f455cc0861fef",
       [
@@ -284688,7 +284701,7 @@
       []
      ],
      "auto-margins-001-ref.html": [
-      "04f32f5d7986ad356a882461a3a353c431f71200",
+      "57f4307ca0c60174495221d27d2a739f14a94abe",
       []
      ],
      "css-flexbox-column-ref.html": [
@@ -285716,6 +285729,10 @@
        "186c5d130c5ea7facc55ff2ac88b1f1f9edf63af",
        []
       ],
+      "order-painting-ref.html": [
+       "bf7bc30d017dd4066193b7ed18bdd94dbfeb8de3",
+       []
+      ],
       "overflow-auto-005-ref.html": [
        "ace792e456c12f40e52ae50d51d05fd6a449a628",
        []
@@ -382916,6 +382933,13 @@
        {}
       ]
      ],
+     "percentage-heights-013.html": [
+      "2410e0a5fdff5861f8dbd21e65137c50943cc9c8",
+      [
+       null,
+       {}
+      ]
+     ],
      "percentage-margins-001.html": [
       "b98bfa1af875b6961b4819fa0e7f82a24fcf783d",
       [
@@ -382923,6 +382947,13 @@
        {}
       ]
      ],
+     "percentage-max-width-cross-axis.html": [
+      "6aa20a6bb59e4626a0929c9f240769a492a3e1f2",
+      [
+       null,
+       {}
+      ]
+     ],
      "percentage-padding-001.html": [
       "8bba5d60f5cae1b93df70c1973a473f163020a51",
       [
@@ -382930,6 +382961,13 @@
        {}
       ]
      ],
+     "percentage-size-quirks-001.html": [
+      "0f01c2069726498f9ca5ded6f476f9ed9e96a7ed",
+      [
+       null,
+       {}
+      ]
+     ],
      "position-absolute-001.html": [
       "f60174084652a3373c6b1873e02da373575c53cd",
       [
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
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 076c791cd3d..94a3570d26b 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,9 +8,6 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-flexbox/order-painting.html.ini b/tests/wpt/metadata/css/css-flexbox/order-painting.html.ini
new file mode 100644
index 00000000000..502ba2d782b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/order-painting.html.ini
@@ -0,0 +1,2 @@
+[order-painting.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/percentage-heights-013.html.ini b/tests/wpt/metadata/css/css-flexbox/percentage-heights-013.html.ini
new file mode 100644
index 00000000000..4da9c87d072
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/percentage-heights-013.html.ini
@@ -0,0 +1,13 @@
+[percentage-heights-013.html]
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 1]
+    expected: FAIL
+
+  [.flexbox 2]
+    expected: FAIL
+
+  [.flexbox 3]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/percentage-size-quirks-001.html.ini b/tests/wpt/metadata/css/css-flexbox/percentage-size-quirks-001.html.ini
new file mode 100644
index 00000000000..dbdea2ef97f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/percentage-size-quirks-001.html.ini
@@ -0,0 +1,4 @@
+[percentage-size-quirks-001.html]
+  [.flexbox 8]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    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 0d56c1a0b15..b8c13d3541e 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,9 +312,6 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
@@ -327,3 +324,12 @@
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain ]
+    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/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index fd369192a02..c757b400205 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: TIMEOUT
+  expected: CRASH
   [opener and "removed" embedded documents]
     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 8b743f36e1d..6b68e9094e4 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
@@ -1,20 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..3f7e3e9544f 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
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 dc856a3d5a3..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,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.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/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
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 b4279e25e58..64919659e67 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
@@ -116,3 +116,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 42287 more errors.\n\tMax AbsError of 1.9900983572006226e+0 at index of 41022.\n\t[41022\]\t-9.9751412868499756e-1\t9.9258422851562500e-1\t1.9900983572006226e+0\t2.0049667323212912e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-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 44040 more errors.\n\tMax AbsError of 1.9986916780471802e+0 at index of 40045.\n\t[40045\]\t9.9994289875030518e-1\t-9.9874877929687500e-1\t1.9986916780471802e+0\t2.0011956154322119e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 14112.\n\t[14112\]\t-9.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 cb0e30a2ee1..5a34ceb1222 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
@@ -311,3 +311,6 @@
   [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\]\t1.1879997299240753e-31\t5.6332010030746460e-1\t5.6332010030746460e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5617870207630095e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 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.9928361959874244e-24\t5.6332010030746460e-1\t5.6332010030746460e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5652902669238215e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 at index of 31080.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index 6d92f8835c6..10dda3a6659 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,8 +1,7 @@
 [shared-worker-in-data-url-context.window.html]
-  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Create a data url shared worker in a data url frame]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html
index 04f32f5d798..57f4307ca0c 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001-ref.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 <link rel="author" title="Google Inc." href="http://www.google.com/">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 
 #circles, #circles div {
@@ -17,13 +18,13 @@
 <body>
 <p>These tests are from the spec: <a href="http://dev.w3.org/csswg/css3-flexbox/#auto-margins">http://dev.w3.org/csswg/css3-flexbox/#auto-margins</a>.</p>
 
-<p>The word OK should be centered vertically and horizontally.</p>
+<p>The black rectangle should be centered vertically and horizontally.</p>
 <div style="width: 4em; height: 4em; background: silver">
-  <table style="width: 100%; height: 100%;"><tr><td style="text-align: center">OK</td></tr></table>
+  <table style="width: 100%; height: 100%;"><tr><td style="text-align: center; font-family: Ahem;">OK</td></tr></table>
 </div>
 
 <div style="width: 4em; height: 4em; margin-top: 10px; background: silver; writing-mode: vertical-rl">
-  <table style="width: 100%; height: 100%;"><tr><td style="text-align: center">OK</td></tr></table>
+  <table style="width: 100%; height: 100%;"><tr><td style="text-align: center; font-family: Ahem;">OK</td></tr></table>
 </div>
 
 <p>You should see 3 blue concentric circles.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html
index 3a90ef2be84..2db97ae1694 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/auto-margins-001.html
@@ -3,6 +3,7 @@
 <head>
 <title>CSS Test: Aligning with auto margins</title>
 <link href="support/flexbox.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <link rel="author" title="Google Inc." href="http://www.google.com/">
 <link rel="help" href="https://drafts.csswg.org/css-flexbox/#auto-margins">
 <link rel="match" href="auto-margins-001-ref.html">
@@ -27,13 +28,13 @@
 <body>
 <p>These tests are from the spec: <a href="http://dev.w3.org/csswg/css3-flexbox/#auto-margins">http://dev.w3.org/csswg/css3-flexbox/#auto-margins</a>.</p>
 
-<p>The word OK should be centered vertically and horizontally.</p>
+<p>The black rectangle should be centered vertically and horizontally.</p>
 <div class="flexbox" style="width: 4em; height: 4em; background: silver">
-  <p id="ok" style="margin: auto;">OK</p>
+  <p id="ok" style="margin: auto; font-family: Ahem;">OK</p>
 </div>
 
 <div class="flexbox" style="width: 4em; height: 4em; margin-top: 10px; background: silver; writing-mode: vertical-rl">
-  <p id="okVertical" style="margin: auto;">OK</p>
+  <p id="okVertical" style="margin: auto; font-family: Ahem;">OK</p>
 </div>
 
 <p>You should see 3 blue concentric circles.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/order-painting.html b/tests/wpt/web-platform-tests/css/css-flexbox/order-painting.html
new file mode 100644
index 00000000000..68e0fd6aac3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/order-painting.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Flexbox: painting order.</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#order-property">
+<link rel="match" href="reference/order-painting-ref.html">
+<meta name="assert" content="This test ensures that the 'order' style properly changes the paint order of flex items."/>
+<body>
+<p>This test passes if there is no red showing.</p>
+
+<div style="display: flex; width: 100px;">
+    <div style="order: 2; background-color: green; width: 100px; height: 100px; margin-left: -50px;"></div>
+    <div style="order: 1; background-color: red;   width: 50px;  height: 100px;"></div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-013.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-013.html
new file mode 100644
index 00000000000..2410e0a5fdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-heights-013.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>CSS Flexbox: percentage height of replaced elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#definite-sizes">
+<link rel="help" href="https://crbug.com/499766">
+<meta name="assert" content="This test checks that percent heights of flex items' replaced children are resolved correctly" />
+<link href="support/flexbox.css" rel="stylesheet">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.flexbox')">
+<div id=log></div>
+
+<p>You should see no red -- the height should be considered definite</p>
+
+<div class="flexbox" style="width: 100px; height: 150px; outline: 5px solid black;">
+  <div style="background: red;">
+    <img style="height: 100%; width: 100%;" src="support/100x100-green.png" data-expected-height="150">
+  </div>
+</div>
+
+<div class="flexbox column" style="width: 100px; height: 150px; outline: 5px solid black;">
+  <div class="flex-one" style="background: red;">
+    <img style="height: 100%; width: 100%;" src="support/100x100-green.png" data-expected-height="150">
+  </div>
+</div>
+
+<div class="flexbox" style="width: 100px; height: 150px; outline: 5px solid black;">
+  <div style="background: red;">
+    <object style="height: 100%; width: 100%;" data="support/100x100-green.png" data-expected-height="150"></object>
+  </div>
+</div>
+
+<div class="flexbox" style="width: 100px; height: 150px; outline: 5px solid black;">
+  <div style="background: red;">
+    <embed style="height: 100%; width: 100%;" type="application/x-webkit-test-webplugin" data-expected-height="150"></embed>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-width-cross-axis.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-width-cross-axis.html
new file mode 100644
index 00000000000..6aa20a6bb59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-max-width-cross-axis.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Flexbox: percentage max width when using 'flex-direction: column'</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#flex-direction-property">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#percentage-sizing">
+<link rel="help" href="https://crbug.com/675333">
+<meta name="assert" content="This test checks that an item's percentage max-width is correctly resolved when using 'flex-direction: column'">
+<link rel="stylesheet" href="support/flexbox.css">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('.flexbox')">
+
+<p>Both bars should be the same width</p>
+<div class="flexbox column" style="width: 400px;">
+  <div data-expected-width="200" style="margin-left: 50%; width: 50%; background: green;">
+    Content
+  </div>
+</div>
+
+<div class="flexbox column" style="width: 400px;">
+  <div data-expected-width="200" style="margin-left: 50%; max-width: 50%; background: blue;">
+    Content
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks-001.html
new file mode 100644
index 00000000000..0f01c206972
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/percentage-size-quirks-001.html
@@ -0,0 +1,107 @@
+<title>CSS Flexbox: percentage size in flexbox children in quirks mode</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#flex-containers">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#percentage-sizing">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=81809">
+<meta name="assert" content="This test checks that percentage height/width values in quirks mode are correctly resolved in flexbox children.">
+<style>
+.flexbox {
+    display: flex;
+}
+.column, .column .fixed {
+    height: 50px;
+}
+.row, .row .fixed {
+    width: 50px;
+}
+.container > div {
+    outline: 2px solid blue;
+}
+.row > div > div {
+    height: 20px;
+}
+.flexbox > div {
+    flex: 0 0 auto;
+}
+.column > .flexbox {
+    flex-direction: column;
+}
+.container > div > :nth-child(1) {
+    background-color: orange;
+}
+.container > div > :nth-child(2) {
+    background-color: yellow;
+}
+.container > div > :nth-child(3) {
+    background-color: salmon;
+}
+.container > div > :nth-child(4) {
+    background-color: purple;
+}
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.flexbox')">
+<div id=log></div>
+
+<div class="container row">
+    <div class="flexbox">
+        <div style='width: 10px; min-width: 50%;' data-expected-width=25></div>
+        <div style='width: 50%;' data-expected-width=25></div>
+        <div style='width: 10px; max-width: 50%;' data-expected-width=10></div>
+        <div style='min-width: 10px; width: 100px; max-width: 50%;' data-expected-width=25></div>
+    </div>
+</div>
+
+<div class="container row" style='width: 100px'>
+    <div class="flexbox fixed">
+        <div style='width: 10px; min-width: 50%;' data-expected-width=25></div>
+        <div style='width: 50%;' data-expected-width=25></div>
+        <div style='width: 10px; max-width: 50%;' data-expected-width=10></div>
+        <div style='min-width: 10px; width: 100px; max-width: 50%;' data-expected-width=25></div>
+    </div>
+</div>
+
+<div class="container column" style='margin-bottom: 100px'>
+    <div class="flexbox" style="height: auto">
+        <div style='height: 10px; min-height: 50%;' data-expected-height=10></div>
+        <div style='height: 50%;' data-expected-height=0></div>
+        <div style='height: 10px; max-height: 50%;' data-expected-height=10></div>
+        <div style='min-height: 10px; height: 100px; max-height: 50%;' data-expected-height=100></div>
+    </div>
+</div>
+
+<div class="container column">
+    <div class="flexbox fixed">
+        <div style='height: 10px; min-height: 50%;' data-expected-height=25></div>
+        <div style='height: 50%;' data-expected-height=25></div>
+        <div style='height: 10px; max-height: 50%;' data-expected-height=10></div>
+        <div style='min-height: 10px; height: 100px; max-height: 50%;' data-expected-height=25></div>
+    </div>
+</div>
+
+<div class="container row">
+    <div class="flexbox">
+        <div style="flex: 0 0 50%" data-expected-width=25></div>
+    </div>
+</div>
+
+<div class="container column">
+    <div class="flexbox">
+        <div style="flex: 0 0 50%" data-expected-height=0></div>
+    </div>
+</div>
+
+<div class="container row">
+    <div class="flexbox fixed">
+        <div style="flex: 0 0 50%" data-expected-width=25></div>
+    </div>
+</div>
+
+<div class="container column">
+    <div class="flexbox fixed">
+        <div style="flex: 0 0 50%" data-expected-height=25></div>
+    </div>
+</div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/order-painting-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/order-painting-ref.html
new file mode 100644
index 00000000000..bf7bc30d017
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/reference/order-painting-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This test passes if there is no red showing.</p>
+
+<div style="width: 100px; height: 100px; background-color: green"></div>
+</body>
+</html>