From 3889f69a713abd6a2ccb533cb73832c96419f1cb Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 23 Jun 2020 00:40:45 +0200
Subject: [PATCH] Enable the Flexbox pref for WPT with Layout 2020

---
 .../css/css-flexbox/__dir__.ini               |   1 +
 .../abspos-autopos-htb-ltr.html.ini           |   2 +
 .../abspos-autopos-htb-rtl.html.ini           |   2 +
 .../abspos-autopos-vlr-ltr.html.ini           |   2 +
 .../abspos-autopos-vlr-rtl.html.ini           |   2 +
 .../abspos-autopos-vrl-ltr.html.ini           |   2 +
 .../abspos-autopos-vrl-rtl.html.ini           |   2 +
 .../css/css-flexbox/align-baseline.html.ini   |   2 +
 .../align-content-wrap-004.html.ini           |   2 +
 .../align-content_flex-start.html.ini         |   2 +
 .../css/css-flexbox/align-items-008.html.ini  |   2 +
 ...ems-baseline-overflow-non-visible.html.ini |   2 +
 .../css/css-flexbox/align-self-005.html.ini   |   2 -
 .../css/css-flexbox/align-self-015.html.ini   |   2 +
 .../flex-basis-interpolation.html.ini         | 300 --------------
 .../flex-grow-interpolation.html.ini          | 234 -----------
 .../flex-shrink-interpolation.html.ini        | 342 ----------------
 .../animation/order-interpolation.html.ini    | 378 ------------------
 .../css/css-flexbox/anonymous-block.html.ini  |   2 +
 .../anonymous-flex-item-001.html.ini          |   2 +
 .../anonymous-flex-item-002.html.ini          |   2 +
 .../anonymous-flex-item-003.html.ini          |   2 +
 .../anonymous-flex-item-004.html.ini          |   2 +
 .../anonymous-flex-item-005.html.ini          |   2 +
 .../anonymous-flex-item-006.html.ini          |   2 +
 ...ht-column-with-border-and-padding.html.ini |   2 +
 .../auto-height-with-flex.html.ini            |   2 +
 .../css/css-flexbox/auto-margins-003.html.ini |   2 +
 .../css-flexbox/cross-axis-scrollbar.html.ini |   2 +-
 .../css-flexbox-column-reverse.html.ini       |   2 +
 .../css-flexbox/css-flexbox-column.html.ini   |   2 +
 .../css-flexbox/display_flex_exist.html.ini   |   4 -
 .../display_inline-flex_exist.html.ini        |   1 +
 ...amic-change-simplified-layout-002.html.ini |   2 +
 .../dynamic-change-simplified-layout.html.ini |   2 +
 .../flex-align-content-space-between.html.ini |   2 +
 .../flex-align-content-start.html.ini         |   2 +
 .../flex-aspect-ratio-img-column-004.html.ini |   2 +
 .../css/css-flexbox/flex-basis-005.html.ini   |   2 -
 .../css/css-flexbox/flex-basis-006.html.ini   |   2 -
 .../css/css-flexbox/flex-box-wrap.html.ini    |   2 +
 ...flex-child-percent-basis-resize-1.html.ini |   2 +
 .../css/css-flexbox/flex-grow-003.html.ini    |   2 -
 .../css/css-flexbox/flex-grow-005.html.ini    |   2 -
 .../flex-height-min-content.html.ini          |   2 +
 .../css/css-flexbox/flex-inline.html.ini      |   2 +
 .../flex-item-and-percentage-abspos.html.ini  |   2 +
 .../flex-item-contains-strict.html.ini        |   1 +
 .../flex-item-vertical-align.html.ini         |   2 +
 ...lex-minimum-height-flex-items-013.html.ini |   2 +
 ...lex-minimum-height-flex-items-016.html.ini |   2 +
 ...lex-minimum-height-flex-items-017.html.ini |   2 +
 ...lex-minimum-height-flex-items-018.html.ini |   2 +
 ...lex-minimum-height-flex-items-020.html.ini |   2 +
 .../flex-minimum-size-001.html.ini            |   1 +
 ...flex-minimum-width-flex-items-011.html.ini |   2 +
 .../flex-vertical-align-effect.html.ini       |   2 +
 ...rection-column-percentage-ignored.html.ini |   2 +
 .../flexbox-gap-position-absolute.html.ini    |   2 +
 ...lexbox-with-multi-column-property.html.ini |   2 +
 .../flexbox_absolute-atomic.html.ini          |   2 +
 .../flexbox_align-items-flexstart-2.html.ini  |   2 +
 .../flexbox_align-items-flexstart.html.ini    |   2 +
 .../flexbox_align-items-stretch-2.html.ini    |   2 +
 .../css/css-flexbox/flexbox_fbfc2.html.ini    |   2 +
 .../flexbox_inline-abspos.html.ini            |   2 +
 .../css-flexbox/flexbox_inline-float.html.ini |   2 +
 .../css/css-flexbox/flexbox_inline.html.ini   |   2 +-
 .../flexbox_item-bottom-float.html.ini        |   2 +
 .../css-flexbox/flexbox_item-clear.html.ini   |   2 +
 .../css-flexbox/flexbox_item-float.html.ini   |   2 +
 .../flexbox_item-top-float.html.ini           |   2 +
 .../flexbox_item-vertical-align.html.ini      |   2 +
 .../css-flexbox/flexbox_nested-flex.html.ini  |   2 +
 .../css-flexbox/flexbox_quirks_body.html.ini  |   2 +
 .../css-flexbox/flexbox_stf-abspos.html.ini   |   2 -
 .../css-flexbox/flexbox_stf-fixpos.html.ini   |   2 -
 .../css-flexbox/flexbox_stf-float.html.ini    |   2 -
 .../flexbox_stf-inline-block.html.ini         |   2 -
 .../flexbox_stf-table-caption.html.ini        |   2 -
 .../flexbox_stf-table-cell.html.ini           |   2 -
 .../flexbox_stf-table-row-group.html.ini      |   2 -
 .../flexbox_stf-table-row.html.ini            |   2 -
 .../css-flexbox/flexbox_stf-table.html.ini    |   2 -
 .../flexbox_table-fixed-layout.html.ini       |   2 -
 .../css/css-flexbox/gap-004-lr.html.ini       |   2 +-
 .../css/css-flexbox/gap-004-ltr.html.ini      |   2 +-
 .../css/css-flexbox/gap-004-rl.html.ini       |   2 +-
 .../css/css-flexbox/gap-004-rtl.html.ini      |   2 +-
 .../css/css-flexbox/gap-005-lr.html.ini       |   2 +-
 .../css/css-flexbox/gap-005-ltr.html.ini      |   2 +-
 .../css/css-flexbox/gap-005-rl.html.ini       |   2 +-
 .../css/css-flexbox/gap-005-rtl.html.ini      |   2 +-
 ...xbox_computedstyle_display-inline.html.ini |   1 +
 .../flexbox_computedstyle_display.html.ini    |   4 -
 ...lexbox_computedstyle_flex-basis-0.html.ini |   4 -
 ...box_computedstyle_flex-basis-auto.html.ini |   4 -
 ..._computedstyle_flex-basis-percent.html.ini |   4 -
 ...yle_flex-direction-column-reverse.html.ini |   4 -
 ...mputedstyle_flex-direction-column.html.ini |   4 -
 ...putedstyle_flex-direction-invalid.html.ini |   4 -
 ...dstyle_flex-direction-row-reverse.html.ini |   4 -
 ..._computedstyle_flex-direction-row.html.ini |   4 -
 ...utedstyle_flex-flow-column-nowrap.html.ini |   4 -
 ...e_flex-flow-column-reverse-nowrap.html.ini |   4 -
 ...yle_flex-flow-column-reverse-wrap.html.ini |   4 -
 ...tedstyle_flex-flow-column-reverse.html.ini |   4 -
 ...yle_flex-flow-column-wrap-reverse.html.ini |   4 -
 ...mputedstyle_flex-flow-column-wrap.html.ini |   4 -
 ...ox_computedstyle_flex-flow-column.html.ini |   4 -
 ...ox_computedstyle_flex-flow-nowrap.html.ini |   4 -
 ...omputedstyle_flex-flow-row-nowrap.html.ini |   4 -
 ...tyle_flex-flow-row-reverse-nowrap.html.ini |   4 -
 ...lex-flow-row-reverse-wrap-reverse.html.ini |   4 -
 ...dstyle_flex-flow-row-reverse-wrap.html.ini |   4 -
 ...mputedstyle_flex-flow-row-reverse.html.ini |   4 -
 ...dstyle_flex-flow-row-wrap-reverse.html.ini |   4 -
 ..._computedstyle_flex-flow-row-wrap.html.ini |   4 -
 ...exbox_computedstyle_flex-flow-row.html.ini |   4 -
 ...xbox_computedstyle_flex-flow-wrap.html.ini |   4 -
 ...flexbox_computedstyle_flex-grow-0.html.ini |   4 -
 ...x_computedstyle_flex-grow-invalid.html.ini |   4 -
 ...ox_computedstyle_flex-grow-number.html.ini |   4 -
 ...mputedstyle_flex-shorthand-0-auto.html.ini |   4 -
 ...computedstyle_flex-shorthand-auto.html.ini |   4 -
 ...putedstyle_flex-shorthand-initial.html.ini |   4 -
 ...putedstyle_flex-shorthand-invalid.html.ini |   4 -
 ...computedstyle_flex-shorthand-none.html.ini |   4 -
 ...xbox_computedstyle_flex-shorthand.html.ini |   4 -
 ...exbox_computedstyle_flex-shrink-0.html.ini |   4 -
 ...computedstyle_flex-shrink-invalid.html.ini |   4 -
 ..._computedstyle_flex-shrink-number.html.ini |   4 -
 ...x_computedstyle_flex-wrap-invalid.html.ini |   4 -
 ...ox_computedstyle_flex-wrap-nowrap.html.ini |   4 -
 ...putedstyle_flex-wrap-wrap-reverse.html.ini |   4 -
 ...xbox_computedstyle_flex-wrap-wrap.html.ini |   4 -
 ...exbox_computedstyle_order-inherit.html.ini |   4 -
 ...exbox_computedstyle_order-integer.html.ini |   4 -
 ...exbox_computedstyle_order-invalid.html.ini |   4 -
 ...xbox_computedstyle_order-negative.html.ini |   4 -
 .../flexbox_computedstyle_order.html.ini      |   4 -
 .../hittest-before-pseudo.html.ini            |   1 +
 .../css/css-flexbox/inheritance.html.ini      |  36 --
 .../inline-flex-min-content-height.html.ini   |   2 +-
 ...wrap-vertically-width-calculation.html.ini |   1 +
 ...sic-width-orthogonal-writing-mode.html.ini |   1 +
 ...tem-with-max-height-and-scrollbar.html.ini |   2 +
 ...out-algorithm_algo-cross-line-002.html.ini |   2 +
 .../css-flexbox/negative-margins-001.html.ini |   2 +-
 ...ested-orthogonal-flexbox-relayout.html.ini |   2 +
 .../css-flexbox/overflow-area-001.html.ini    |   2 +
 .../css-flexbox/overflow-area-002.html.ini    |   2 +
 .../css-flexbox/overflow-auto-005.html.ini    |   2 +
 .../css-flexbox/overflow-auto-006.html.ini    |   1 +
 .../css-flexbox/overflow-auto-008.html.ini    |   4 -
 .../parsing/flex-basis-computed.html.ini      |  25 --
 .../parsing/flex-basis-valid.html.ini         |  13 -
 .../parsing/flex-direction-computed.html.ini  |  13 -
 .../parsing/flex-direction-valid.html.ini     |  13 -
 .../parsing/flex-flow-shorthand.html.ini      |  19 -
 .../parsing/flex-flow-valid.html.ini          |  10 -
 .../parsing/flex-grow-computed.html.ini       |   6 -
 .../parsing/flex-grow-valid.html.ini          |  13 -
 .../parsing/flex-shorthand.html.ini           |  73 ----
 .../parsing/flex-shrink-computed.html.ini     |   6 -
 .../parsing/flex-shrink-valid.html.ini        |  13 -
 .../css-flexbox/parsing/flex-valid.html.ini   |  19 -
 .../parsing/flex-wrap-computed.html.ini       |  10 -
 .../parsing/flex-wrap-valid.html.ini          |  10 -
 .../parsing/order-computed.html.ini           |  10 -
 .../css-flexbox/parsing/order-valid.html.ini  |  10 -
 .../percentage-heights-004.html.ini           |   2 +-
 .../percentage-heights-005.html.ini           |   2 +
 .../percentage-heights-008.html.ini           |   2 +
 .../percentage-heights-014.html.ini           |   2 +
 .../percentage-max-height-001.html.ini        |   2 +
 .../position-absolute-006.html.ini            |   2 +
 .../position-absolute-007.html.ini            |   2 +
 .../position-absolute-008.html.ini            |   2 +
 .../position-absolute-009.html.ini            |   2 +
 .../position-absolute-010.html.ini            |   2 +
 .../position-absolute-011.html.ini            |   2 +
 .../css-flexbox/position-fixed-001.html.ini   |   2 +
 .../stretch-input-in-column.html.ini          |   2 +
 .../stretch-obeys-min-max-003.html.ini        |   2 +
 .../stretching-orthogonal-flows.html.ini      |   2 +
 .../table-as-item-change-cell.html.ini        |   2 +
 .../text-overflow-on-flexbox-001.html.ini     |   2 +
 188 files changed, 184 insertions(+), 1792 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-ltr.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-rtl.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-008.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-block.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-column-with-border-and-padding.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-child-percent-basis-resize-1.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-height-min-content.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-inline.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-and-percentage-abspos.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-011.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-abspos.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-float.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_nested-flex.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_quirks_body.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-caption.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-cell.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row-group.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_table-fixed-layout.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-max-height-and-scrollbar.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-008.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-height-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-007.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-008.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-009.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-010.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-011.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini

diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini
new file mode 100644
index 00000000000..e4af70583e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini
@@ -0,0 +1 @@
+prefs: ["layout.columns.enabled:true", "layout.flexbox.enabled:true"]
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-ltr.html.ini
new file mode 100644
index 00000000000..7c4a69a3e72
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-ltr.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-htb-ltr.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-rtl.html.ini
new file mode 100644
index 00000000000..3e647b62b4d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-htb-rtl.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-htb-rtl.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini
new file mode 100644
index 00000000000..14a6cbfcaa1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-ltr.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-vlr-ltr.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini
new file mode 100644
index 00000000000..76046a7b677
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vlr-rtl.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-vlr-rtl.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini
new file mode 100644
index 00000000000..b79a95f7664
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-ltr.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-vrl-ltr.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini
new file mode 100644
index 00000000000..7d0f3d6cab1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos-autopos-vrl-rtl.html.ini
@@ -0,0 +1,2 @@
+[abspos-autopos-vrl-rtl.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini
new file mode 100644
index 00000000000..b8a131236f3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini
@@ -0,0 +1,2 @@
+[align-baseline.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini
new file mode 100644
index 00000000000..e9569e52360
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini
@@ -0,0 +1,2 @@
+[align-content-wrap-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini
new file mode 100644
index 00000000000..b48569f8a3a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini
@@ -0,0 +1,2 @@
+[align-content_flex-start.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-008.html.ini
new file mode 100644
index 00000000000..23b2c078244
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-008.html.ini
@@ -0,0 +1,2 @@
+[align-items-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
new file mode 100644
index 00000000000..b36a3815f35
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
@@ -0,0 +1,2 @@
+[align-items-baseline-overflow-non-visible.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini
deleted file mode 100644
index 24ccf74429f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-self-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini
new file mode 100644
index 00000000000..8153e4a71ce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini
@@ -0,0 +1,2 @@
+[align-self-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
index 81cd4bdf864..86560048f75 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
@@ -1,73 +1,22 @@
 [flex-basis-interpolation.html]
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
@@ -77,24 +26,9 @@
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
     expected: FAIL
 
@@ -107,327 +41,99 @@
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (0) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (0) should be [unset\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [unset\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
     expected: FAIL
 
@@ -449,9 +155,3 @@
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
index 27645b5ee50..79f1ca1b9a0 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
@@ -1,25 +1,13 @@
 [flex-grow-interpolation.html]
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
     expected: FAIL
 
@@ -29,18 +17,6 @@
   [Web Animations: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
@@ -50,18 +26,12 @@
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
     expected: FAIL
 
   [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
@@ -71,36 +41,21 @@
   [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
   [CSS Transitions: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
     expected: FAIL
 
@@ -116,51 +71,30 @@
   [Web Animations: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
@@ -170,9 +104,6 @@
   [Web Animations: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [1\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
@@ -185,9 +116,6 @@
   [CSS Transitions: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
     expected: FAIL
 
@@ -200,54 +128,18 @@
   [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
     expected: FAIL
 
@@ -257,93 +149,27 @@
   [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
   [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
@@ -356,24 +182,9 @@
   [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
@@ -386,72 +197,27 @@
   [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
   [CSS Transitions: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
index a92909646eb..32882c5fc56 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
@@ -5,30 +5,6 @@
   [Web Animations: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
@@ -38,282 +14,51 @@
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
@@ -323,30 +68,12 @@
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
@@ -356,102 +83,33 @@
   [Web Animations: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
index 022e9d42c4f..24f3a5c0596 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
@@ -1,19 +1,7 @@
 [order-interpolation.html]
-  [CSS Transitions: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
     expected: FAIL
 
@@ -23,480 +11,114 @@
   [Web Animations: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (-3) should be [-20\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (1.5) should be [5\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0) should be [30\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (1) should be [4\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (1.5) should be [25\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0.6) should be [16\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (1) should be [20\]]
     expected: FAIL
 
   [Web Animations: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (-3) should be [-20\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0.3) should be [13\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0.3) should be [13\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0) should be [10\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0.6) should be [16\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0.6) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0.3) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (1.5) should be [25\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
     expected: FAIL
 
   [Web Animations: property <order> from neutral to [20\] at (-0.5) should be [5\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
   [Web Animations: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0) should be [10\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-block.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-block.html.ini
new file mode 100644
index 00000000000..9317e90e724
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-block.html.ini
@@ -0,0 +1,2 @@
+[anonymous-block.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-001.html.ini
new file mode 100644
index 00000000000..b22638a8537
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-001.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-002.html.ini
new file mode 100644
index 00000000000..83d48cdb7da
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-002.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-003.html.ini
new file mode 100644
index 00000000000..331eec32683
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-003.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-004.html.ini
new file mode 100644
index 00000000000..7df62ee8875
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-004.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-005.html.ini
new file mode 100644
index 00000000000..f5db1aa1610
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-005.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-006.html.ini
new file mode 100644
index 00000000000..5865ea15bc8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/anonymous-flex-item-006.html.ini
@@ -0,0 +1,2 @@
+[anonymous-flex-item-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-column-with-border-and-padding.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-column-with-border-and-padding.html.ini
new file mode 100644
index 00000000000..83ee363e759
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-column-with-border-and-padding.html.ini
@@ -0,0 +1,2 @@
+[auto-height-column-with-border-and-padding.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini
new file mode 100644
index 00000000000..f13a42b589b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini
@@ -0,0 +1,2 @@
+[auto-height-with-flex.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini
new file mode 100644
index 00000000000..58f80727857
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini
@@ -0,0 +1,2 @@
+[auto-margins-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/cross-axis-scrollbar.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/cross-axis-scrollbar.html.ini
index 2b76efa5bb1..9bccaede0c5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/cross-axis-scrollbar.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/cross-axis-scrollbar.html.ini
@@ -1,2 +1,2 @@
 [cross-axis-scrollbar.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini
new file mode 100644
index 00000000000..f81e563d8dc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini
@@ -0,0 +1,2 @@
+[css-flexbox-column-reverse.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini
new file mode 100644
index 00000000000..8f08618d7ce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini
@@ -0,0 +1,2 @@
+[css-flexbox-column.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini
deleted file mode 100644
index 999c3eeebf5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[display_flex_exist.html]
-  [CSS Flexible Box Test: display_flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini
index 5d9179606af..f6d84c1f9f2 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini
@@ -1,4 +1,5 @@
 [display_inline-flex_exist.html]
+  expected: CRASH
   [CSS Flexible Box Test: display_inline-flex]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini
new file mode 100644
index 00000000000..e530450491a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini
@@ -0,0 +1,2 @@
+[dynamic-change-simplified-layout-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini
new file mode 100644
index 00000000000..821870fdc77
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini
@@ -0,0 +1,2 @@
+[dynamic-change-simplified-layout.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini
new file mode 100644
index 00000000000..e10b2f33ae2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini
@@ -0,0 +1,2 @@
+[flex-align-content-space-between.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini
new file mode 100644
index 00000000000..19e606aada8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini
@@ -0,0 +1,2 @@
+[flex-align-content-start.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini
new file mode 100644
index 00000000000..c62249a6aba
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini
@@ -0,0 +1,2 @@
+[flex-aspect-ratio-img-column-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini
deleted file mode 100644
index 7f97a040efc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-basis-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini
deleted file mode 100644
index 737b7b8cfe1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-basis-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini
new file mode 100644
index 00000000000..53be7c3c03c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini
@@ -0,0 +1,2 @@
+[flex-box-wrap.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-child-percent-basis-resize-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-child-percent-basis-resize-1.html.ini
new file mode 100644
index 00000000000..905eb25b8a4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-child-percent-basis-resize-1.html.ini
@@ -0,0 +1,2 @@
+[flex-child-percent-basis-resize-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini
deleted file mode 100644
index a6cfb2877b8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini
deleted file mode 100644
index 0de2312e9ce..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-height-min-content.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-height-min-content.html.ini
new file mode 100644
index 00000000000..39676bbfc93
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-height-min-content.html.ini
@@ -0,0 +1,2 @@
+[flex-height-min-content.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-inline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-inline.html.ini
new file mode 100644
index 00000000000..1338f54c682
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-inline.html.ini
@@ -0,0 +1,2 @@
+[flex-inline.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-and-percentage-abspos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-and-percentage-abspos.html.ini
new file mode 100644
index 00000000000..eb83c0f8b2f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-and-percentage-abspos.html.ini
@@ -0,0 +1,2 @@
+[flex-item-and-percentage-abspos.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
index 260e384ebbd..4e4781a7c11 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
@@ -1,4 +1,5 @@
 [flex-item-contains-strict.html]
+  expected: CRASH
   [.inline-flex 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini
new file mode 100644
index 00000000000..b38c46e3ba3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini
@@ -0,0 +1,2 @@
+[flex-item-vertical-align.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini
new file mode 100644
index 00000000000..2ac5d4cca1b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini
new file mode 100644
index 00000000000..951affe1206
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini
new file mode 100644
index 00000000000..b13aa56680f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-017.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini
new file mode 100644
index 00000000000..4744bcf636d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-018.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini
new file mode 100644
index 00000000000..59646670c59
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-020.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-020.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
index f51bbfd4a15..3d557a1e7cd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
@@ -1,4 +1,5 @@
 [flex-minimum-size-001.html]
+  expected: CRASH
   [.flexbox, .inline-flexbox 1]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-011.html.ini
new file mode 100644
index 00000000000..e78f552b95c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-011.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-width-flex-items-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini
new file mode 100644
index 00000000000..b1007b3f0f9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-vertical-align-effect.html.ini
@@ -0,0 +1,2 @@
+[flex-vertical-align-effect.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html.ini
new file mode 100644
index 00000000000..9ef8a2d553b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-direction-column-percentage-ignored.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-direction-column-percentage-ignored.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini
new file mode 100644
index 00000000000..ae887610386
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini
@@ -0,0 +1,2 @@
+[flexbox-gap-position-absolute.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini
new file mode 100644
index 00000000000..1a5d16bcfb2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini
@@ -0,0 +1,2 @@
+[flexbox-with-multi-column-property.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini
new file mode 100644
index 00000000000..4ac53227ffc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini
@@ -0,0 +1,2 @@
+[flexbox_absolute-atomic.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini
new file mode 100644
index 00000000000..841c8205a99
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini
@@ -0,0 +1,2 @@
+[flexbox_align-items-flexstart-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini
new file mode 100644
index 00000000000..7e5c7f05193
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini
@@ -0,0 +1,2 @@
+[flexbox_align-items-flexstart.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-2.html.ini
new file mode 100644
index 00000000000..b2d8455e56f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-2.html.ini
@@ -0,0 +1,2 @@
+[flexbox_align-items-stretch-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini
new file mode 100644
index 00000000000..4b224993b2f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini
@@ -0,0 +1,2 @@
+[flexbox_fbfc2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-abspos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-abspos.html.ini
new file mode 100644
index 00000000000..d9e5ed1f356
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-abspos.html.ini
@@ -0,0 +1,2 @@
+[flexbox_inline-abspos.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-float.html.ini
new file mode 100644
index 00000000000..db404e35927
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_inline-float.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline.html.ini
index ec520ac0f8c..23c72d4f67d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_inline.html.ini
@@ -1,2 +1,2 @@
 [flexbox_inline.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
new file mode 100644
index 00000000000..cf3481ffbfc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-bottom-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini
new file mode 100644
index 00000000000..b6b83785053
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-clear.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
new file mode 100644
index 00000000000..5f91b0496e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
new file mode 100644
index 00000000000..421a0213bcd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-top-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
new file mode 100644
index 00000000000..f57cde7009d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-vertical-align.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_nested-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_nested-flex.html.ini
new file mode 100644
index 00000000000..557f79cbf9f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_nested-flex.html.ini
@@ -0,0 +1,2 @@
+[flexbox_nested-flex.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_quirks_body.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_quirks_body.html.ini
new file mode 100644
index 00000000000..a7b8bfc94dd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_quirks_body.html.ini
@@ -0,0 +1,2 @@
+[flexbox_quirks_body.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini
deleted file mode 100644
index 53a91fe9f60..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-abspos.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini
deleted file mode 100644
index 285fcb2a4cc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-fixpos.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini
deleted file mode 100644
index 86a3f1e3b56..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-float.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini
deleted file mode 100644
index 77322e52d38..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-inline-block.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-caption.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-caption.html.ini
deleted file mode 100644
index ce404c427b1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-caption.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-table-caption.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-cell.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-cell.html.ini
deleted file mode 100644
index d5496a54dd6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-cell.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-table-cell.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row-group.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row-group.html.ini
deleted file mode 100644
index 1bd9ec62413..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row-group.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-table-row-group.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row.html.ini
deleted file mode 100644
index 8c4ea06190d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table-row.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-table-row.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table.html.ini
deleted file mode 100644
index 0562349ef15..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-table.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-table.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_table-fixed-layout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_table-fixed-layout.html.ini
deleted file mode 100644
index ab6c951793e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_table-fixed-layout.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_table-fixed-layout.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-lr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-lr.html.ini
index 096d80a2836..c5d3f152a67 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-lr.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-lr.html.ini
@@ -1,2 +1,2 @@
 [gap-004-lr.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-ltr.html.ini
index bb84397e7c2..7e02294856d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-ltr.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-ltr.html.ini
@@ -1,2 +1,2 @@
 [gap-004-ltr.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rl.html.ini
index 6f9f4f44354..1dd3f1d099d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rl.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rl.html.ini
@@ -1,2 +1,2 @@
 [gap-004-rl.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rtl.html.ini
index ab6594b3895..2bfd18c6220 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rtl.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-004-rtl.html.ini
@@ -1,2 +1,2 @@
 [gap-004-rtl.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-lr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-lr.html.ini
index 28f325c2436..99f8b40a7ba 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-lr.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-lr.html.ini
@@ -1,2 +1,2 @@
 [gap-005-lr.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-ltr.html.ini
index 3e25a242af5..69de5848cc1 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-ltr.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-ltr.html.ini
@@ -1,2 +1,2 @@
 [gap-005-ltr.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rl.html.ini
index 653612df4dd..8e068e869b9 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rl.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rl.html.ini
@@ -1,2 +1,2 @@
 [gap-005-rl.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rtl.html.ini
index 04dd81cbf28..4bc6c1c4295 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rtl.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-005-rtl.html.ini
@@ -1,2 +1,2 @@
 [gap-005-rtl.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini
index d3ee6e95f48..c1a35caa181 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini
@@ -1,4 +1,5 @@
 [flexbox_computedstyle_display-inline.html]
+  expected: CRASH
   [flexbox | computed style | display: inline-flex]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini
deleted file mode 100644
index 95279a15f95..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_display.html]
-  [flexbox | computed style | display: flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini
deleted file mode 100644
index 34880cfaa0d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-0.html]
-  [flexbox | computed style | flex-basis: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini
deleted file mode 100644
index c3339934a4e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-auto.html]
-  [flexbox | computed style | flex-basis: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini
deleted file mode 100644
index 6b98cbdb719..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-percent.html]
-  [flexbox | computed style | flex-basis: percent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini
deleted file mode 100644
index 614ef55805a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-column-reverse.html]
-  [flexbox | computed style | flex-direction: column-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini
deleted file mode 100644
index 92ef3690721..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-column.html]
-  [flexbox | computed style | flex-direction: column]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini
deleted file mode 100644
index a8ec32d18f9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-invalid.html]
-  [flexbox | computed style | flex-direction: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini
deleted file mode 100644
index 2ce69320a8d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-row-reverse.html]
-  [flexbox | computed style | flex-direction: row-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini
deleted file mode 100644
index e58b2d2ea97..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-row.html]
-  [flexbox | computed style | flex-direction: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini
deleted file mode 100644
index fc197cb6ec0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-nowrap.html]
-  [flexbox | computed style | flex-flow: column nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini
deleted file mode 100644
index c5ee46bf6e2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-nowrap.html]
-  [flexbox | computed style | flex-flow: column-reverse nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini
deleted file mode 100644
index 13b116ec47e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-wrap.html]
-  [flexbox | computed style | flex-flow: column-reverse wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini
deleted file mode 100644
index 4f60805341c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse.html]
-  [flexbox | computed style | flex-flow: column-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini
deleted file mode 100644
index 901afba629e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: column wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini
deleted file mode 100644
index 94d16f09623..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap.html]
-  [flexbox | computed style | flex-flow: column wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini
deleted file mode 100644
index 0e08f759bab..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column.html]
-  [flexbox | computed style | flex-flow: column]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini
deleted file mode 100644
index d7c4a4050fd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-nowrap.html]
-  [flexbox | computed style | flex-flow: nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini
deleted file mode 100644
index a5c966541aa..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-nowrap.html]
-  [flexbox | computed style | flex-flow: row nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini
deleted file mode 100644
index 88bbe8d0a6a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-nowrap.html]
-  [flexbox | computed style | flex-flow: row-reverse nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini
deleted file mode 100644
index 815110a0480..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: row-reverse wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini
deleted file mode 100644
index 718372fc420..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap.html]
-  [flexbox | computed style | flex-flow: row-reverse wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini
deleted file mode 100644
index 5554988bfb1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse.html]
-  [flexbox | computed style | flex-flow: row-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini
deleted file mode 100644
index 36ba04149ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: row wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini
deleted file mode 100644
index 5e5190b2858..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap.html]
-  [flexbox | computed style | flex-flow: row wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini
deleted file mode 100644
index 67b31fd6552..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row.html]
-  [flexbox | computed style | flex-flow: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini
deleted file mode 100644
index 003bdd3e5b1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-wrap.html]
-  [flexbox | computed style | flex-flow: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini
deleted file mode 100644
index fd7326350f4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-0.html]
-  [flexbox | computed style | flex-grow: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini
deleted file mode 100644
index 2a99afcd1f0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-invalid.html]
-  [flexbox | computed style | flex-grow: negative]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini
deleted file mode 100644
index fc3b4541f11..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-number.html]
-  [flexbox | computed style | flex-grow: number]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini
deleted file mode 100644
index 52c82c27c4a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-0-auto.html]
-  [flexbox | computed style | flex: 0 auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini
deleted file mode 100644
index 4dd6b18b9a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-auto.html]
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini
deleted file mode 100644
index 7398fd1c05d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-initial.html]
-  [flexbox | computed style | flex: initial]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini
deleted file mode 100644
index d5a26995479..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-invalid.html]
-  [flexbox | computed style | flex: invalid]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini
deleted file mode 100644
index b5c7ea0e059..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-none.html]
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini
deleted file mode 100644
index ba239f1c45f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand.html]
-  [flexbox | computed style | flex: invalid]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini
deleted file mode 100644
index 19cdb9b30a9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-0.html]
-  [flexbox | computed style | flex-shrink: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini
deleted file mode 100644
index 8bf5fd3bc7e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-invalid.html]
-  [flexbox | computed style | flex-shrink: negative]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini
deleted file mode 100644
index 885bf985359..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-number.html]
-  [flexbox | computed style | flex-shrink: number]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini
deleted file mode 100644
index a9e5785fa48..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-invalid.html]
-  [flexbox | computed style | flex-wrap: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini
deleted file mode 100644
index 351acbbf4eb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-nowrap.html]
-  [flexbox | computed style | flex-wrap: nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini
deleted file mode 100644
index e5c292e64d2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-wrap-reverse.html]
-  [flexbox | computed style | flex-wrap: wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini
deleted file mode 100644
index 7313ee84c10..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-wrap.html]
-  [flexbox | computed style | flex-wrap: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini
deleted file mode 100644
index 1cb646a0e70..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-inherit.html]
-  [flexbox | computed style | order: -1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini
deleted file mode 100644
index 2c5dd1710ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-integer.html]
-  [flexbox | computed style | order: integer]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini
deleted file mode 100644
index 7fae032d536..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-invalid.html]
-  [flexbox | computed style | order: noninteger]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini
deleted file mode 100644
index 1e4068b8f72..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-negative.html]
-  [flexbox | computed style | order: -1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini
deleted file mode 100644
index a34142cf16c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order.html]
-  [flexbox | computed style | order: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
index 79eb41e58fb..978aabbdb4b 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/hittest-before-pseudo.html.ini
@@ -1,4 +1,5 @@
 [hittest-before-pseudo.html]
+  expected: CRASH
   [Hit-testing text within a pseudo-element flex-item should return the flexbox as the hittest result.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
index 862f9664076..7f017d75b1d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
@@ -1,58 +1,22 @@
 [inheritance.html]
-  [Property flex-wrap has initial value nowrap]
-    expected: FAIL
-
-  [Property order has initial value 0]
-    expected: FAIL
-
   [Property align-self does not inherit]
     expected: FAIL
 
-  [Property flex-direction does not inherit]
-    expected: FAIL
-
-  [Property flex-wrap does not inherit]
-    expected: FAIL
-
-  [Property flex-grow has initial value 0]
-    expected: FAIL
-
-  [Property flex-direction has initial value row]
-    expected: FAIL
-
   [Property align-items has initial value normal]
     expected: FAIL
 
-  [Property flex-basis has initial value auto]
-    expected: FAIL
-
   [Property align-content has initial value normal]
     expected: FAIL
 
   [Property justify-content has initial value normal]
     expected: FAIL
 
-  [Property flex-grow does not inherit]
-    expected: FAIL
-
-  [Property order does not inherit]
-    expected: FAIL
-
-  [Property flex-shrink does not inherit]
-    expected: FAIL
-
   [Property align-items does not inherit]
     expected: FAIL
 
   [Property align-self has initial value auto]
     expected: FAIL
 
-  [Property flex-basis does not inherit]
-    expected: FAIL
-
-  [Property flex-shrink has initial value 1]
-    expected: FAIL
-
   [Property justify-content does not inherit]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex-min-content-height.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex-min-content-height.html.ini
index 3b08aadc79a..60c72e8a79c 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex-min-content-height.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex-min-content-height.html.ini
@@ -1,2 +1,2 @@
 [inline-flex-min-content-height.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
index adf39bf4ad9..0dc0334a908 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
@@ -1,4 +1,5 @@
 [inline-flexbox-wrap-vertically-width-calculation.html]
+  expected: CRASH
   [.inline-flexbox 13]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html.ini
index 0eb3312218d..8eb7dfdd077 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/intrinsic-width-orthogonal-writing-mode.html.ini
@@ -1,4 +1,5 @@
 [intrinsic-width-orthogonal-writing-mode.html]
+  expected: CRASH
   [.inline-flexbox 3]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-max-height-and-scrollbar.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-max-height-and-scrollbar.html.ini
new file mode 100644
index 00000000000..58c2f7fbcf5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-max-height-and-scrollbar.html.ini
@@ -0,0 +1,2 @@
+[item-with-max-height-and-scrollbar.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini
new file mode 100644
index 00000000000..e724aaff1ff
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini
@@ -0,0 +1,2 @@
+[layout-algorithm_algo-cross-line-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/negative-margins-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/negative-margins-001.html.ini
index a07b66f3699..577bffaf651 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/negative-margins-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/negative-margins-001.html.ini
@@ -1,2 +1,2 @@
 [negative-margins-001.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini
new file mode 100644
index 00000000000..a1dee88680c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini
@@ -0,0 +1,2 @@
+[nested-orthogonal-flexbox-relayout.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
new file mode 100644
index 00000000000..78e4433fc14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
new file mode 100644
index 00000000000..5b1a9bb41ad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini
new file mode 100644
index 00000000000..f9df389a34e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini
@@ -0,0 +1,2 @@
+[overflow-auto-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
index 8d018f57eb8..befecf126b4 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
@@ -1,4 +1,5 @@
 [overflow-auto-006.html]
+  expected: CRASH
   [.flexbox, .inline-flexbox 10]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-008.html.ini
deleted file mode 100644
index 6bdbcc048d0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-auto-008.html]
-  [hbox dimensions]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini
deleted file mode 100644
index 19fcc32c5b0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[flex-basis-computed.html]
-  [Property flex-basis value 'auto']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10% + 0px)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10px - 0.5em)']
-    expected: FAIL
-
-  [Property flex-basis value '1px']
-    expected: FAIL
-
-  [Property flex-basis value '400%']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10px + 0.5em)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10%)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(0% + 10px)']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini
deleted file mode 100644
index 7c16080be8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-basis-valid.html]
-  [e.style['flex-basis'\] = "400%" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "calc(2em + 3ex)" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "auto" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "1px" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini
deleted file mode 100644
index 888fd616228..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-direction-computed.html]
-  [Property flex-direction value 'row']
-    expected: FAIL
-
-  [Property flex-direction value 'row-reverse']
-    expected: FAIL
-
-  [Property flex-direction value 'column-reverse']
-    expected: FAIL
-
-  [Property flex-direction value 'column']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini
deleted file mode 100644
index 6fdd5b2932a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-direction-valid.html]
-  [e.style['flex-direction'\] = "column" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "row" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "row-reverse" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "column-reverse" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini
deleted file mode 100644
index f855827a8da..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[flex-flow-shorthand.html]
-  [e.style['flex-flow'\] = "wrap row-reverse" should set flex-wrap]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set flex-wrap]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set flex-direction]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should set flex-direction]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini
deleted file mode 100644
index d1e9bbb4dd8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-flow-valid.html]
-  [e.style['flex-flow'\] = "column nowrap" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
index 096b1fb6fa9..61f4f40409e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
@@ -5,9 +5,3 @@
   [Property flex-grow value '6.78e+08']
     expected: FAIL
 
-  [Property flex-grow value '1']
-    expected: FAIL
-
-  [Property flex-grow value '0']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini
deleted file mode 100644
index 5c825aafb52..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-grow-valid.html]
-  [e.style['flex-grow'\] = "23.4e5" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = "1" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = "+.678E9" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = ".0" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini
deleted file mode 100644
index 986891e5386..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[flex-shorthand.html]
-  [e.style['flex'\] = "2 3" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should not set unrelated longhands]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
index 0be944c836b..3e7167c2837 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
@@ -1,10 +1,4 @@
 [flex-shrink-computed.html]
-  [Property flex-shrink value '1']
-    expected: FAIL
-
-  [Property flex-shrink value '0']
-    expected: FAIL
-
   [Property flex-shrink value '2.34e+06']
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini
deleted file mode 100644
index 8aab89d4aac..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-shrink-valid.html]
-  [e.style['flex-shrink'\] = ".0" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "+.678E9" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "23.4e5" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "1" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini
deleted file mode 100644
index e0903f4895d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[flex-valid.html]
-  [e.style['flex'\] = "4 5 6px" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini
deleted file mode 100644
index 1df07deeb82..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-wrap-computed.html]
-  [Property flex-wrap value 'wrap-reverse']
-    expected: FAIL
-
-  [Property flex-wrap value 'nowrap']
-    expected: FAIL
-
-  [Property flex-wrap value 'wrap']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini
deleted file mode 100644
index 07ed21672a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-wrap-valid.html]
-  [e.style['flex-wrap'\] = "wrap" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-wrap'\] = "wrap-reverse" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-wrap'\] = "nowrap" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini
deleted file mode 100644
index e1910036ad0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[order-computed.html]
-  [Property order value '123']
-    expected: FAIL
-
-  [Property order value '0']
-    expected: FAIL
-
-  [Property order value '-45']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini
deleted file mode 100644
index 0e08fe62a12..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[order-valid.html]
-  [e.style['order'\] = "0" should set the property value]
-    expected: FAIL
-
-  [e.style['order'\] = "123" should set the property value]
-    expected: FAIL
-
-  [e.style['order'\] = "-45" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-004.html.ini
index 988af23e1f6..f8a835cd041 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-004.html.ini
@@ -1,2 +1,2 @@
 [percentage-heights-004.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-005.html.ini
new file mode 100644
index 00000000000..43dbfda9eb4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-005.html.ini
@@ -0,0 +1,2 @@
+[percentage-heights-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini
new file mode 100644
index 00000000000..95ad315960d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini
@@ -0,0 +1,2 @@
+[percentage-heights-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini
new file mode 100644
index 00000000000..d0931b7035b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini
@@ -0,0 +1,2 @@
+[percentage-heights-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-height-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-height-001.html.ini
new file mode 100644
index 00000000000..bf793b6bed2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-height-001.html.ini
@@ -0,0 +1,2 @@
+[percentage-max-height-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-006.html.ini
new file mode 100644
index 00000000000..26ca563c9ea
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-006.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-007.html.ini
new file mode 100644
index 00000000000..329ee060af2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-007.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-007.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-008.html.ini
new file mode 100644
index 00000000000..9c4d663e2dc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-008.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-009.html.ini
new file mode 100644
index 00000000000..f131b035208
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-009.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-010.html.ini
new file mode 100644
index 00000000000..de0032c5bae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-010.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-011.html.ini
new file mode 100644
index 00000000000..2c92344a9c5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-011.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini
new file mode 100644
index 00000000000..3bd75e7d0a7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini
@@ -0,0 +1,2 @@
+[position-fixed-001.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini
new file mode 100644
index 00000000000..198674c9407
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini
@@ -0,0 +1,2 @@
+[stretch-input-in-column.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-003.html.ini
new file mode 100644
index 00000000000..c3b53364e9b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-003.html.ini
@@ -0,0 +1,2 @@
+[stretch-obeys-min-max-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini
new file mode 100644
index 00000000000..df59e9b5328
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini
@@ -0,0 +1,2 @@
+[stretching-orthogonal-flows.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini
new file mode 100644
index 00000000000..e8672a3bd87
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-change-cell.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
new file mode 100644
index 00000000000..21a3897f188
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
@@ -0,0 +1,2 @@
+[text-overflow-on-flexbox-001.html]
+  expected: FAIL