From c5424d579d1038f5b1e68b30f5c076cacd0fc8dd Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sat, 12 Dec 2020 08:41:09 +0000
Subject: [PATCH] Update web-platform-tests to revision
 90a1381e3736eca4700c1b08fee8f313fea20593

---
 .../metadata-layout-2020/cors/basic.htm.ini   |   10 +
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 ...box-align-items-center-nested-001.html.ini |    2 +
 ...x-align-self-baseline-horiz-001a.xhtml.ini |    1 -
 ...x-align-self-baseline-horiz-001b.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-002.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-003.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-005.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-006.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-007.xhtml.ini |    1 -
 ...ox-align-self-baseline-horiz-008.xhtml.ini |    2 +
 ...exbox-align-self-horiz-001-block.xhtml.ini |    1 -
 ...exbox-align-self-horiz-001-table.xhtml.ini |    1 -
 .../flexbox-align-self-horiz-002.xhtml.ini    |    1 -
 .../flexbox-align-self-horiz-003.xhtml.ini    |    1 -
 .../flexbox-align-self-horiz-004.xhtml.ini    |    1 -
 ...exbox-align-self-stretch-vert-002.html.ini |    1 -
 .../flexbox-align-self-vert-001.xhtml.ini     |    1 -
 .../flexbox-align-self-vert-002.xhtml.ini     |    1 -
 .../flexbox-align-self-vert-003.xhtml.ini     |    1 -
 .../flexbox-align-self-vert-004.xhtml.ini     |    1 -
 .../flexbox-align-self-vert-rtl-001.xhtml.ini |    1 -
 .../flexbox-align-self-vert-rtl-002.xhtml.ini |    1 -
 .../flexbox-align-self-vert-rtl-003.xhtml.ini |    1 -
 .../flexbox-align-self-vert-rtl-004.xhtml.ini |    1 -
 .../flexbox-align-self-vert-rtl-005.xhtml.ini |    2 +
 ...ine-align-self-baseline-horiz-001.html.ini |    1 -
 ...line-align-self-baseline-vert-001.html.ini |    1 -
 ...ox-baseline-multi-item-horiz-001a.html.ini |    2 +
 ...ox-baseline-multi-item-horiz-001b.html.ini |    2 +
 ...box-baseline-multi-item-vert-001a.html.ini |    2 +
 ...box-baseline-multi-item-vert-001b.html.ini |    2 +
 ...box-baseline-multi-line-horiz-001.html.ini |    1 -
 ...box-baseline-multi-line-horiz-002.html.ini |    1 -
 ...box-baseline-multi-line-horiz-003.html.ini |    1 -
 ...box-baseline-multi-line-horiz-004.html.ini |    1 -
 ...xbox-baseline-multi-line-vert-001.html.ini |    1 -
 ...xbox-baseline-multi-line-vert-002.html.ini |    1 -
 ...flexbox-baseline-single-item-001a.html.ini |    1 -
 ...flexbox-baseline-single-item-001b.html.ini |    1 -
 .../flexbox-basic-block-horiz-001v.xhtml.ini  |    2 +
 .../flexbox-basic-block-vert-001.xhtml.ini    |    1 -
 .../flexbox-basic-block-vert-001v.xhtml.ini   |    2 +
 .../flexbox-basic-canvas-horiz-001.xhtml.ini  |    1 -
 .../flexbox-basic-canvas-horiz-001v.xhtml.ini |    2 +
 .../flexbox-basic-canvas-vert-001.xhtml.ini   |    1 -
 .../flexbox-basic-canvas-vert-001v.xhtml.ini  |    2 +
 ...flexbox-basic-fieldset-horiz-001.xhtml.ini |    1 -
 .../flexbox-basic-fieldset-vert-001.xhtml.ini |    1 -
 .../flexbox-basic-iframe-horiz-001.xhtml.ini  |    1 -
 .../flexbox-basic-iframe-vert-001.xhtml.ini   |    1 -
 .../flexbox-basic-img-horiz-001.xhtml.ini     |    1 -
 .../flexbox-basic-img-vert-001.xhtml.ini      |    1 -
 ...flexbox-basic-textarea-horiz-001.xhtml.ini |    1 -
 .../flexbox-basic-textarea-vert-001.xhtml.ini |    1 -
 .../flexbox-basic-video-horiz-001.xhtml.ini   |    1 -
 .../flexbox-basic-video-vert-001.xhtml.ini    |    1 -
 .../flexbox-break-request-horiz-001a.html.ini |    1 -
 .../flexbox-break-request-horiz-001b.html.ini |    1 -
 .../flexbox-break-request-horiz-002a.html.ini |    1 -
 .../flexbox-break-request-horiz-002b.html.ini |    1 -
 .../flexbox-break-request-vert-001a.html.ini  |    1 -
 .../flexbox-break-request-vert-001b.html.ini  |    1 -
 .../flexbox-break-request-vert-002a.html.ini  |    1 -
 .../flexbox-break-request-vert-002b.html.ini  |    1 -
 ...exbox-collapsed-item-baseline-001.html.ini |    1 -
 .../flexbox-collapsed-item-horiz-001.html.ini |    1 -
 .../flexbox-collapsed-item-horiz-002.html.ini |    1 -
 .../flexbox-collapsed-item-horiz-003.html.ini |    1 -
 .../flexbox-column-row-gap-001.html.ini       |    2 +
 .../flexbox-column-row-gap-002.html.ini       |    2 +
 .../flexbox-column-row-gap-003.html.ini       |    2 +
 .../flexbox-column-row-gap-004.html.ini       |    2 +
 .../flexbox-definite-sizes-001.html.ini       |    2 +
 .../flexbox-definite-sizes-002.html.ini       |    2 +
 .../flexbox-definite-sizes-003.html.ini       |    2 +
 .../flexbox-definite-sizes-004.html.ini       |    2 +
 .../flexbox-definite-sizes-005.html.ini       |    2 +
 .../flexbox-flex-basis-content-001a.html.ini  |    2 +
 .../flexbox-flex-basis-content-001b.html.ini  |    2 +
 .../flexbox-flex-basis-content-002a.html.ini  |    2 +
 .../flexbox-flex-basis-content-002b.html.ini  |    2 +
 .../flexbox-flex-basis-content-004a.html.ini  |    2 +
 .../flexbox-flex-basis-content-004b.html.ini  |    2 +
 .../flexbox-flex-flow-001.html.ini            |    1 -
 .../flexbox-flex-flow-002.html.ini            |    1 -
 .../flexbox-flex-wrap-vert-001.html.ini       |    1 -
 .../flexbox-flex-wrap-vert-002.html.ini       |    1 -
 ...x-items-as-stacking-contexts-001.xhtml.ini |    1 -
 ...exbox-justify-content-horiz-001a.xhtml.ini |    1 -
 ...exbox-justify-content-horiz-001b.xhtml.ini |    1 -
 ...lexbox-justify-content-horiz-002.xhtml.ini |    1 -
 ...lexbox-justify-content-horiz-003.xhtml.ini |    1 -
 ...lexbox-justify-content-horiz-004.xhtml.ini |    1 -
 ...lexbox-justify-content-horiz-005.xhtml.ini |    1 -
 ...lexbox-justify-content-horiz-006.xhtml.ini |    2 +
 ...lexbox-justify-content-vert-001a.xhtml.ini |    1 -
 ...lexbox-justify-content-vert-001b.xhtml.ini |    1 -
 ...flexbox-justify-content-vert-002.xhtml.ini |    1 -
 ...flexbox-justify-content-vert-003.xhtml.ini |    1 -
 ...flexbox-justify-content-vert-004.xhtml.ini |    1 -
 ...flexbox-justify-content-vert-005.xhtml.ini |    1 -
 ...flexbox-justify-content-vert-006.xhtml.ini |    2 +
 ...exbox-justify-content-wmvert-001.xhtml.ini |    2 +
 .../flexbox-margin-auto-horiz-001.xhtml.ini   |    1 -
 ...lexbox-mbp-horiz-001-rtl-reverse.xhtml.ini |    1 -
 .../flexbox-mbp-horiz-001-rtl.xhtml.ini       |    1 -
 .../flexbox-mbp-horiz-002v.xhtml.ini          |    2 +
 .../flexbox-min-height-auto-001.html.ini      |    1 -
 .../flexbox-min-height-auto-002a.html.ini     |    1 -
 .../flexbox-min-height-auto-002b.html.ini     |    1 -
 .../flexbox-min-height-auto-002c.html.ini     |    1 -
 .../flexbox-min-height-auto-003.html.ini      |    1 -
 .../flexbox-min-height-auto-004.html.ini      |    1 -
 .../flexbox-min-width-auto-001.html.ini       |    1 -
 .../flexbox-min-width-auto-002a.html.ini      |    1 -
 .../flexbox-min-width-auto-002b.html.ini      |    1 -
 .../flexbox-min-width-auto-002c.html.ini      |    1 -
 .../flexbox-min-width-auto-003.html.ini       |    1 -
 .../flexbox-min-width-auto-004.html.ini       |    1 -
 .../flexbox-overflow-horiz-001.html.ini       |    1 -
 .../flexbox-overflow-horiz-002.html.ini       |    1 -
 .../flexbox-overflow-vert-001.html.ini        |    1 -
 .../flexbox-overflow-vert-004.html.ini        |    1 -
 .../flexbox-overflow-vert-005.html.ini        |    1 -
 .../flexbox-paint-ordering-001.xhtml.ini      |    1 -
 .../flexbox-paint-ordering-002.xhtml.ini      |    1 -
 ...lexbox-safe-overflow-position-001.html.ini |    2 +
 .../flexbox-single-line-clamp-1.html.ini      |    1 -
 .../flexbox-single-line-clamp-3.html.ini      |    1 -
 .../flexbox-sizing-horiz-001.xhtml.ini        |    1 -
 .../flexbox-sizing-horiz-002.xhtml.ini        |    1 -
 .../flexbox-sizing-vert-001.xhtml.ini         |    1 -
 .../flexbox-sizing-vert-002.xhtml.ini         |    1 -
 ...flexbox-whitespace-handling-001a.xhtml.ini |    1 -
 .../flexbox-writing-mode-001.html.ini         |    1 -
 .../flexbox-writing-mode-002.html.ini         |    1 -
 .../flexbox-writing-mode-003.html.ini         |    1 -
 .../flexbox-writing-mode-004.html.ini         |    1 -
 .../flexbox-writing-mode-005.html.ini         |    1 -
 .../flexbox-writing-mode-006.html.ini         |    1 -
 .../flexbox-writing-mode-008.html.ini         |    1 -
 .../flexbox-writing-mode-009.html.ini         |    1 -
 .../flexbox-writing-mode-010.html.ini         |    2 +
 .../flexbox-writing-mode-011.html.ini         |    2 +
 .../flexbox-writing-mode-012.html.ini         |    2 +
 .../flexbox-writing-mode-013.html.ini         |    2 +
 .../flexbox-writing-mode-014.html.ini         |    2 +
 .../flexbox-writing-mode-015.html.ini         |    2 +
 .../flexbox-writing-mode-016.html.ini         |    2 +
 ...ion-absolute-containing-block-001.html.ini |    2 +
 ...ion-absolute-containing-block-002.html.ini |    2 +
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +
 .../css-ui/parsing/resize-computed.html.ini   |    6 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../fetch/content-type/response.window.js.ini |    9 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 .../traverse_the_history_2.html.ini           |    4 -
 .../traverse_the_history_4.html.ini           |    4 -
 .../traverse_the_history_5.html.ini           |    4 -
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    3 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 .../form-double-submit-3.html.ini             |    4 +
 ...ndboxed-iframe-with-opaque-origin.html.ini |   14 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 -
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webmessaging/with-ports/017.html.ini      |    5 +
 .../webmessaging/with-ports/018.html.ini      |    5 -
 .../webmessaging/without-ports/017.html.ini   |    5 +
 tests/wpt/metadata/MANIFEST.json              | 6878 ++++++++---------
 tests/wpt/metadata/cors/basic.htm.ini         |    9 +
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 ...box-align-items-center-nested-001.html.ini |    2 +
 ...x-align-self-baseline-horiz-001a.xhtml.ini |    2 +
 ...x-align-self-baseline-horiz-001b.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-002.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-003.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-005.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-006.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-007.xhtml.ini |    2 +
 ...ox-align-self-baseline-horiz-008.xhtml.ini |    2 +
 ...exbox-align-self-horiz-001-block.xhtml.ini |    2 +
 ...exbox-align-self-horiz-001-table.xhtml.ini |    2 +
 .../flexbox-align-self-horiz-002.xhtml.ini    |    2 +
 .../flexbox-align-self-horiz-003.xhtml.ini    |    2 +
 .../flexbox-align-self-horiz-004.xhtml.ini    |    2 +
 ...exbox-align-self-stretch-vert-002.html.ini |    2 +
 .../flexbox-align-self-vert-001.xhtml.ini     |    2 +
 .../flexbox-align-self-vert-002.xhtml.ini     |    2 +
 .../flexbox-align-self-vert-003.xhtml.ini     |    2 +
 .../flexbox-align-self-vert-004.xhtml.ini     |    2 +
 .../flexbox-align-self-vert-rtl-001.xhtml.ini |    2 +
 .../flexbox-align-self-vert-rtl-002.xhtml.ini |    2 +
 .../flexbox-align-self-vert-rtl-003.xhtml.ini |    2 +
 .../flexbox-align-self-vert-rtl-004.xhtml.ini |    2 +
 .../flexbox-align-self-vert-rtl-005.xhtml.ini |    2 +
 ...ine-align-self-baseline-horiz-001.html.ini |    2 +
 ...line-align-self-baseline-vert-001.html.ini |    2 +
 ...ox-baseline-multi-item-horiz-001a.html.ini |    2 +
 ...ox-baseline-multi-item-horiz-001b.html.ini |    2 +
 ...box-baseline-multi-item-vert-001a.html.ini |    2 +
 ...box-baseline-multi-item-vert-001b.html.ini |    2 +
 ...box-baseline-multi-line-horiz-001.html.ini |    2 +
 ...box-baseline-multi-line-horiz-002.html.ini |    2 +
 ...box-baseline-multi-line-horiz-003.html.ini |    2 +
 ...box-baseline-multi-line-horiz-004.html.ini |    2 +
 ...xbox-baseline-multi-line-vert-001.html.ini |    2 +
 ...xbox-baseline-multi-line-vert-002.html.ini |    2 +
 ...flexbox-baseline-single-item-001a.html.ini |    2 +
 ...flexbox-baseline-single-item-001b.html.ini |    2 +
 .../flexbox-basic-block-horiz-001v.xhtml.ini  |    2 +
 .../flexbox-basic-block-vert-001.xhtml.ini    |    2 +
 .../flexbox-basic-block-vert-001v.xhtml.ini   |    2 +
 .../flexbox-basic-canvas-horiz-001.xhtml.ini  |    2 +
 .../flexbox-basic-canvas-horiz-001v.xhtml.ini |    2 +
 .../flexbox-basic-canvas-vert-001.xhtml.ini   |    2 +
 .../flexbox-basic-canvas-vert-001v.xhtml.ini  |    2 +
 ...flexbox-basic-fieldset-horiz-001.xhtml.ini |    2 +
 .../flexbox-basic-fieldset-vert-001.xhtml.ini |    2 +
 .../flexbox-basic-iframe-horiz-001.xhtml.ini  |    2 +
 .../flexbox-basic-iframe-vert-001.xhtml.ini   |    2 +
 .../flexbox-basic-img-horiz-001.xhtml.ini     |    2 +
 .../flexbox-basic-img-vert-001.xhtml.ini      |    2 +
 ...flexbox-basic-textarea-horiz-001.xhtml.ini |    2 +
 .../flexbox-basic-textarea-vert-001.xhtml.ini |    2 +
 .../flexbox-basic-video-horiz-001.xhtml.ini   |    2 +
 .../flexbox-basic-video-vert-001.xhtml.ini    |    2 +
 .../flexbox-break-request-horiz-001a.html.ini |    2 +
 .../flexbox-break-request-horiz-001b.html.ini |    2 +
 .../flexbox-break-request-horiz-002a.html.ini |    2 +
 .../flexbox-break-request-horiz-002b.html.ini |    2 +
 .../flexbox-break-request-vert-001a.html.ini  |    2 +
 .../flexbox-break-request-vert-001b.html.ini  |    2 +
 .../flexbox-break-request-vert-002a.html.ini  |    2 +
 .../flexbox-break-request-vert-002b.html.ini  |    2 +
 ...exbox-collapsed-item-baseline-001.html.ini |    2 +
 .../flexbox-collapsed-item-horiz-001.html.ini |    2 +
 .../flexbox-collapsed-item-horiz-002.html.ini |    2 +
 .../flexbox-collapsed-item-horiz-003.html.ini |    2 +
 .../flexbox-column-row-gap-001.html.ini       |    2 +
 .../flexbox-column-row-gap-002.html.ini       |    2 +
 .../flexbox-column-row-gap-003.html.ini       |    2 +
 .../flexbox-column-row-gap-004.html.ini       |    2 +
 .../flexbox-definite-sizes-001.html.ini       |    2 +
 .../flexbox-definite-sizes-002.html.ini       |    2 +
 .../flexbox-definite-sizes-003.html.ini       |    2 +
 .../flexbox-definite-sizes-004.html.ini       |    2 +
 .../flexbox-definite-sizes-005.html.ini       |    2 +
 .../flexbox-flex-basis-content-001a.html.ini  |    2 +
 .../flexbox-flex-basis-content-001b.html.ini  |    2 +
 .../flexbox-flex-basis-content-002a.html.ini  |    2 +
 .../flexbox-flex-basis-content-002b.html.ini  |    2 +
 .../flexbox-flex-basis-content-004a.html.ini  |    2 +
 .../flexbox-flex-basis-content-004b.html.ini  |    2 +
 .../flexbox-flex-flow-001.html.ini            |    2 +
 .../flexbox-flex-flow-002.html.ini            |    2 +
 .../flexbox-flex-wrap-vert-001.html.ini       |    2 +
 .../flexbox-flex-wrap-vert-002.html.ini       |    2 +
 ...x-items-as-stacking-contexts-001.xhtml.ini |    2 +
 ...exbox-justify-content-horiz-001a.xhtml.ini |    2 +
 ...exbox-justify-content-horiz-001b.xhtml.ini |    2 +
 ...lexbox-justify-content-horiz-002.xhtml.ini |    2 +
 ...lexbox-justify-content-horiz-003.xhtml.ini |    2 +
 ...lexbox-justify-content-horiz-004.xhtml.ini |    2 +
 ...lexbox-justify-content-horiz-005.xhtml.ini |    2 +
 ...lexbox-justify-content-horiz-006.xhtml.ini |    2 +
 ...lexbox-justify-content-vert-001a.xhtml.ini |    2 +
 ...lexbox-justify-content-vert-001b.xhtml.ini |    2 +
 ...flexbox-justify-content-vert-002.xhtml.ini |    2 +
 ...flexbox-justify-content-vert-003.xhtml.ini |    2 +
 ...flexbox-justify-content-vert-004.xhtml.ini |    2 +
 ...flexbox-justify-content-vert-005.xhtml.ini |    2 +
 ...flexbox-justify-content-vert-006.xhtml.ini |    2 +
 ...exbox-justify-content-wmvert-001.xhtml.ini |    2 +
 .../flexbox-margin-auto-horiz-001.xhtml.ini   |    2 +
 ...lexbox-mbp-horiz-001-rtl-reverse.xhtml.ini |    2 +
 .../flexbox-mbp-horiz-001-rtl.xhtml.ini       |    2 +
 .../flexbox-mbp-horiz-002v.xhtml.ini          |    2 +
 .../flexbox-min-height-auto-001.html.ini      |    2 +
 .../flexbox-min-height-auto-002a.html.ini     |    2 +
 .../flexbox-min-height-auto-002b.html.ini     |    2 +
 .../flexbox-min-height-auto-002c.html.ini     |    2 +
 .../flexbox-min-height-auto-003.html.ini      |    2 +
 .../flexbox-min-height-auto-004.html.ini      |    2 +
 .../flexbox-min-width-auto-001.html.ini       |    2 +
 .../flexbox-min-width-auto-002a.html.ini      |    2 +
 .../flexbox-min-width-auto-002b.html.ini      |    2 +
 .../flexbox-min-width-auto-002c.html.ini      |    2 +
 .../flexbox-min-width-auto-003.html.ini       |    2 +
 .../flexbox-min-width-auto-004.html.ini       |    2 +
 .../flexbox-overflow-horiz-001.html.ini       |    2 +
 .../flexbox-overflow-horiz-002.html.ini       |    2 +
 .../flexbox-overflow-vert-001.html.ini        |    2 +
 .../flexbox-overflow-vert-004.html.ini        |    2 +
 .../flexbox-overflow-vert-005.html.ini        |    2 +
 .../flexbox-paint-ordering-001.xhtml.ini      |    2 +
 .../flexbox-paint-ordering-002.xhtml.ini      |    2 +
 ...lexbox-safe-overflow-position-001.html.ini |    2 +
 .../flexbox-single-line-clamp-1.html.ini      |    2 +
 .../flexbox-single-line-clamp-3.html.ini      |    2 +
 .../flexbox-sizing-horiz-001.xhtml.ini        |    2 +
 .../flexbox-sizing-horiz-002.xhtml.ini        |    2 +
 .../flexbox-sizing-vert-001.xhtml.ini         |    2 +
 .../flexbox-sizing-vert-002.xhtml.ini         |    2 +
 ...flexbox-whitespace-handling-001a.xhtml.ini |    2 +
 .../flexbox-writing-mode-001.html.ini         |    2 +
 .../flexbox-writing-mode-002.html.ini         |    2 +
 .../flexbox-writing-mode-003.html.ini         |    2 +
 .../flexbox-writing-mode-004.html.ini         |    2 +
 .../flexbox-writing-mode-005.html.ini         |    2 +
 .../flexbox-writing-mode-006.html.ini         |    2 +
 .../flexbox-writing-mode-008.html.ini         |    2 +
 .../flexbox-writing-mode-009.html.ini         |    2 +
 .../flexbox-writing-mode-010.html.ini         |    2 +
 .../flexbox-writing-mode-011.html.ini         |    2 +
 .../flexbox-writing-mode-012.html.ini         |    2 +
 .../flexbox-writing-mode-013.html.ini         |    2 +
 .../flexbox-writing-mode-014.html.ini         |    2 +
 .../flexbox-writing-mode-015.html.ini         |    2 +
 .../flexbox-writing-mode-016.html.ini         |    2 +
 ...ion-absolute-containing-block-001.html.ini |    2 +
 ...ion-absolute-containing-block-002.html.ini |    2 +
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +
 .../css-ui/parsing/resize-computed.html.ini   |    6 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 ...flexbox-align-content-horiz-001a.xhtml.ini |    3 -
 ...flexbox-align-content-horiz-001b.xhtml.ini |    3 -
 .../flexbox-align-content-vert-001a.xhtml.ini |    3 -
 .../flexbox-align-content-vert-001b.xhtml.ini |    3 -
 .../flexbox/flexbox-mbp-horiz-004.xhtml.ini   |    3 -
 .../flexbox/flexbox-table-fixup-001.xhtml.ini |    3 -
 .../fetch/content-type/response.window.js.ini |    9 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 .../traverse_the_history_2.html.ini           |    4 -
 .../traverse_the_history_4.html.ini           |    4 -
 .../traverse_the_history_5.html.ini           |    4 -
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    3 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-2.html.ini |    2 +-
 .../form-double-submit-3.html.ini             |    4 +
 ...ndboxed-iframe-with-opaque-origin.html.ini |   12 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 -
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webmessaging/with-ports/017.html.ini      |    5 +
 .../webmessaging/with-ports/018.html.ini      |    5 -
 .../webmessaging/without-ports/017.html.ini   |    5 +
 tests/wpt/web-platform-tests/cors/basic.htm   |   64 +-
 .../cors/resources/cors-makeheader.py         |    2 +-
 .../tables/border-collapse-offset-001-ref.xht |    4 +-
 .../tables/border-collapse-offset-002-ref.xht |    4 +-
 .../flexbox-abspos-child-001-ref.html         |    0
 .../flexbox-abspos-child-001a.html            |    0
 .../flexbox-abspos-child-001b.html            |    0
 .../flexbox-abspos-child-002-ref.html         |    0
 .../flexbox-abspos-child-002.html             |    0
 ...box-align-items-center-nested-001-ref.html |    0
 ...flexbox-align-items-center-nested-001.html |    0
 ...ox-align-self-baseline-horiz-001-ref.xhtml |    0
 ...exbox-align-self-baseline-horiz-001a.xhtml |    0
 ...exbox-align-self-baseline-horiz-001b.xhtml |    0
 ...ox-align-self-baseline-horiz-002-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-002.xhtml |    0
 ...ox-align-self-baseline-horiz-003-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-003.xhtml |    0
 ...ox-align-self-baseline-horiz-004-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-004.xhtml |    0
 ...ox-align-self-baseline-horiz-005-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-005.xhtml |    0
 ...ox-align-self-baseline-horiz-006-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-006.xhtml |    0
 ...ox-align-self-baseline-horiz-007-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-007.xhtml |    0
 ...ox-align-self-baseline-horiz-008-ref.xhtml |    0
 ...lexbox-align-self-baseline-horiz-008.xhtml |    0
 .../flexbox-align-self-horiz-001-block.xhtml  |    0
 .../flexbox-align-self-horiz-001-ref.xhtml    |    0
 .../flexbox-align-self-horiz-001-table.xhtml  |    0
 .../flexbox-align-self-horiz-002-ref.xhtml    |    0
 .../flexbox-align-self-horiz-002.xhtml        |    0
 .../flexbox-align-self-horiz-003-ref.xhtml    |    0
 .../flexbox-align-self-horiz-003.xhtml        |    0
 .../flexbox-align-self-horiz-004-ref.xhtml    |    0
 .../flexbox-align-self-horiz-004.xhtml        |    0
 .../flexbox-align-self-horiz-005-ref.xhtml    |    0
 .../flexbox-align-self-horiz-005.xhtml        |    0
 ...exbox-align-self-stretch-vert-001-ref.html |    0
 .../flexbox-align-self-stretch-vert-001.html  |    0
 ...exbox-align-self-stretch-vert-002-ref.html |    0
 .../flexbox-align-self-stretch-vert-002.html  |    0
 .../flexbox-align-self-vert-001-ref.xhtml     |    0
 .../flexbox-align-self-vert-001.xhtml         |    0
 .../flexbox-align-self-vert-002-ref.xhtml     |    0
 .../flexbox-align-self-vert-002.xhtml         |    0
 .../flexbox-align-self-vert-003-ref.xhtml     |    0
 .../flexbox-align-self-vert-003.xhtml         |    0
 .../flexbox-align-self-vert-004-ref.xhtml     |    0
 .../flexbox-align-self-vert-004.xhtml         |    0
 .../flexbox-align-self-vert-rtl-001-ref.xhtml |    0
 .../flexbox-align-self-vert-rtl-001.xhtml     |    0
 .../flexbox-align-self-vert-rtl-002-ref.xhtml |    0
 .../flexbox-align-self-vert-rtl-002.xhtml     |    0
 .../flexbox-align-self-vert-rtl-003-ref.xhtml |    0
 .../flexbox-align-self-vert-rtl-003.xhtml     |    0
 .../flexbox-align-self-vert-rtl-004-ref.xhtml |    0
 .../flexbox-align-self-vert-rtl-004.xhtml     |    0
 .../flexbox-align-self-vert-rtl-005-ref.xhtml |    0
 .../flexbox-align-self-vert-rtl-005.xhtml     |    0
 .../flexbox-anonymous-items-001-ref.html      |    0
 .../flexbox-anonymous-items-001.html          |    0
 ...ine-align-self-baseline-horiz-001-ref.html |    0
 ...aseline-align-self-baseline-horiz-001.html |    0
 ...line-align-self-baseline-vert-001-ref.html |    3 +-
 ...baseline-align-self-baseline-vert-001.html |    3 +-
 .../flexbox-baseline-empty-001-ref.html       |    3 +-
 .../flexbox-baseline-empty-001a.html          |    3 +-
 .../flexbox-baseline-empty-001b.html          |    3 +-
 ...box-baseline-multi-item-horiz-001-ref.html |    0
 ...lexbox-baseline-multi-item-horiz-001a.html |    0
 ...lexbox-baseline-multi-item-horiz-001b.html |    0
 ...xbox-baseline-multi-item-vert-001-ref.html |    3 +-
 ...flexbox-baseline-multi-item-vert-001a.html |    3 +-
 ...flexbox-baseline-multi-item-vert-001b.html |    3 +-
 ...box-baseline-multi-line-horiz-001-ref.html |    0
 ...flexbox-baseline-multi-line-horiz-001.html |    0
 ...box-baseline-multi-line-horiz-002-ref.html |    0
 ...flexbox-baseline-multi-line-horiz-002.html |    0
 ...box-baseline-multi-line-horiz-003-ref.html |    0
 ...flexbox-baseline-multi-line-horiz-003.html |    0
 ...box-baseline-multi-line-horiz-004-ref.html |    0
 ...flexbox-baseline-multi-line-horiz-004.html |    0
 ...xbox-baseline-multi-line-vert-001-ref.html |    0
 .../flexbox-baseline-multi-line-vert-001.html |    0
 ...xbox-baseline-multi-line-vert-002-ref.html |    0
 .../flexbox-baseline-multi-line-vert-002.html |    0
 .../flexbox-baseline-single-item-001-ref.html |    0
 .../flexbox-baseline-single-item-001a.html    |    0
 .../flexbox-baseline-single-item-001b.html    |    0
 .../flexbox-basic-block-horiz-001-ref.xhtml   |    0
 .../flexbox-basic-block-horiz-001.xhtml       |    0
 .../flexbox-basic-block-horiz-001v.xhtml      |    0
 .../flexbox-basic-block-vert-001-ref.xhtml    |    0
 .../flexbox-basic-block-vert-001.xhtml        |    0
 .../flexbox-basic-block-vert-001v.xhtml       |    0
 .../flexbox-basic-canvas-horiz-001-ref.xhtml  |    0
 .../flexbox-basic-canvas-horiz-001.xhtml      |    0
 .../flexbox-basic-canvas-horiz-001v.xhtml     |    0
 .../flexbox-basic-canvas-vert-001-ref.xhtml   |    0
 .../flexbox-basic-canvas-vert-001.xhtml       |    0
 .../flexbox-basic-canvas-vert-001v.xhtml      |    0
 ...flexbox-basic-fieldset-horiz-001-ref.xhtml |    0
 .../flexbox-basic-fieldset-horiz-001.xhtml    |    0
 .../flexbox-basic-fieldset-vert-001-ref.xhtml |    0
 .../flexbox-basic-fieldset-vert-001.xhtml     |    0
 .../flexbox-basic-iframe-horiz-001-ref.xhtml  |    0
 .../flexbox-basic-iframe-horiz-001.xhtml      |    0
 .../flexbox-basic-iframe-vert-001-ref.xhtml   |    0
 .../flexbox-basic-iframe-vert-001.xhtml       |    0
 .../flexbox-basic-img-horiz-001-ref.xhtml     |    0
 .../flexbox-basic-img-horiz-001.xhtml         |    0
 .../flexbox-basic-img-vert-001-ref.xhtml      |    0
 .../flexbox-basic-img-vert-001.xhtml          |    0
 ...flexbox-basic-textarea-horiz-001-ref.xhtml |    0
 .../flexbox-basic-textarea-horiz-001.xhtml    |    0
 .../flexbox-basic-textarea-vert-001-ref.xhtml |    0
 .../flexbox-basic-textarea-vert-001.xhtml     |    0
 .../flexbox-basic-video-horiz-001-ref.xhtml   |    0
 .../flexbox-basic-video-horiz-001.xhtml       |    0
 .../flexbox-basic-video-vert-001-ref.xhtml    |    0
 .../flexbox-basic-video-vert-001.xhtml        |    0
 .../flexbox-break-request-horiz-001-ref.html  |    0
 .../flexbox-break-request-horiz-001a.html     |    0
 .../flexbox-break-request-horiz-001b.html     |    0
 .../flexbox-break-request-horiz-002-ref.html  |    0
 .../flexbox-break-request-horiz-002a.html     |    0
 .../flexbox-break-request-horiz-002b.html     |    0
 .../flexbox-break-request-vert-001-ref.html   |    0
 .../flexbox-break-request-vert-001a.html      |    0
 .../flexbox-break-request-vert-001b.html      |    0
 .../flexbox-break-request-vert-002-ref.html   |    0
 .../flexbox-break-request-vert-002a.html      |    0
 .../flexbox-break-request-vert-002b.html      |    0
 ...exbox-collapsed-item-baseline-001-ref.html |    0
 .../flexbox-collapsed-item-baseline-001.html  |    0
 .../flexbox-collapsed-item-horiz-001-ref.html |    0
 .../flexbox-collapsed-item-horiz-001.html     |    0
 .../flexbox-collapsed-item-horiz-002-ref.html |    0
 .../flexbox-collapsed-item-horiz-002.html     |    0
 .../flexbox-collapsed-item-horiz-003-ref.html |    0
 .../flexbox-collapsed-item-horiz-003.html     |    0
 .../flexbox-column-row-gap-001-ref.html       |    0
 .../flexbox-column-row-gap-001.html           |    0
 .../flexbox-column-row-gap-002-ref.html       |    0
 .../flexbox-column-row-gap-002.html           |    0
 .../flexbox-column-row-gap-003-ref.html       |    0
 .../flexbox-column-row-gap-003.html           |    0
 .../flexbox-column-row-gap-004-ref.html       |    0
 .../flexbox-column-row-gap-004.html           |    0
 .../flexbox-definite-sizes-001-ref.html       |    0
 .../flexbox-definite-sizes-001.html           |    0
 .../flexbox-definite-sizes-002.html           |    0
 .../flexbox-definite-sizes-003.html           |    0
 .../flexbox-definite-sizes-004.html           |    0
 .../flexbox-definite-sizes-005-ref.html       |    0
 .../flexbox-definite-sizes-005.html           |    0
 .../flexbox-dyn-resize-001-ref.html           |    0
 .../flexbox-dyn-resize-001.html               |    0
 .../flexbox-flex-basis-content-001-ref.html   |    3 +-
 .../flexbox-flex-basis-content-001a.html      |    3 +-
 .../flexbox-flex-basis-content-001b.html      |    3 +-
 .../flexbox-flex-basis-content-002-ref.html   |    3 +-
 .../flexbox-flex-basis-content-002a.html      |    3 +-
 .../flexbox-flex-basis-content-002b.html      |    3 +-
 .../flexbox-flex-basis-content-003-ref.html   |    0
 .../flexbox-flex-basis-content-003a.html      |    0
 .../flexbox-flex-basis-content-003b.html      |    0
 .../flexbox-flex-basis-content-004-ref.html   |    0
 .../flexbox-flex-basis-content-004a.html      |    0
 .../flexbox-flex-basis-content-004b.html      |    0
 .../flexbox-flex-flow-001-ref.html            |    0
 .../flexbox-flex-flow-001.html                |    0
 .../flexbox-flex-flow-002-ref.html            |    0
 .../flexbox-flex-flow-002.html                |    0
 .../flexbox-flex-wrap-horiz-001-ref.html      |    0
 .../flexbox-flex-wrap-horiz-001.html          |    0
 .../flexbox-flex-wrap-horiz-002-ref.html      |    0
 .../flexbox-flex-wrap-horiz-002.html          |    0
 .../flexbox-flex-wrap-vert-001-ref.html       |    0
 .../flexbox-flex-wrap-vert-001.html           |    0
 .../flexbox-flex-wrap-vert-002-ref.html       |    0
 .../flexbox-flex-wrap-vert-002.html           |    0
 ...x-items-as-stacking-contexts-001-ref.xhtml |    0
 ...exbox-items-as-stacking-contexts-001.xhtml |    0
 ...ox-items-as-stacking-contexts-002-ref.html |    0
 ...lexbox-items-as-stacking-contexts-002.html |    0
 ...ox-items-as-stacking-contexts-003-ref.html |    0
 ...lexbox-items-as-stacking-contexts-003.html |    0
 ...lexbox-justify-content-horiz-001-ref.xhtml |    0
 .../flexbox-justify-content-horiz-001a.xhtml  |    0
 .../flexbox-justify-content-horiz-001b.xhtml  |    0
 ...lexbox-justify-content-horiz-002-ref.xhtml |    0
 .../flexbox-justify-content-horiz-002.xhtml   |    0
 ...lexbox-justify-content-horiz-003-ref.xhtml |    0
 .../flexbox-justify-content-horiz-003.xhtml   |    0
 ...lexbox-justify-content-horiz-004-ref.xhtml |    0
 .../flexbox-justify-content-horiz-004.xhtml   |    0
 ...lexbox-justify-content-horiz-005-ref.xhtml |    0
 .../flexbox-justify-content-horiz-005.xhtml   |    0
 ...lexbox-justify-content-horiz-006-ref.xhtml |    0
 .../flexbox-justify-content-horiz-006.xhtml   |    0
 ...flexbox-justify-content-vert-001-ref.xhtml |    0
 .../flexbox-justify-content-vert-001a.xhtml   |    0
 .../flexbox-justify-content-vert-001b.xhtml   |    0
 ...flexbox-justify-content-vert-002-ref.xhtml |    0
 .../flexbox-justify-content-vert-002.xhtml    |    0
 ...flexbox-justify-content-vert-003-ref.xhtml |    0
 .../flexbox-justify-content-vert-003.xhtml    |    0
 ...flexbox-justify-content-vert-004-ref.xhtml |    0
 .../flexbox-justify-content-vert-004.xhtml    |    0
 ...flexbox-justify-content-vert-005-ref.xhtml |    0
 .../flexbox-justify-content-vert-005.xhtml    |    0
 ...flexbox-justify-content-vert-006-ref.xhtml |    0
 .../flexbox-justify-content-vert-006.xhtml    |    0
 ...exbox-justify-content-wmvert-001-ref.xhtml |    0
 .../flexbox-justify-content-wmvert-001.xhtml  |    0
 .../flexbox-margin-auto-horiz-001-ref.xhtml   |    0
 .../flexbox-margin-auto-horiz-001.xhtml       |    0
 .../flexbox-margin-auto-horiz-002-ref.xhtml   |    0
 .../flexbox-margin-auto-horiz-002.xhtml       |    0
 .../flexbox-mbp-horiz-001-ref.xhtml           |    0
 .../flexbox-mbp-horiz-001-reverse-ref.xhtml   |    0
 .../flexbox-mbp-horiz-001-reverse.xhtml       |    0
 .../flexbox-mbp-horiz-001-rtl-reverse.xhtml   |    2 +-
 .../flexbox-mbp-horiz-001-rtl.xhtml           |    0
 .../flexbox-mbp-horiz-001.xhtml               |    0
 .../flexbox-mbp-horiz-002-ref.xhtml           |    0
 .../flexbox-mbp-horiz-002a.xhtml              |    0
 .../flexbox-mbp-horiz-002b.xhtml              |    0
 .../flexbox-mbp-horiz-002v.xhtml              |    0
 .../flexbox-mbp-horiz-003-ref.xhtml           |    0
 .../flexbox-mbp-horiz-003-reverse-ref.xhtml   |    0
 .../flexbox-mbp-horiz-003-reverse.xhtml       |    0
 .../flexbox-mbp-horiz-003.xhtml               |    0
 .../flexbox-mbp-horiz-003v.xhtml              |    0
 .../flexbox-mbp-horiz-004-ref.xhtml           |    0
 .../flexbox-mbp-horiz-004.xhtml               |    0
 .../flexbox-min-height-auto-001-ref.html      |    0
 .../flexbox-min-height-auto-001.html          |    0
 .../flexbox-min-height-auto-002-ref.html      |    0
 .../flexbox-min-height-auto-002a.html         |    0
 .../flexbox-min-height-auto-002b.html         |    0
 .../flexbox-min-height-auto-002c.html         |    0
 .../flexbox-min-height-auto-003-ref.html      |    0
 .../flexbox-min-height-auto-003.html          |    0
 .../flexbox-min-height-auto-004-ref.html      |    0
 .../flexbox-min-height-auto-004.html          |    0
 .../flexbox-min-width-auto-001-ref.html       |    0
 .../flexbox-min-width-auto-001.html           |    0
 .../flexbox-min-width-auto-002-ref.html       |    0
 .../flexbox-min-width-auto-002a.html          |    0
 .../flexbox-min-width-auto-002b.html          |    0
 .../flexbox-min-width-auto-002c.html          |    0
 .../flexbox-min-width-auto-003-ref.html       |    0
 .../flexbox-min-width-auto-003.html           |    0
 .../flexbox-min-width-auto-004-ref.html       |    0
 .../flexbox-min-width-auto-004.html           |    0
 .../flexbox-overflow-horiz-001-ref.html       |    0
 .../flexbox-overflow-horiz-001.html           |    0
 .../flexbox-overflow-horiz-002-ref.html       |    0
 .../flexbox-overflow-horiz-002.html           |    0
 .../flexbox-overflow-horiz-003-ref.html       |    0
 .../flexbox-overflow-horiz-003.html           |    0
 .../flexbox-overflow-horiz-004-ref.html       |    0
 .../flexbox-overflow-horiz-004.html           |    0
 .../flexbox-overflow-horiz-005-ref.html       |    0
 .../flexbox-overflow-horiz-005.html           |    0
 .../flexbox-overflow-vert-001-ref.html        |    0
 .../flexbox-overflow-vert-001.html            |    0
 .../flexbox-overflow-vert-002-ref.html        |    0
 .../flexbox-overflow-vert-002.html            |    0
 .../flexbox-overflow-vert-003-ref.html        |    0
 .../flexbox-overflow-vert-003.html            |    0
 .../flexbox-overflow-vert-004-ref.html        |    0
 .../flexbox-overflow-vert-004.html            |    0
 .../flexbox-overflow-vert-005-ref.html        |    0
 .../flexbox-overflow-vert-005.html            |    0
 .../flexbox-paint-ordering-001-ref.xhtml      |    0
 .../flexbox-paint-ordering-001.xhtml          |    0
 .../flexbox-paint-ordering-002-ref.xhtml      |    0
 .../flexbox-paint-ordering-002.xhtml          |    0
 .../flexbox-paint-ordering-003-ref.html       |    0
 .../flexbox-paint-ordering-003.html           |    0
 .../flexbox-root-node-001-ref.html            |    0
 .../flexbox-root-node-001a.html               |    0
 .../flexbox-root-node-001b.html               |    0
 ...lexbox-safe-overflow-position-001-ref.html |    0
 .../flexbox-safe-overflow-position-001.html   |    0
 .../flexbox-single-line-clamp-1-ref.html      |    0
 .../flexbox-single-line-clamp-1.html          |    0
 .../flexbox-single-line-clamp-2-ref.html      |    0
 .../flexbox-single-line-clamp-2.html          |    0
 .../flexbox-single-line-clamp-3-ref.html      |    0
 .../flexbox-single-line-clamp-3.html          |    0
 .../flexbox-sizing-horiz-001-ref.xhtml        |    0
 .../flexbox-sizing-horiz-001.xhtml            |    0
 .../flexbox-sizing-horiz-002-ref.xhtml        |    0
 .../flexbox-sizing-horiz-002.xhtml            |    0
 .../flexbox-sizing-vert-001-ref.xhtml         |    0
 .../flexbox-sizing-vert-001.xhtml             |    0
 .../flexbox-sizing-vert-002-ref.xhtml         |    0
 .../flexbox-sizing-vert-002.xhtml             |    0
 .../flexbox-table-fixup-001-ref.xhtml         |    0
 .../flexbox-table-fixup-001.xhtml             |    0
 .../flexbox-whitespace-handling-001-ref.xhtml |    0
 .../flexbox-whitespace-handling-001a.xhtml    |    0
 .../flexbox-whitespace-handling-001b.xhtml    |    0
 .../flexbox-whitespace-handling-002-ref.xhtml |    2 +-
 .../flexbox-whitespace-handling-002.xhtml     |    2 +-
 .../flexbox-with-pseudo-elements-001-ref.html |    0
 .../flexbox-with-pseudo-elements-001.html     |    0
 .../flexbox-with-pseudo-elements-002-ref.html |    0
 .../flexbox-with-pseudo-elements-002.html     |    0
 .../flexbox-with-pseudo-elements-003-ref.html |    0
 .../flexbox-with-pseudo-elements-003.html     |    0
 .../flexbox-writing-mode-001-ref.html         |    0
 .../flexbox-writing-mode-001.html             |    0
 .../flexbox-writing-mode-002-ref.html         |    0
 .../flexbox-writing-mode-002.html             |    0
 .../flexbox-writing-mode-003-ref.html         |    0
 .../flexbox-writing-mode-003.html             |    0
 .../flexbox-writing-mode-004-ref.html         |    0
 .../flexbox-writing-mode-004.html             |    0
 .../flexbox-writing-mode-005-ref.html         |    0
 .../flexbox-writing-mode-005.html             |    0
 .../flexbox-writing-mode-006-ref.html         |    0
 .../flexbox-writing-mode-006.html             |    0
 .../flexbox-writing-mode-007-ref.html         |    0
 .../flexbox-writing-mode-007.html             |    0
 .../flexbox-writing-mode-008-ref.html         |    0
 .../flexbox-writing-mode-008.html             |    0
 .../flexbox-writing-mode-009-ref.html         |    0
 .../flexbox-writing-mode-009.html             |    0
 .../flexbox-writing-mode-010-ref.html         |    3 +-
 .../flexbox-writing-mode-010.html             |    3 +-
 .../flexbox-writing-mode-011-ref.html         |    3 +-
 .../flexbox-writing-mode-011.html             |    3 +-
 .../flexbox-writing-mode-012-ref.html         |    3 +-
 .../flexbox-writing-mode-012.html             |    3 +-
 .../flexbox-writing-mode-013-ref.html         |    3 +-
 .../flexbox-writing-mode-013.html             |    3 +-
 .../flexbox-writing-mode-014-ref.html         |    3 +-
 .../flexbox-writing-mode-014.html             |    3 +-
 .../flexbox-writing-mode-015-ref.html         |    3 +-
 .../flexbox-writing-mode-015.html             |    3 +-
 .../flexbox-writing-mode-016-ref.html         |    0
 .../flexbox-writing-mode-016.html             |    0
 ...ion-absolute-containing-block-001-ref.html |    0
 ...osition-absolute-containing-block-001.html |    0
 ...ion-absolute-containing-block-002-ref.html |    0
 ...osition-absolute-containing-block-002.html |    0
 .../css/css-ui/parsing/resize-computed.html   |    2 +
 .../css/css-ui/resize-generated-content.html  |   19 +
 .../flexbox-align-content-horiz-001-ref.xhtml |  170 -
 .../flexbox-align-content-horiz-001a.xhtml    |  179 -
 .../flexbox-align-content-horiz-001b.xhtml    |  180 -
 .../flexbox-align-content-horiz-002-ref.xhtml |  170 -
 .../flexbox-align-content-horiz-002.xhtml     |  179 -
 .../flexbox-align-content-vert-001-ref.xhtml  |  173 -
 .../flexbox-align-content-vert-001a.xhtml     |  179 -
 .../flexbox-align-content-vert-001b.xhtml     |  180 -
 .../flexbox-align-content-vert-002-ref.xhtml  |  173 -
 .../flexbox-align-content-vert-002.xhtml      |  179 -
 ...flexbox-align-content-wmvert-001-ref.xhtml |  173 -
 .../flexbox-align-content-wmvert-001.xhtml    |  179 -
 .../flexbox/support/Ahem.ttf                  |  Bin 12480 -> 0 bytes
 .../flexbox/support/ahem.css                  |    4 -
 .../flexbox/support/solidblue.png             |  Bin 135 -> 0 bytes
 .../ruby-text-combine-upright-001-ref.html    |    2 +-
 .../ruby/ruby-text-combine-upright-001a.html  |    2 +-
 .../ruby/ruby-text-combine-upright-001b.html  |    2 +-
 .../ruby-text-combine-upright-002-ref.html    |    2 +-
 .../ruby/ruby-text-combine-upright-002a.html  |    2 +-
 .../ruby/ruby-text-combine-upright-002b.html  |    2 +-
 .../ruby/support/Ahem.ttf                     |  Bin 12480 -> 0 bytes
 .../ruby/support/ahem.css                     |    4 -
 ...ck-size-with-min-or-max-content-1-ref.html |    3 +-
 ...block-size-with-min-or-max-content-1a.html |    3 +-
 ...block-size-with-min-or-max-content-1b.html |    3 +-
 ...ntainer-with-min-or-max-content-1-ref.html |    3 +-
 ...n-container-with-min-or-max-content-1.html |    3 +-
 ...ntainer-with-min-or-max-content-2-ref.html |    3 +-
 ...-container-with-min-or-max-content-2a.html |    3 +-
 ...-container-with-min-or-max-content-2b.html |    3 +-
 .../sizing/support/Ahem.ttf                   |  Bin 12480 -> 0 bytes
 .../sizing/support/ahem.css                   |    4 -
 ...ntainer-with-min-or-max-content-1-ref.html |    3 +-
 ...n-container-with-min-or-max-content-1.html |    3 +-
 ...ntainer-with-min-or-max-content-2-ref.html |    3 +-
 ...-container-with-min-or-max-content-2a.html |    3 +-
 ...-container-with-min-or-max-content-2b.html |    3 +-
 ...ment-break-transformation-removable-1.html |    2 +-
 ...ment-break-transformation-removable-2.html |    2 +-
 ...ment-break-transformation-removable-3.html |    2 +-
 ...ment-break-transformation-removable-4.html |    2 +-
 ...nt-break-transformation-removable-ref.html |    2 +-
 ...nt-break-transformation-rules-001-ref.html |    2 +-
 ...egment-break-transformation-rules-001.html |    2 +-
 ...nt-break-transformation-rules-002-ref.html |    2 +-
 ...egment-break-transformation-rules-002.html |    2 +-
 ...nt-break-transformation-rules-003-ref.html |    2 +-
 ...egment-break-transformation-rules-003.html |    2 +-
 ...nt-break-transformation-rules-004-ref.html |    2 +-
 ...egment-break-transformation-rules-004.html |    2 +-
 ...nt-break-transformation-rules-005-ref.html |    2 +-
 ...egment-break-transformation-rules-005.html |    2 +-
 ...nt-break-transformation-rules-006-ref.html |    2 +-
 ...egment-break-transformation-rules-006.html |    2 +-
 ...nt-break-transformation-rules-007-ref.html |    2 +-
 ...egment-break-transformation-rules-007.html |    2 +-
 ...nt-break-transformation-rules-008-ref.html |    2 +-
 ...egment-break-transformation-rules-008.html |    2 +-
 ...nt-break-transformation-rules-009-ref.html |    2 +-
 ...egment-break-transformation-rules-009.html |    2 +-
 ...nt-break-transformation-rules-010-ref.html |    2 +-
 ...egment-break-transformation-rules-010.html |    2 +-
 ...nt-break-transformation-rules-011-ref.html |    2 +-
 ...egment-break-transformation-rules-011.html |    2 +-
 ...nt-break-transformation-rules-012-ref.html |    2 +-
 ...egment-break-transformation-rules-012.html |    2 +-
 ...nt-break-transformation-rules-013-ref.html |    2 +-
 ...egment-break-transformation-rules-013.html |    2 +-
 ...nt-break-transformation-rules-014-ref.html |    2 +-
 ...egment-break-transformation-rules-014.html |    2 +-
 ...nt-break-transformation-rules-015-ref.html |    2 +-
 ...egment-break-transformation-rules-015.html |    2 +-
 ...nt-break-transformation-rules-016-ref.html |    2 +-
 ...egment-break-transformation-rules-016.html |    2 +-
 ...nt-break-transformation-rules-017-ref.html |    2 +-
 ...egment-break-transformation-rules-017.html |    2 +-
 ...nt-break-transformation-rules-018-ref.html |    2 +-
 ...egment-break-transformation-rules-018.html |    2 +-
 ...nt-break-transformation-rules-019-ref.html |    2 +-
 ...egment-break-transformation-rules-019.html |    2 +-
 ...nt-break-transformation-rules-020-ref.html |    2 +-
 ...egment-break-transformation-rules-020.html |    2 +-
 ...nt-break-transformation-rules-021-ref.html |    2 +-
 ...egment-break-transformation-rules-021.html |    2 +-
 ...nt-break-transformation-rules-022-ref.html |    2 +-
 ...egment-break-transformation-rules-022.html |    2 +-
 ...nt-break-transformation-rules-023-ref.html |    2 +-
 ...egment-break-transformation-rules-023.html |    2 +-
 ...nt-break-transformation-rules-024-ref.html |    2 +-
 ...egment-break-transformation-rules-024.html |    2 +-
 ...nt-break-transformation-rules-025-ref.html |    2 +-
 ...egment-break-transformation-rules-025.html |    2 +-
 ...nt-break-transformation-rules-026-ref.html |    2 +-
 ...egment-break-transformation-rules-026.html |    2 +-
 ...nt-break-transformation-rules-027-ref.html |    2 +-
 ...egment-break-transformation-rules-027.html |    2 +-
 ...nt-break-transformation-rules-028-ref.html |    2 +-
 ...egment-break-transformation-rules-028.html |    2 +-
 ...nt-break-transformation-rules-029-ref.html |    2 +-
 ...egment-break-transformation-rules-029.html |    2 +-
 ...nt-break-transformation-rules-030-ref.html |    2 +-
 ...egment-break-transformation-rules-030.html |    2 +-
 ...nt-break-transformation-rules-031-ref.html |    2 +-
 ...egment-break-transformation-rules-031.html |    2 +-
 ...nt-break-transformation-rules-032-ref.html |    2 +-
 ...egment-break-transformation-rules-032.html |    2 +-
 ...nt-break-transformation-rules-033-ref.html |    2 +-
 ...egment-break-transformation-rules-033.html |    2 +-
 ...nt-break-transformation-rules-034-ref.html |    2 +-
 ...egment-break-transformation-rules-034.html |    2 +-
 ...nt-break-transformation-rules-035-ref.html |    2 +-
 ...egment-break-transformation-rules-035.html |    2 +-
 ...nt-break-transformation-rules-036-ref.html |    2 +-
 ...egment-break-transformation-rules-036.html |    2 +-
 ...nt-break-transformation-rules-037-ref.html |    2 +-
 ...egment-break-transformation-rules-037.html |    2 +-
 ...nt-break-transformation-rules-038-ref.html |    2 +-
 ...egment-break-transformation-rules-038.html |    2 +-
 ...nt-break-transformation-rules-039-ref.html |    2 +-
 ...egment-break-transformation-rules-039.html |    2 +-
 ...nt-break-transformation-rules-040-ref.html |    2 +-
 ...egment-break-transformation-rules-040.html |    2 +-
 ...nt-break-transformation-rules-041-ref.html |    2 +-
 ...egment-break-transformation-rules-041.html |    2 +-
 ...nt-break-transformation-rules-042-ref.html |    2 +-
 ...egment-break-transformation-rules-042.html |    2 +-
 ...nt-break-transformation-rules-043-ref.html |    2 +-
 ...egment-break-transformation-rules-043.html |    2 +-
 ...nt-break-transformation-rules-044-ref.html |    2 +-
 ...egment-break-transformation-rules-044.html |    2 +-
 ...nt-break-transformation-rules-045-ref.html |    2 +-
 ...egment-break-transformation-rules-045.html |    2 +-
 ...nt-break-transformation-rules-046-ref.html |    2 +-
 ...egment-break-transformation-rules-046.html |    2 +-
 ...nt-break-transformation-rules-047-ref.html |    2 +-
 ...egment-break-transformation-rules-047.html |    2 +-
 ...nt-break-transformation-rules-048-ref.html |    2 +-
 ...egment-break-transformation-rules-048.html |    2 +-
 ...nt-break-transformation-rules-049-ref.html |    2 +-
 ...egment-break-transformation-rules-049.html |    2 +-
 ...nt-break-transformation-unremovable-1.html |    2 +-
 ...nt-break-transformation-unremovable-2.html |    2 +-
 ...nt-break-transformation-unremovable-3.html |    2 +-
 ...nt-break-transformation-unremovable-4.html |    2 +-
 ...-break-transformation-unremovable-ref.html |    2 +-
 .../text3/support/Ahem.ttf                    |  Bin 12480 -> 0 bytes
 .../text3/support/ahem.css                    |    4 -
 ...egment-break-transformation-rules-tests.py |    6 +-
 .../text3/text-word-spacing-001.html          |    4 +-
 .../text3/text-word-spacing-ref.html          |    4 +-
 .../variables/support/Ahem.ttf                |  Bin 12480 -> 0 bytes
 .../variables/support/ahem.css                |    4 -
 .../support/external-variable-font-face.css   |    4 +-
 .../variable-declaration-15-ref.html          |    3 +-
 .../variables/variable-declaration-15.html    |    2 +-
 .../variable-declaration-16-ref.html          |    3 +-
 .../variables/variable-declaration-16.html    |    2 +-
 .../variable-declaration-17-ref.html          |    3 +-
 .../variables/variable-declaration-17.html    |    2 +-
 .../variable-declaration-18-ref.html          |    3 +-
 .../variables/variable-declaration-18.html    |    2 +-
 .../variable-external-font-face-01-ref.html   |    2 +-
 .../variables/variable-font-face-01-ref.html  |    2 +-
 .../variables/variable-font-face-01.html      |    4 +-
 .../variables/variable-font-face-02-ref.html  |    2 +-
 .../variables/variable-font-face-02.html      |    4 +-
 .../sandboxing/resources/document-open.html   |    2 -
 .../sandboxing/sandbox-document-open.html     |    4 +-
 .../2d.drawImage.nonexistent.html             |   29 +
 ...as-createPutGetImageData-colorManaged.html |   19 +-
 .../imageData-colorManagedBehavior.html       |   18 +-
 .../element/drawing-images-to-the-canvas.yaml |    9 +
 .../actions/crossOrigin.sub.html.ini          |    4 -
 tests/wpt/web-platform-tests/lint.ignore      |    5 -
 ...ce-webcodecs-appendencodedchunks-play.html |   83 +
 .../mse-for-webcodecs/tentative/vp9.mp4       |  Bin 0 -> 6159 bytes
 .../close_async.tentative.https.any.js        |   20 +-
 ...rent_io_flush_async.tentative.https.any.js |    2 +-
 ..._io_setLength_async.tentative.https.any.js |    2 +-
 .../concurrent_io/operation_helpers.js        |   16 +-
 ...t-yes-child-no-port.sub.https.html.headers |    2 +-
 ...t-yes-child-no-same.sub.https.html.headers |    2 +-
 ...-child-no-subdomain.sub.https.html.headers |    2 +-
 ...-yes-child-yes-port.sub.https.html.headers |    2 +-
 ...-yes-child-yes-same.sub.https.html.headers |    2 +-
 ...child-yes-subdomain.sub.https.html.headers |    2 +-
 ...child2-no-subdomain.sub.https.html.headers |    2 +-
 ...hild2-no-subdomain2.sub.https.html.headers |    2 +-
 ...hild2-yes-subdomain.sub.https.html.headers |    2 +-
 ...ild2-yes-subdomain2.sub.https.html.headers |    2 +-
 ...2-yes-subdomainport.sub.https.html.headers |    2 +-
 ...main-child2-no-port.sub.https.html.headers |    2 +-
 ...child2-no-subdomain.sub.https.html.headers |    2 +-
 ...hild2-yes-subdomain.sub.https.html.headers |    2 +-
 ...ild2-yes-subdomain2.sub.https.html.headers |    2 +-
 ...2-yes-subdomainport.sub.https.html.headers |    2 +-
 .../origin-isolation/README.md                |    7 +
 .../about-blank.https.sub.html.headers        |    2 +-
 .../document-domain.sub.https.html.headers    |    2 +-
 .../csp-sandbox-yes.https.html.headers        |    2 +-
 .../data-to-javascript-yes.https.html.headers |    2 +-
 .../data-url-yes.https.html.headers           |    2 +-
 .../javascript-url-yes.https.html.headers     |    2 +-
 .../removed-iframe.sub.https.html             |    4 +-
 .../removed-iframe.sub.https.html.headers     |    2 +-
 .../resources/helpers.mjs                     |    2 +-
 .../sandboxed-iframe-yes.https.html.headers   |    2 +-
 ...-same-origin-iframe-yes.https.html.headers |    2 +-
 .../going-back.sub.https.html.headers         |    2 +-
 ...1-no-same-2-no-port.sub.https.html.headers |    2 +-
 ...same-2-no-subdomain.sub.https.html.headers |    2 +-
 .../insecure-http.sub.html.headers            |    2 +-
 ...-yes-openee-no-port.sub.https.html.headers |    2 +-
 ...-yes-openee-no-same.sub.https.html.headers |    2 +-
 ...openee-no-subdomain.sub.https.html.headers |    2 +-
 ...yes-openee-yes-port.sub.https.html.headers |    2 +-
 ...yes-openee-yes-same.sub.https.html.headers |    2 +-
 ...penee-yes-subdomain.sub.https.html.headers |    2 +-
 .../removing-iframes.sub.https.html.headers   |    2 +-
 .../resources/crashy-popup.sub.html.headers   |    2 +-
 .../resources/frame.html.headers              |    2 +-
 .../origin-isolation/resources/helpers.mjs    |    2 +-
 .../resources/send-header-page-script.mjs     |    2 +-
 .../resources/send-origin-isolation-header.py |    4 +-
 .../sandboxed-iframe-with-opaque-origin.html  |  130 +-
 .../ci/azure/safari-technology-preview.rb     |    8 +-
 .../tools/webdriver/webdriver/client.py       |    2 +-
 .../tools/webdriver/webdriver/transport.py    |    7 +-
 937 files changed, 4440 insertions(+), 6240 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/cors/basic.htm.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-001a.xhtml.ini (80%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-001b.xhtml.ini (80%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-002.xhtml.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-003.xhtml.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-005.xhtml.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-006.xhtml.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-baseline-horiz-007.xhtml.ini (79%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-horiz-001-block.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-horiz-001-table.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-horiz-002.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-horiz-003.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-horiz-004.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-stretch-vert-002.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-001.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-002.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-003.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-004.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-rtl-001.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-rtl-002.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-rtl-003.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-align-self-vert-rtl-004.xhtml.ini (78%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-align-self-baseline-horiz-001.html.ini (81%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-align-self-baseline-vert-001.html.ini (81%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-horiz-001.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-horiz-002.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-horiz-003.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-horiz-004.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-vert-001.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-multi-line-vert-002.html.ini (79%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-single-item-001a.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-baseline-single-item-001b.html.ini (78%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-block-vert-001.xhtml.ini (77%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-canvas-horiz-001.xhtml.ini (77%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-canvas-vert-001.xhtml.ini (77%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-fieldset-horiz-001.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-fieldset-vert-001.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-iframe-horiz-001.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-iframe-vert-001.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-img-horiz-001.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-img-vert-001.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-textarea-horiz-001.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-textarea-vert-001.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-video-horiz-001.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-basic-video-vert-001.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-horiz-001a.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-horiz-001b.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-horiz-002a.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-horiz-002b.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-vert-001a.html.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-vert-001b.html.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-vert-002a.html.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-break-request-vert-002b.html.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-collapsed-item-baseline-001.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-collapsed-item-horiz-001.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-collapsed-item-horiz-002.html.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-collapsed-item-horiz-003.html.ini (78%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-flex-flow-001.html.ini (74%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-flex-flow-002.html.ini (74%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-flex-wrap-vert-001.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-flex-wrap-vert-002.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-items-as-stacking-contexts-001.xhtml.ini (80%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-001a.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-001b.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-002.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-003.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-004.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-horiz-005.xhtml.ini (78%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-001a.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-001b.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-002.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-003.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-004.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-justify-content-vert-005.xhtml.ini (78%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-margin-auto-horiz-001.xhtml.ini (77%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-mbp-horiz-001-rtl.xhtml.ini (76%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-001.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-002a.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-002b.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-002c.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-003.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-height-auto-004.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-001.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-002a.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-002b.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-002c.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-003.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-min-width-auto-004.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-overflow-horiz-001.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-overflow-horiz-002.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-overflow-vert-001.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-overflow-vert-004.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-overflow-vert-005.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-paint-ordering-001.xhtml.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-paint-ordering-002.xhtml.ini (76%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-single-line-clamp-1.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-single-line-clamp-3.html.ini (76%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-sizing-horiz-001.xhtml.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-sizing-horiz-002.xhtml.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-sizing-vert-001.xhtml.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-sizing-vert-002.xhtml.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-whitespace-handling-001a.xhtml.ini (78%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-001.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-002.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-003.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-004.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-005.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-006.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-008.html.ini (75%)
 rename tests/wpt/{metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox => metadata-layout-2020/css/css-flexbox}/flexbox-writing-mode-009.html.ini (75%)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-010.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-011.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-012.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-013.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-014.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-015.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-006.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-008.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-009.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-010.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-011.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-012.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-013.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-014.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-015.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-016.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml.ini
 delete mode 100644 tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-abspos-child-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-abspos-child-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-abspos-child-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-abspos-child-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-abspos-child-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-items-center-nested-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-items-center-nested-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-001a.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-001b.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-005-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-005.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-006-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-006.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-007-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-007.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-008-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-baseline-horiz-008.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-001-block.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-001-table.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-005-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-horiz-005.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-stretch-vert-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-stretch-vert-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-stretch-vert-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-stretch-vert-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-005-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-align-self-vert-rtl-005.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-anonymous-items-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-anonymous-items-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-align-self-baseline-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-align-self-baseline-horiz-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-align-self-baseline-vert-001-ref.html (91%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-align-self-baseline-vert-001.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-empty-001-ref.html (89%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-empty-001a.html (92%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-empty-001b.html (92%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-horiz-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-horiz-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-vert-001-ref.html (90%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-vert-001a.html (92%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-item-vert-001b.html (92%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-horiz-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-vert-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-vert-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-vert-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-multi-line-vert-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-single-item-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-single-item-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-baseline-single-item-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-horiz-001v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-block-vert-001v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-horiz-001v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-canvas-vert-001v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-fieldset-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-fieldset-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-fieldset-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-fieldset-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-iframe-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-iframe-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-iframe-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-iframe-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-img-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-img-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-img-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-img-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-textarea-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-textarea-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-textarea-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-textarea-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-video-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-video-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-video-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-basic-video-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-002a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-horiz-002b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-002a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-break-request-vert-002b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-baseline-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-baseline-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-collapsed-item-horiz-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-column-row-gap-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-definite-sizes-005.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-dyn-resize-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-dyn-resize-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-001-ref.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-001a.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-001b.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-002-ref.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-002a.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-002b.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-003a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-003b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-004a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-basis-content-004b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-flow-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-flow-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-flow-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-flow-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-horiz-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-horiz-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-horiz-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-vert-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-vert-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-vert-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-flex-wrap-vert-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-items-as-stacking-contexts-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-001a.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-001b.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-005-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-005.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-006-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-horiz-006.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-001a.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-001b.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-005-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-005.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-006-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-vert-006.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-wmvert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-justify-content-wmvert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-margin-auto-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-margin-auto-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-margin-auto-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-margin-auto-horiz-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001-reverse-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001-reverse.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001-rtl-reverse.xhtml (99%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001-rtl.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-002a.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-002b.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-002v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-003-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-003-reverse-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-003-reverse.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-003.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-003v.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-004-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-mbp-horiz-004.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-002a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-002b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-002c.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-height-auto-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-002a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-002b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-002c.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-min-width-auto-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-horiz-005.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-overflow-vert-005.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-paint-ordering-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-root-node-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-root-node-001a.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-root-node-001b.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-safe-overflow-position-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-safe-overflow-position-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-1-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-1.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-2-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-2.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-3-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-single-line-clamp-3.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-horiz-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-horiz-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-horiz-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-horiz-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-vert-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-vert-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-vert-002-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-sizing-vert-002.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-table-fixup-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-table-fixup-001.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-whitespace-handling-001-ref.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-whitespace-handling-001a.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-whitespace-handling-001b.xhtml (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-whitespace-handling-002-ref.xhtml (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-whitespace-handling-002.xhtml (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-with-pseudo-elements-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-002.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-003.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-004.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-005.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-006-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-006.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-007-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-007.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-008-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-008.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-009-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-009.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-010-ref.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-010.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-011-ref.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-011.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-012-ref.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-012.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-013-ref.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-013.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-014-ref.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-014.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-015-ref.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-015.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-016-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/flexbox-writing-mode-016.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/position-absolute-containing-block-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/position-absolute-containing-block-001.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/position-absolute-containing-block-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/flexbox => css-flexbox}/position-absolute-containing-block-002.html (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/Ahem.ttf
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/ahem.css
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/solidblue.png
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/Ahem.ttf
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/ahem.css
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/Ahem.ttf
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/ahem.css
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/Ahem.ttf
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/ahem.css
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/Ahem.ttf
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/ahem.css
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html
 delete mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini
 create mode 100644 tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html
 create mode 100644 tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/vp9.mp4

diff --git a/tests/wpt/metadata-layout-2020/cors/basic.htm.ini b/tests/wpt/metadata-layout-2020/cors/basic.htm.ini
new file mode 100644
index 00000000000..445703908e3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/cors/basic.htm.ini
@@ -0,0 +1,10 @@
+[basic.htm]
+  [Cross domain basic usage, origin: echo]
+    expected: FAIL
+
+  [Cross domain different port, origin: echo]
+    expected: FAIL
+
+  [Cross domain different protocol, origin: echo]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
new file mode 100644
index 00000000000..10e67a8135e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-align-items-center-nested-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
similarity index 80%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
index 4d417458047..1a8c2d6bc37 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-001a.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
similarity index 80%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
index 17bd5968602..f08ba3ef89b 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-001b.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
index bb3d899a81c..48562db38c3 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
index 69af8bfdb9f..f13dcc89a05 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
index ea1e14d3cdd..5e562813705 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-005.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
index c653933479e..b22554bd4cd 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-006.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
index ae56785fafb..9317b81da2c 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-baseline-horiz-007.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
new file mode 100644
index 00000000000..225f94870ca
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-008.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
index 505ea6c61db..b9ba3ae31e7 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-horiz-001-block.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
index 185bfc09701..7003e92b8fc 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-horiz-001-table.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
index f6c1c8a6a53..4f314573c7a 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-horiz-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
index f2eac7bff94..73eac7e6752 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-horiz-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
index c4e5bea04aa..c24022052ca 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-horiz-004.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
index 7ccad919f9f..dab9d6e1cf9 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-stretch-vert-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
index beee76f89f5..74decb76cb6 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
index 3a4c066a169..82e6e6f0359 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
index e68bc1117c1..bca40042647 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
index cd017ebc580..98820d74fab 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-004.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
index 44f847602be..837886b0dad 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-rtl-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
index cd329d08924..9509f937736 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-rtl-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
index ac18060a8bf..2fff2b7cd45 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-rtl-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
index db194801c3c..817b0705577 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-align-self-vert-rtl-004.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
new file mode 100644
index 00000000000..1ffe25b3d11
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-005.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
similarity index 81%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
index bcbd864b8e4..31bd462cde0 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-align-self-baseline-horiz-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
similarity index 81%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
index 901be66e963..f36c4c09f52 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-align-self-baseline-vert-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
new file mode 100644
index 00000000000..4dbf80b31a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-horiz-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
new file mode 100644
index 00000000000..750b638c8cf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-horiz-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
new file mode 100644
index 00000000000..81fa961021c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-vert-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
new file mode 100644
index 00000000000..3fecf90b40d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-vert-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
index cfaf362abfb..8fa413cb2ee 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-horiz-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
index 5d2c0cb386f..ace598f2e60 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-horiz-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
index d02bbf9a81e..78dccae8b39 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-horiz-003.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
index d8da7a812a8..6fce1f0f9fb 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-horiz-004.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
index b807eec602a..fe421486b25 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-vert-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
similarity index 79%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
index da4a1817b48..83faeb35bca 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-multi-line-vert-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
index 4acf92dcd34..578b123bd47 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-single-item-001a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
index a07035c9d2e..4b224870ff8 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-baseline-single-item-001b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
new file mode 100644
index 00000000000..ec95c66a56f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-block-horiz-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
index 6dc478db7d6..b171dce1090 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-block-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
new file mode 100644
index 00000000000..1e6f0388287
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-block-vert-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
index fd9e6560f99..33508636edf 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-canvas-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
new file mode 100644
index 00000000000..c33eb69f9e9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-horiz-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
index fcb9eb65c54..50da74a7d55 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-canvas-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
new file mode 100644
index 00000000000..33cdfcd51ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-vert-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
index 761cccf094b..ab01e596fb6 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-fieldset-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
index 017b942de50..bdb738da04e 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-fieldset-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
index fd1b06a4fc9..36cc12e570c 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-iframe-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
index a3cbbc14d14..98e1aadf6ea 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-iframe-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
index 2be45913d5e..b81dc136ed2 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-img-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
index 4bb961feedd..8d2aa03e0d7 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-img-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
index aae538f2aee..fcbae31856f 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-textarea-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
index fc8b33142a1..6209fc1effc 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-textarea-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
index acdf943e7cb..228a9d52f61 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-video-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
index 1c5a3e311b3..78a712924f5 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-basic-video-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
index a6ed596ae10..88b0e3f1aa9 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-horiz-001a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
index 0e59ce6e8e5..cfecd9e45e0 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-horiz-001b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
index 1e6d39e17c5..787758ff28e 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-horiz-002a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
index 80919e5dab0..8ee43106a11 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-horiz-002b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
index f6ebd714b46..c93bf834730 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-vert-001a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
index 2d506378730..3e447e342d1 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-vert-001b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
index bf8c9278822..8cc9d834de2 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-vert-002a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
index 9d15d738716..6b8f967725e 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-break-request-vert-002b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
index e904ef90352..9dbefcf8718 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-collapsed-item-baseline-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
index c4612ec4ea1..88b5593245a 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-collapsed-item-horiz-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
index a9e2b243f7b..8e80306b708 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-collapsed-item-horiz-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
index a48b7c7a797..85c12ad74b5 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
@@ -1,3 +1,2 @@
 [flexbox-collapsed-item-horiz-003.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-001.html.ini
new file mode 100644
index 00000000000..00add169953
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-002.html.ini
new file mode 100644
index 00000000000..f86a9a6f6cc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-003.html.ini
new file mode 100644
index 00000000000..1efedb0d6eb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-004.html.ini
new file mode 100644
index 00000000000..7727699cd09
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-column-row-gap-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-001.html.ini
new file mode 100644
index 00000000000..8a5d723170b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-002.html.ini
new file mode 100644
index 00000000000..8284af93cce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-003.html.ini
new file mode 100644
index 00000000000..a69e85c365e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-004.html.ini
new file mode 100644
index 00000000000..e5f35d2edae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-005.html.ini
new file mode 100644
index 00000000000..114ce712ac4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-definite-sizes-005.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
new file mode 100644
index 00000000000..2a9a0d6b670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
new file mode 100644
index 00000000000..8f3bd004b8c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
new file mode 100644
index 00000000000..d2f6a544244
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
new file mode 100644
index 00000000000..b7833e0156f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
new file mode 100644
index 00000000000..07ae8a1f0d8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-004a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
new file mode 100644
index 00000000000..473babe7d40
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-004b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-001.html.ini
similarity index 74%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-001.html.ini
index 9d212e1c38d..268e9474749 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-flex-flow-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-002.html.ini
similarity index 74%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-002.html.ini
index 6bd06c28695..7e6594850eb 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-flow-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-flex-flow-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
index d2a4f37624f..945a8e0c072 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-flex-wrap-vert-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
index 081d2c8beb0..deca711477d 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-flex-wrap-vert-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
similarity index 80%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
index b5ea4acba5d..1368cdf2367 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-items-as-stacking-contexts-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001a.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
index 44ebe408dab..74ecf610afc 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-001a.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001b.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
index 0d549692a34..7cd548352d9 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-001b.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
index f1c2f3f1bd2..272354a198d 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
index 85e11014fcc..742f5dfdb8a 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
index 9a19a1b75b5..85bda5dda03 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-004.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
index 70803fdb68b..1aa27969f37 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-horiz-005.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
new file mode 100644
index 00000000000..f8b3dc233db
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-006.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001a.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001a.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
index 1c2df047a3f..c27504c826b 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001a.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-001a.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001b.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001b.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
index 44c2f8814cc..807a7a36ae2 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001b.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-001b.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
index 3080b599282..c89a4d4010b 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
index ec9842f87bf..1416bdedf25 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-003.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
index c88a99b24e5..a53ba9778e7 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-004.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
index 1ac292bfa9d..d9ce1e3c389 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-justify-content-vert-005.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
new file mode 100644
index 00000000000..f0cd24820f4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-006.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
new file mode 100644
index 00000000000..586a6be1f7e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-wmvert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
index ee492d5b65c..23ba0b62849 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-margin-auto-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
index ebb56c1cfbe..57977cc1eef 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-mbp-horiz-001-rtl-reverse.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
index f58ca733910..ab2abca56b0 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-mbp-horiz-001-rtl.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
new file mode 100644
index 00000000000..f09d7e6290f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-mbp-horiz-002v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-001.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-001.html.ini
index 4f33d66f155..8158009ceaa 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
index 22c8bb00281..52e14a67a05 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-002a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
index f5c91247e9f..fe71f687818 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-002b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002c.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002c.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
index 7535cd8a45c..8a387e1761c 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002c.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-002c.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-003.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-003.html.ini
index b791b5cb178..4bdbe70d1c7 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-003.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-003.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-004.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-004.html.ini
index 7104bc5cc17..e275f10a12b 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-height-auto-004.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-height-auto-004.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-001.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-001.html.ini
index 637844a0282..3f082265ebe 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002a.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002a.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
index a1abc547992..20b250f350d 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-002a.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002b.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002b.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
index f9a1bafeb78..197af149381 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-002b.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002c.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002c.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
index aa454fc95a8..915e99a7f45 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002c.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-002c.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-003.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-003.html.ini
index 4d7c43eafc7..150d543188f 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-003.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-003.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-004.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-004.html.ini
index bf3cf7d5a75..23081b20a15 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-min-width-auto-004.html.ini
@@ -1,3 +1,2 @@
 [flexbox-min-width-auto-004.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
index 03163a421af..fd6fa5c3057 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-overflow-horiz-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
index ea27c93c365..8c587804213 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-overflow-horiz-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-001.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-001.html.ini
index f441e72d221..5c0f0370da5 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-overflow-vert-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-004.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-004.html.ini
index 39dbc87d49b..2ba772d0507 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-004.html.ini
@@ -1,3 +1,2 @@
 [flexbox-overflow-vert-004.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-005.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-005.html.ini
index c823dea2d05..62e1fc67d94 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-overflow-vert-005.html.ini
@@ -1,3 +1,2 @@
 [flexbox-overflow-vert-005.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
index 19b34138b2f..f940711d2e5 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-paint-ordering-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
index 29153f96dd8..4b1519eda79 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-paint-ordering-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
new file mode 100644
index 00000000000..f22ee915dcb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-safe-overflow-position-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
index f417a01a722..d25f6f6fbdc 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
@@ -1,3 +1,2 @@
 [flexbox-single-line-clamp-1.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
index 8fc4d14bb17..8ee6ca6fddd 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
@@ -1,3 +1,2 @@
 [flexbox-single-line-clamp-3.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
index 24f23cb8471..9b2276474c2 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-sizing-horiz-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
index 59a17dd75b2..2298c6f2d27 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-sizing-horiz-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
index 8e9a9a7af6a..913bdcff6ae 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-sizing-vert-001.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
index 0f09f16d012..8dcd3a3c5b1 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-sizing-vert-002.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001a.xhtml.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
similarity index 78%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001a.xhtml.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
index b78bd6947fd..2afbeeb72ed 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001a.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
@@ -1,3 +1,2 @@
 [flexbox-whitespace-handling-001a.xhtml]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-001.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-001.html.ini
index 9808b3628fd..4da5307bbfa 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-001.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-001.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-002.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-002.html.ini
index 15f3dec0db4..1548606c0f1 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-002.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-002.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-003.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-003.html.ini
index b149da31571..9b8fc9ac80e 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-003.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-003.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-004.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-004.html.ini
index 1ab4d463ce9..476e9a916fd 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-004.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-004.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-005.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-005.html.ini
index b50b086eb9d..091dae624f3 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-005.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-005.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-006.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-006.html.ini
index 8a8c538a220..0cb21a3b80b 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-006.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-006.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-008.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-008.html.ini
index 3b409e9b161..a63a144817a 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-008.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-008.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-009.html.ini
similarity index 75%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-009.html.ini
index 1a51d28d838..833ac0c4008 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-009.html.ini
@@ -1,3 +1,2 @@
 [flexbox-writing-mode-009.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-010.html.ini
new file mode 100644
index 00000000000..c4f6c29179a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-010.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-011.html.ini
new file mode 100644
index 00000000000..ada4d8bfa05
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-011.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-012.html.ini
new file mode 100644
index 00000000000..e15687f9ad2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-012.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-012.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-013.html.ini
new file mode 100644
index 00000000000..7467a967374
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-013.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-014.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-014.html.ini
new file mode 100644
index 00000000000..0970faa5328
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-014.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-015.html.ini
new file mode 100644
index 00000000000..ef5a3dacaad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-015.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini
new file mode 100644
index 00000000000..8b4582a2fc2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-writing-mode-016.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-001.html.ini
new file mode 100644
index 00000000000..403c792b263
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-001.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-002.html.ini
new file mode 100644
index 00000000000..fa0829507e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-absolute-containing-block-002.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
new file mode 100644
index 00000000000..70a00a101f6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-ui/parsing/resize-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-ui/parsing/resize-computed.html.ini
index c589d0144c1..a35186b8ec2 100644
--- a/tests/wpt/metadata-layout-2020/css/css-ui/parsing/resize-computed.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-ui/parsing/resize-computed.html.ini
@@ -11,3 +11,9 @@
   [Property resize value 'both']
     expected: FAIL
 
+  [Property resize value 'both' in ::before]
+    expected: FAIL
+
+  [Property resize value 'vertical' in ::after]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index c131078eace..23c61ede1a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,3 +17,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index b358b7b7bf5..556bb44ee43 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,12 +315,15 @@
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..e67f0406fc3 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,6 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..7277f622b20 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
deleted file mode 100644
index 75d75b4cda2..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_2.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 9a85a905394..8e2b6af33d8 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,7 +1,8 @@
 [embedded-opener-remove-frame.html]
+  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
new file mode 100644
index 00000000000..73d330c8c68
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
@@ -0,0 +1,14 @@
+[sandboxed-iframe-with-opaque-origin.html]
+  expected: TIMEOUT
+  [Sandboxed iframe with tuple origin sends referrers to subresources]
+    expected: NOTRUN
+
+  [Sandboxed iframe with opaque origin doesn't send referrers on navigation]
+    expected: NOTRUN
+
+  [Sandboxed iframe with opaque origin doesn't send referrers to subresources]
+    expected: TIMEOUT
+
+  [Sandboxed iframe with tuple origin sends referrers on navigation]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 19fb9228018..c4d597561d4 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -392,3 +392,9 @@
   [X SNR (-288.2714546901987 dB) is not greater than or equal to 65.737. Got -288.2714546901987.]
     expected: FAIL
 
+  [X SNR (-480.9918233980252 dB) is not greater than or equal to 65.737. Got -480.9918233980252.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t1.6645447185027924e+26\t9.3139332532882690e-1\t1.6645447185027924e+26\t1.7871555155445501e+26\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 1.6645447185027924e+26 at index of 28696.\n\tMax RelError of 1.7871555155445501e+26 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index b0e970adc46..33bae80ee9d 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -140891,6 +140891,1241 @@
        {}
       ]
      ],
+     "flexbox-abspos-child-001a.html": [
+      "fabe204b2796257fd3a74216a87c79960c42a9f9",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-abspos-child-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-abspos-child-001b.html": [
+      "30fc58c3d12e336663d0aaadf959e23d87a525a1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-abspos-child-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-abspos-child-002.html": [
+      "8234085681ddc0f72e8da84471363ecb08d4d460",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-abspos-child-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-items-center-nested-001.html": [
+      "b6e2fdff0aaffc2df8187389183cd170bf6fb301",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-001a.xhtml": [
+      "0460f4162f5f424b4693c19cab688f5b5db16fa3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-001b.xhtml": [
+      "3a656e41e94041274f0e763a1b11789e886da419",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-002.xhtml": [
+      "8aa364ec51a4ea9dd1232a7fb0519cdbc225ccc8",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-003.xhtml": [
+      "0b8e8499c3ff10498eed8bf6a9e791472e4c43d4",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-004.xhtml": [
+      "14fbf4bc6e7c674ccb8b2ff4b41e85e8fcb7e6b2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-005.xhtml": [
+      "cfe0d1b02b46d462a48d0e629c7fa2cf8ef60086",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-006.xhtml": [
+      "417f966587d30e2308a52f8880b503dddd970c41",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-007.xhtml": [
+      "50d74f5ebf645f078682f217eb514e59ebebab42",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-baseline-horiz-008.xhtml": [
+      "00bc4d9fce8033483de8f6e9172a166842a8ccf0",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-001-block.xhtml": [
+      "365354506f86a16a2f2313296d5d99fa284400ab",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-001-table.xhtml": [
+      "1785ca8dfc0a8bf5b52a0e870e4605902b8f2685",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-002.xhtml": [
+      "d1273d1f55b8284821a8ed47b7cfc617670f8e52",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-003.xhtml": [
+      "4414d0a0a071ddad0f342a9f25efcc5a1b944132",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-004.xhtml": [
+      "b7bdf396a077cece36dc8c6f79b11ad680db9dda",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-horiz-005.xhtml": [
+      "cff89d3251668a12e2c74a1dcc82457c5f49d8c0",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-stretch-vert-001.html": [
+      "578dff9cae91d6c71d3a2a28fb186b8610ec78aa",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-stretch-vert-002.html": [
+      "c2b90301193160fcc95aa665768b7992265ce774",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-001.xhtml": [
+      "4080d3488033297d681d5d77a039bdceba4c1526",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-002.xhtml": [
+      "2ff89bdf5f52c8e040dd665d53888c0566cafc5d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-003.xhtml": [
+      "23b320941365cfd7ea49068342878de77d8b016a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-004.xhtml": [
+      "4c52875747ad84892fa38cdfcf11888e3db10cda",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-rtl-001.xhtml": [
+      "1016c28f824e86dc7608f0b81af3f4989160eb0d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-rtl-002.xhtml": [
+      "a3a81e25d10a86d8a729ecec36afb1d0e0bf578d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-rtl-003.xhtml": [
+      "9a3bfccb35abbcda22341a143510344ba88c2437",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-rtl-004.xhtml": [
+      "4f4f49afda37f66b50e6b502bf0244540d1bf84e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-align-self-vert-rtl-005.xhtml": [
+      "420c334c841efb113d7e769deb3062097ff54307",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-anonymous-items-001.html": [
+      "0c85c46d55adf19f16b1196cf19cdb4c6c23d3ca",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-anonymous-items-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-align-self-baseline-horiz-001.html": [
+      "a7308f74876ee406e41b20824c0acf244599400f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-align-self-baseline-vert-001.html": [
+      "97963fb41e605cbb42c05d7d3e217e794f82c9ab",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-empty-001a.html": [
+      "50334acc8bab8e734a59934cacdf454f8d8c0f57",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-empty-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-empty-001b.html": [
+      "2195df4f543cc6d446cdbdafbffa2b496947a87f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-empty-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-item-horiz-001a.html": [
+      "94bbdec20214e4cd346a151610faa42723deca41",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-item-horiz-001b.html": [
+      "d40a986405bd47fb210b139d3e9c814f6ded093d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-item-vert-001a.html": [
+      "06c2f7063e88540bc57442c6be6b0726a56e57a6",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-item-vert-001b.html": [
+      "6928bba97fb642326d2c4526ecec3054df48b878",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-horiz-001.html": [
+      "0faf41bb3c9cf8f6e6fa6923b50f1adc565fff55",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-horiz-002.html": [
+      "bd13de7f9743aeeeada53374d506a1b59607260f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-horiz-003.html": [
+      "ef7d787beb6ad8386a1e4078ad1a41bb5fc31592",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-horiz-004.html": [
+      "21db212f99274d9bde5f69f080b76da64e0360f2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-vert-001.html": [
+      "d2b510ade630e2f33f6a3e4de50f956c9995ee7a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-multi-line-vert-002.html": [
+      "5bffc84630f679b5ae799cd9a75b240b5fd7fbd9",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-single-item-001a.html": [
+      "b9df6c23f0e7e03e5670006699fd6e2c0003e81a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-single-item-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-baseline-single-item-001b.html": [
+      "523045894bbed0414922502f2d9fd3f2b666382e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-baseline-single-item-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-block-horiz-001.xhtml": [
+      "1345263df3971064483dbfbdc3bef29a76f06bcd",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-block-horiz-001v.xhtml": [
+      "f1dfdfdb86ca172056183534cf7c1d906b4c5d6f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-block-vert-001.xhtml": [
+      "92c32c828caab079e80226fbcf9dae88589f3357",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-block-vert-001v.xhtml": [
+      "da943dfc56f32501f743a0f43fc40416b8a054c4",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-canvas-horiz-001.xhtml": [
+      "6d3629e3267bfc74cf42eff2f6b7b53a6c0807d5",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-canvas-horiz-001v.xhtml": [
+      "ad623d77f7ffc72cf69d97b0c717db70a33cea38",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-canvas-vert-001.xhtml": [
+      "1bae704384c2347ed5881d5f769111c11ef5556d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-canvas-vert-001v.xhtml": [
+      "057f63ae62bf430e089851e112a34280abeed6fd",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-fieldset-horiz-001.xhtml": [
+      "8a504859dccc86944743b3976a7bd42653b9f6d3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-fieldset-vert-001.xhtml": [
+      "75d592f4cb90358cfb44098c028e1c6fc83c2ef7",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-iframe-horiz-001.xhtml": [
+      "323b065199e1ca5c256ad7cd6b05927b00aa4be6",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-iframe-vert-001.xhtml": [
+      "8b227c67c4a2287817aed818f3d756d15217ff9d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-img-horiz-001.xhtml": [
+      "b5f3a6fce640a2af6a5e9d0ed1176c0d7e272633",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-img-vert-001.xhtml": [
+      "e2949b1e327e433bef6d5df623c4f1e86c5e9122",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-textarea-horiz-001.xhtml": [
+      "7906d242afa3ce8497b3b4bfcdc667ead27ee515",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-textarea-vert-001.xhtml": [
+      "a935a101df4ba4f04db4e6bc033849b2a4d9e678",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-video-horiz-001.xhtml": [
+      "c976ccffbde87be226de794e9c7c0fad63e3bdba",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-basic-video-vert-001.xhtml": [
+      "b45f853e6081fc3685da88e89a08a015801482ab",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-horiz-001a.html": [
+      "613acd27ec46ee05ac05871c4532f15c916bcd84",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-horiz-001b.html": [
+      "3ef143639e44eecf46cde92454da06a119d6bed0",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-horiz-002a.html": [
+      "3bf1ac438b1c7e8faff4bce09a8154c59eb2ff23",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-horiz-002b.html": [
+      "3a53dace61a5198000c4ef38dc04751ab0a698be",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-vert-001a.html": [
+      "5be8d5307bd55d87135793eb8f3e9c210ee8e692",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-vert-001b.html": [
+      "87ba97a687e244b306901f3d6fec79aaf0a29a22",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-vert-002a.html": [
+      "e68b98a5ae0844345764786677096780d43e093f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-break-request-vert-002b.html": [
+      "cda5fecd44f3757dc23a3ef49549bebb37b9b433",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-break-request-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-collapsed-item-baseline-001.html": [
+      "0ffa27761933548c8f0d122f700b7631031c6c15",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-collapsed-item-horiz-001.html": [
+      "2c4385af8c8552e87c6d3c8a2a3064ab001992ea",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-collapsed-item-horiz-002.html": [
+      "97af3805ce92928b47b9ca9c2513e0a4715bbda9",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-collapsed-item-horiz-003.html": [
+      "4476bc18f2ae25b64808cd2cbda93de37dc318dc",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-column-row-gap-001.html": [
+      "25b28e8094754df403205ef468c682b19a6284c3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-column-row-gap-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-column-row-gap-002.html": [
+      "fcd19cf8d483267ec511482942c7dd64b03f98e6",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-column-row-gap-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-column-row-gap-003.html": [
+      "2dcd02717317a4c445e53df881ea555010cd20f6",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-column-row-gap-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-column-row-gap-004.html": [
+      "0d86b3818ff02aae7cb05d527bb487b653eebf3d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-column-row-gap-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-definite-sizes-001.html": [
+      "5bff6146e0ebe32a3e535c3566b98b84818d4773",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-definite-sizes-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-definite-sizes-002.html": [
+      "126fd5e50c25a5bad04c096c59a9184d6e165ce7",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-definite-sizes-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-definite-sizes-003.html": [
+      "bc5b0751dbe356c012aa4b76a60eb5415a4063b3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-definite-sizes-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-definite-sizes-004.html": [
+      "cf54aabe9936b3963e7343d566d957633fc26c69",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-definite-sizes-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-definite-sizes-005.html": [
+      "76beb2a41db70d2f00de159d1285fbc5310a3d40",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-definite-sizes-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-dyn-resize-001.html": [
+      "d64c4bdf28ecb783af4f342d515dcf63134602c6",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-dyn-resize-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-001a.html": [
+      "1ac926498cb39a7665836387d3c6efc92fba536d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-001b.html": [
+      "b41fd409b74ddff9fa74872a308b0b3b523d85a2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-002a.html": [
+      "68c67987dd87f644fd5c65349da070ff4c03c5a3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-002b.html": [
+      "d6d4171eed115654fdde15f587b3b762c4eab1fb",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-003a.html": [
+      "83dbae086844c52e83897d73866fffbb5ff0e2d3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-003b.html": [
+      "a81403c098f010a0fe0b18b0de9511827bdceca0",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-004a.html": [
+      "65a86b508f470e945dd102b9e0e7043e80844034",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-basis-content-004b.html": [
+      "a686f1aa1e19bdc7ebbec7a3ddb105031818a4f2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-basis-content-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-flex-direction-column-percentage-ignored.html": [
       "037ef3e83f8731680c1741921904403deeaa72bd",
       [
@@ -140969,6 +142204,32 @@
        {}
       ]
      ],
+     "flexbox-flex-flow-001.html": [
+      "a29b89aa6904ca41a773638c99dec4da733fb5bc",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-flow-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-flow-002.html": [
+      "8ba3abdf4bc39ee818c06bcdc3cf0fba281c1696",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-flow-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-flex-wrap-default.htm": [
       "51136da6db6bc45b2ea991278c5dcf3bf955b6e3",
       [
@@ -140995,6 +142256,32 @@
        {}
       ]
      ],
+     "flexbox-flex-wrap-horiz-001.html": [
+      "75137a2f312a237ec77669a8b0310d7425e3bf4b",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-wrap-horiz-002.html": [
+      "901a31ec578d301bbf845ac356e2c5c167a0084e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-flex-wrap-nowrap.htm": [
       "2cbf08fbb4ae3ee4d710f9fec2f2ea7b260c6ccf",
       [
@@ -141008,6 +142295,32 @@
        {}
       ]
      ],
+     "flexbox-flex-wrap-vert-001.html": [
+      "b5229b65be4653a67d8de2be793ee1c93819be5b",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-wrap-vert-002.html": [
+      "8a2dcbc402d7c3e8addc7a5b623b935922f6ff08",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-flex-wrap-wrap-reverse.htm": [
       "45b1c0052bc22cfd7928c20f70a91b9ba5109a41",
       [
@@ -141047,6 +142360,565 @@
        {}
       ]
      ],
+     "flexbox-items-as-stacking-contexts-001.xhtml": [
+      "fac905339110967578289f18ae156e4a651d81ab",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-items-as-stacking-contexts-002.html": [
+      "4b21404a9bd71ce25aafbe1f972b6716f91bad8f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-items-as-stacking-contexts-003.html": [
+      "5f0fd8ba35ee8214ac61edec55577b28b0e1c3f4",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-001a.xhtml": [
+      "494c35bb68703a67ceb6e15817b221ddf488c13a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-001b.xhtml": [
+      "468d5150fb33d22e9bf56b23af6b74e87d04dd74",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-002.xhtml": [
+      "93d34ab798ba277e1a77506aaa764cee4c80b7ca",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-003.xhtml": [
+      "40c8fb5c027bd5f0c7823f4a327d97513a187d3c",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-004.xhtml": [
+      "8f46426e4f67df2e13ad47a69a31a86d909b66de",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-005.xhtml": [
+      "53cba03fbe579ee64179cb5c90cc9734beab9366",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-horiz-006.xhtml": [
+      "dcbe6184c7e8156bad3c87c95af58d8e335fe958",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-001a.xhtml": [
+      "d4b32b3914483f7673ba28b14914e7587556e5a1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-001b.xhtml": [
+      "0ce154e2421b14c0707f5243760e878c71e2e280",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-002.xhtml": [
+      "21683a6cc7d3e480409849b11e5fd3baecb60644",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-003.xhtml": [
+      "8b99455e71590dc294be187f8ebfde6a43d6ed76",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-004.xhtml": [
+      "770ba7ba44c01f68250137c88c28f0596eec06c2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-005.xhtml": [
+      "bb99dd09b45f72c6aeb260ebd8e37782c173c01d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-vert-006.xhtml": [
+      "38a7f91d783c246a42b2e88c14d0a173142afddf",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-justify-content-wmvert-001.xhtml": [
+      "f676c6c1cdc5eceaa0ccb5fb77e7f4650618fb0b",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-margin-auto-horiz-001.xhtml": [
+      "76d7a88312aee623aacbecfe3c6d28a0d41834f4",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-margin-auto-horiz-002.xhtml": [
+      "a31bc7d6f7ad433fe628a4e6fee507a24c2a921e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-001-reverse.xhtml": [
+      "11c723221ff426891b6e3c9ddc1f36b659eada58",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-001-rtl-reverse.xhtml": [
+      "b09f121fe778cf22d8ad13d7ca3667b33d104808",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-001-rtl.xhtml": [
+      "00f5aa54f68a2dc47ea870b1904f021669024f67",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-001.xhtml": [
+      "31560f4461872bb0cabf43a928f23ff239accdb7",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-002a.xhtml": [
+      "b47b7aa55a7858781f72ff1408623d8bf97b8d44",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-002b.xhtml": [
+      "b8a8616552e850bc9b1149cbe4cb6a3c552cb19c",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-002v.xhtml": [
+      "a02e3406c90d9b3d1077d988e20344540f3b5084",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-003-reverse.xhtml": [
+      "cbe4c58b41634042d196ff8b4de43c0d2ba0d901",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-003.xhtml": [
+      "f0dc49b5ac20e00de54801daf406f937f2cecab1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-003v.xhtml": [
+      "8baef3022729bb7a59b94b84c7054a28e1d78646",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-mbp-horiz-004.xhtml": [
+      "b513253fd19fdace9da5e3ba45ccc4915b47d03b",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-001.html": [
+      "f69ed9561914980f534a89e65a69fcde35bb9e4f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-002a.html": [
+      "0fd9207fb4b9c0c87fd3ae28994b757b992205c7",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-002b.html": [
+      "e8c94f766f74583abc64c7af1ed6a16317442292",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-002c.html": [
+      "3093c65e5f9f259446a6c9605e98fb0f5ba48b0e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-003.html": [
+      "15ef35d9cd7f46078af9084832f841ed9a3e2e80",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-height-auto-004.html": [
+      "a04b9b573e2b9c8c8a44f10ee35ecc7c711f5e7f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-height-auto-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-001.html": [
+      "cb347abead55e6739fe5a04b203a1aeb6eb1af4a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-002a.html": [
+      "fe60255c937bc579b953c59b6b9ad596cab07daf",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-002b.html": [
+      "a56b214dc6820838903b12c8a60e53da601dbe98",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-002c.html": [
+      "95b98e5b583c511a26d3d76b2565af9d8631b1b4",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-003.html": [
+      "ecc7ab71700450c5f0859891ea11783a24761807",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-min-width-auto-004.html": [
+      "a090f2154f8e6ad8c5c46ed87d224b5ef37f6c10",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-min-width-auto-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-order-only-flexitems.html": [
       "75ad6fa6c23eb29281dee01d45efd8463b5899dc",
       [
@@ -141060,6 +142932,357 @@
        {}
       ]
      ],
+     "flexbox-overflow-horiz-001.html": [
+      "afc08d8c470d484db1b51ca1b7931d9bdf8b1ac2",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-horiz-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-horiz-002.html": [
+      "545ebb12e742200d3f55013e90f109f5ebc88f8f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-horiz-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-horiz-003.html": [
+      "66cbe76622530018b05fe1e5bdcd0406caf2aa54",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-horiz-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-horiz-004.html": [
+      "ca7471f1d28a08a0d61480783f46221abc34e89e",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-horiz-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-horiz-005.html": [
+      "da4e063ca8719449ebcdae6b310850e21be3f018",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-horiz-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-vert-001.html": [
+      "9c6ad35c18b7ce820cafff3ee45c270b159f1cb8",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-vert-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-vert-002.html": [
+      "aeec44e54d17632dd9f4fa76dc42c48b6ca611ca",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-vert-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-vert-003.html": [
+      "965b99a40fe28dc01b31f6bb422fdfe5ef7ee3df",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-vert-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-vert-004.html": [
+      "579cb4fd1a2031867978713a22c3fac9a59a1bed",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-vert-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-overflow-vert-005.html": [
+      "1de6d1b8c0756457e2bdbd39945c97755054b583",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-overflow-vert-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-paint-ordering-001.xhtml": [
+      "06b42e126a82a4717b4eb7a32875aa9079b4d2bb",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-paint-ordering-002.xhtml": [
+      "55a18d5b77773d03d18c1dab5aaffc508434f262",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-paint-ordering-003.html": [
+      "1a5175cb312b7203ca103d5423d3641184aacc48",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-paint-ordering-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-root-node-001a.html": [
+      "195503b943b9ca53543f7c950d0fe110c3745a99",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-root-node-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-root-node-001b.html": [
+      "87d4fc1e10049f93c33bad30c2418055d9a36f5f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-root-node-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-safe-overflow-position-001.html": [
+      "8114832aa3493dbc0953c59ad4c84bb2754eb0c3",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-single-line-clamp-1.html": [
+      "f97d5c578a190ad775918e15ae755c30cdfff877",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-single-line-clamp-1-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-single-line-clamp-2.html": [
+      "be9e50b90d6876b888be93746219782cfbe785b5",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-single-line-clamp-2-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-single-line-clamp-3.html": [
+      "f3afbd41001139ea8e77e883697bd391611c2659",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-single-line-clamp-3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-sizing-horiz-001.xhtml": [
+      "0f9b5846de892a857916996662409e620586cae1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-sizing-horiz-002.xhtml": [
+      "c450dd30169b5abf3065960a5b70991a68bc5022",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-sizing-vert-001.xhtml": [
+      "5ac29a7001b62a63f05803b44f2a6e304e5977f7",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-sizing-vert-002.xhtml": [
+      "9cba454e909b46684e5ec550c577a6e06e6f0c02",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-table-fixup-001.xhtml": [
+      "00e1a54ffa198298cd1500343265a2a8fa6c5e93",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-whitespace-handling-001a.xhtml": [
+      "3bae116b40aa472ab7b77381b8b55595ce17afb8",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-whitespace-handling-001b.xhtml": [
+      "43a4c60ce0c87913883e905024fd1f6fb5e1b5dc",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-whitespace-handling-002.xhtml": [
+      "c80947f81226944fb5f0628a6f1b1191ee237cdb",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-with-multi-column-property.html": [
       "56b56ca0935bc8869a4b19e0d70e2cf7cdb0a0b8",
       [
@@ -141073,6 +143296,253 @@
        {}
       ]
      ],
+     "flexbox-with-pseudo-elements-001.html": [
+      "0abf6ea898a7fe69a3232327d4c176a4ddd0e3e1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-with-pseudo-elements-002.html": [
+      "6e0738e7496d8f36304118a8cc1be4ac945b552f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-with-pseudo-elements-003.html": [
+      "fe531b126f31ad159ecdc572312252dd82d6aa80",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-001.html": [
+      "b2fb6d3f1f070a5ca7540c8f67b71ca855b9b70a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-002.html": [
+      "8e1c724ed7bf574d5558a2f467e50ec95408cda1",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-003.html": [
+      "9b4450487f3694c7509507301f32bed496736925",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-004.html": [
+      "38f4158680859b236b1d54054f1cf6b50137181a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-005.html": [
+      "65826fc2e37f5eba89bb7be6a86a51d1410eb19c",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-006.html": [
+      "3e8352a45a2c519d53e8eea64c2c7d17270e2f4b",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-006-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-007.html": [
+      "521af54af49fbb4901dca1b7a0243135c0b35c23",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-007-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-008.html": [
+      "98fd83fbc86118e827b9766dd8b74898b5f7fe54",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-008-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-009.html": [
+      "edd63a982a3771e0e1c789c6369e0279558b821f",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-009-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-010.html": [
+      "542bde16ce5827de3dda6317b4336259e55ead44",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-010-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-011.html": [
+      "697edb9be00f244652f343c4e15d52f71c36063a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-011-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-012.html": [
+      "b722d459e14a741ec499ffe33e3857cb4dcea342",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-012-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-013.html": [
+      "3d90e7120274e1e1ff9f0cc8ae34c471de42072d",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-013-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-014.html": [
+      "299229b1c3bd72a4e6eb5697af9d7535d3257973",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-014-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-015.html": [
+      "eb7fa1b981cfbe40bf1daebaf45ff52be03241e5",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-015-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-writing-mode-016.html": [
+      "94c732358351f990c2a4d7533b2e36598c2ec197",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/flexbox-writing-mode-016-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox_absolute-atomic.html": [
       "dae6b3e43ea71f3795508dd0ca4b243d4510c383",
       [
@@ -144871,6 +147341,32 @@
        {}
       ]
      ],
+     "position-absolute-containing-block-001.html": [
+      "1edfdb04caa0d65148a6994a8c85d8363c74850a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/position-absolute-containing-block-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "position-absolute-containing-block-002.html": [
+      "aecbf0b4c997ceb748496d7fa09aed6ba8c0f92a",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/position-absolute-containing-block-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "position-absolute-scrollbar-freeze.html": [
       "ac510f11e9160b1ed646047ed5aa44d2ebaa8a6f",
       [
@@ -205295,6 +207791,19 @@
        {}
       ]
      ],
+     "resize-generated-content.html": [
+      "462a81118bdb95a937465e7ae225d8234f5fb318",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-overflow-001.html": [
       "375c5c1e3cf060be068303b67e5505f7863e0ce9",
       [
@@ -229327,2595 +231836,6 @@
          ]
         ]
        },
-       "flexbox": {
-        "flexbox-abspos-child-001a.html": [
-         "fabe204b2796257fd3a74216a87c79960c42a9f9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-abspos-child-001b.html": [
-         "30fc58c3d12e336663d0aaadf959e23d87a525a1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-abspos-child-002.html": [
-         "8234085681ddc0f72e8da84471363ecb08d4d460",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-horiz-001a.xhtml": [
-         "bb592b74a8b761230b1a4c56398d961c4619b066",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-horiz-001b.xhtml": [
-         "3de740e9a3f8e59955d66de1771369eaf73b988c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-horiz-002.xhtml": [
-         "902b26ba23e44659f5a111617439889c09875e32",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-vert-001a.xhtml": [
-         "678b7f5096e94c0c78097407e0cf8ad89a2d893f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-vert-001b.xhtml": [
-         "faed08350aaec8e20bcad677b71d71f7ea5d0f9b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-vert-002.xhtml": [
-         "b4a8ccf3dd1f5890e5fad1cee0a49ba96f12d49f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-content-wmvert-001.xhtml": [
-         "e0c40a72553100dc9e8652fc7e6f7bef17a2b725",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-items-center-nested-001.html": [
-         "b6e2fdff0aaffc2df8187389183cd170bf6fb301",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-001a.xhtml": [
-         "0460f4162f5f424b4693c19cab688f5b5db16fa3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-001b.xhtml": [
-         "3a656e41e94041274f0e763a1b11789e886da419",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-002.xhtml": [
-         "8aa364ec51a4ea9dd1232a7fb0519cdbc225ccc8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-003.xhtml": [
-         "0b8e8499c3ff10498eed8bf6a9e791472e4c43d4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-004.xhtml": [
-         "14fbf4bc6e7c674ccb8b2ff4b41e85e8fcb7e6b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-005.xhtml": [
-         "cfe0d1b02b46d462a48d0e629c7fa2cf8ef60086",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-006.xhtml": [
-         "417f966587d30e2308a52f8880b503dddd970c41",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-007.xhtml": [
-         "50d74f5ebf645f078682f217eb514e59ebebab42",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-baseline-horiz-008.xhtml": [
-         "00bc4d9fce8033483de8f6e9172a166842a8ccf0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-001-block.xhtml": [
-         "365354506f86a16a2f2313296d5d99fa284400ab",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-001-table.xhtml": [
-         "1785ca8dfc0a8bf5b52a0e870e4605902b8f2685",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-002.xhtml": [
-         "d1273d1f55b8284821a8ed47b7cfc617670f8e52",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-003.xhtml": [
-         "4414d0a0a071ddad0f342a9f25efcc5a1b944132",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-004.xhtml": [
-         "b7bdf396a077cece36dc8c6f79b11ad680db9dda",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-horiz-005.xhtml": [
-         "cff89d3251668a12e2c74a1dcc82457c5f49d8c0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-005-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-stretch-vert-001.html": [
-         "578dff9cae91d6c71d3a2a28fb186b8610ec78aa",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-stretch-vert-002.html": [
-         "c2b90301193160fcc95aa665768b7992265ce774",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-001.xhtml": [
-         "4080d3488033297d681d5d77a039bdceba4c1526",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-002.xhtml": [
-         "2ff89bdf5f52c8e040dd665d53888c0566cafc5d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-003.xhtml": [
-         "23b320941365cfd7ea49068342878de77d8b016a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-004.xhtml": [
-         "4c52875747ad84892fa38cdfcf11888e3db10cda",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-rtl-001.xhtml": [
-         "1016c28f824e86dc7608f0b81af3f4989160eb0d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-rtl-002.xhtml": [
-         "a3a81e25d10a86d8a729ecec36afb1d0e0bf578d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-rtl-003.xhtml": [
-         "9a3bfccb35abbcda22341a143510344ba88c2437",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-rtl-004.xhtml": [
-         "4f4f49afda37f66b50e6b502bf0244540d1bf84e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-align-self-vert-rtl-005.xhtml": [
-         "420c334c841efb113d7e769deb3062097ff54307",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-anonymous-items-001.html": [
-         "0c85c46d55adf19f16b1196cf19cdb4c6c23d3ca",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-anonymous-items-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-align-self-baseline-horiz-001.html": [
-         "a7308f74876ee406e41b20824c0acf244599400f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-align-self-baseline-vert-001.html": [
-         "2d5b1124fd5634e90e9495e75d392ca872ae47b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-empty-001a.html": [
-         "fc6898881b02da55b353b6242b8184ea7441ae4f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-empty-001b.html": [
-         "aea906e0484a550bcee93dcd148522003329a2d4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-item-horiz-001a.html": [
-         "94bbdec20214e4cd346a151610faa42723deca41",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-item-horiz-001b.html": [
-         "d40a986405bd47fb210b139d3e9c814f6ded093d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-item-vert-001a.html": [
-         "507166da35dace00d109200ef407db6ea366e2ec",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-item-vert-001b.html": [
-         "3c0f984a12fbe8d1ca10cdfcc4149b35f3fc5b53",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-horiz-001.html": [
-         "0faf41bb3c9cf8f6e6fa6923b50f1adc565fff55",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-horiz-002.html": [
-         "bd13de7f9743aeeeada53374d506a1b59607260f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-horiz-003.html": [
-         "ef7d787beb6ad8386a1e4078ad1a41bb5fc31592",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-horiz-004.html": [
-         "21db212f99274d9bde5f69f080b76da64e0360f2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-vert-001.html": [
-         "d2b510ade630e2f33f6a3e4de50f956c9995ee7a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-multi-line-vert-002.html": [
-         "5bffc84630f679b5ae799cd9a75b240b5fd7fbd9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-single-item-001a.html": [
-         "b9df6c23f0e7e03e5670006699fd6e2c0003e81a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-baseline-single-item-001b.html": [
-         "523045894bbed0414922502f2d9fd3f2b666382e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-block-horiz-001.xhtml": [
-         "1345263df3971064483dbfbdc3bef29a76f06bcd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-block-horiz-001v.xhtml": [
-         "f1dfdfdb86ca172056183534cf7c1d906b4c5d6f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-block-vert-001.xhtml": [
-         "92c32c828caab079e80226fbcf9dae88589f3357",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-block-vert-001v.xhtml": [
-         "da943dfc56f32501f743a0f43fc40416b8a054c4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-canvas-horiz-001.xhtml": [
-         "6d3629e3267bfc74cf42eff2f6b7b53a6c0807d5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-canvas-horiz-001v.xhtml": [
-         "ad623d77f7ffc72cf69d97b0c717db70a33cea38",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-canvas-vert-001.xhtml": [
-         "1bae704384c2347ed5881d5f769111c11ef5556d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-canvas-vert-001v.xhtml": [
-         "057f63ae62bf430e089851e112a34280abeed6fd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-fieldset-horiz-001.xhtml": [
-         "8a504859dccc86944743b3976a7bd42653b9f6d3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-fieldset-vert-001.xhtml": [
-         "75d592f4cb90358cfb44098c028e1c6fc83c2ef7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-iframe-horiz-001.xhtml": [
-         "323b065199e1ca5c256ad7cd6b05927b00aa4be6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-iframe-vert-001.xhtml": [
-         "8b227c67c4a2287817aed818f3d756d15217ff9d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-img-horiz-001.xhtml": [
-         "b5f3a6fce640a2af6a5e9d0ed1176c0d7e272633",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-img-vert-001.xhtml": [
-         "e2949b1e327e433bef6d5df623c4f1e86c5e9122",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-textarea-horiz-001.xhtml": [
-         "7906d242afa3ce8497b3b4bfcdc667ead27ee515",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-textarea-vert-001.xhtml": [
-         "a935a101df4ba4f04db4e6bc033849b2a4d9e678",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-video-horiz-001.xhtml": [
-         "c976ccffbde87be226de794e9c7c0fad63e3bdba",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-basic-video-vert-001.xhtml": [
-         "b45f853e6081fc3685da88e89a08a015801482ab",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-horiz-001a.html": [
-         "613acd27ec46ee05ac05871c4532f15c916bcd84",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-horiz-001b.html": [
-         "3ef143639e44eecf46cde92454da06a119d6bed0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-horiz-002a.html": [
-         "3bf1ac438b1c7e8faff4bce09a8154c59eb2ff23",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-horiz-002b.html": [
-         "3a53dace61a5198000c4ef38dc04751ab0a698be",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-vert-001a.html": [
-         "5be8d5307bd55d87135793eb8f3e9c210ee8e692",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-vert-001b.html": [
-         "87ba97a687e244b306901f3d6fec79aaf0a29a22",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-vert-002a.html": [
-         "e68b98a5ae0844345764786677096780d43e093f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-break-request-vert-002b.html": [
-         "cda5fecd44f3757dc23a3ef49549bebb37b9b433",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-collapsed-item-baseline-001.html": [
-         "0ffa27761933548c8f0d122f700b7631031c6c15",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-collapsed-item-horiz-001.html": [
-         "2c4385af8c8552e87c6d3c8a2a3064ab001992ea",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-collapsed-item-horiz-002.html": [
-         "97af3805ce92928b47b9ca9c2513e0a4715bbda9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-collapsed-item-horiz-003.html": [
-         "4476bc18f2ae25b64808cd2cbda93de37dc318dc",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-column-row-gap-001.html": [
-         "25b28e8094754df403205ef468c682b19a6284c3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-column-row-gap-002.html": [
-         "fcd19cf8d483267ec511482942c7dd64b03f98e6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-column-row-gap-003.html": [
-         "2dcd02717317a4c445e53df881ea555010cd20f6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-column-row-gap-004.html": [
-         "0d86b3818ff02aae7cb05d527bb487b653eebf3d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-definite-sizes-001.html": [
-         "5bff6146e0ebe32a3e535c3566b98b84818d4773",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-definite-sizes-002.html": [
-         "126fd5e50c25a5bad04c096c59a9184d6e165ce7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-definite-sizes-003.html": [
-         "bc5b0751dbe356c012aa4b76a60eb5415a4063b3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-definite-sizes-004.html": [
-         "cf54aabe9936b3963e7343d566d957633fc26c69",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-definite-sizes-005.html": [
-         "76beb2a41db70d2f00de159d1285fbc5310a3d40",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-dyn-resize-001.html": [
-         "d64c4bdf28ecb783af4f342d515dcf63134602c6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-dyn-resize-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-001a.html": [
-         "259b8c2b5d8ac5c6124ec3fd6220bddff7b44657",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-001b.html": [
-         "52aae36eaea059cbbf66bbb9ff3d04fbec179559",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-002a.html": [
-         "4281959a3d8902ef9bd00cda9b1969cb0d38d02b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-002b.html": [
-         "a76f24681a73875fea42f249eb3a57a0a20288a7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-003a.html": [
-         "83dbae086844c52e83897d73866fffbb5ff0e2d3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-003b.html": [
-         "a81403c098f010a0fe0b18b0de9511827bdceca0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-004a.html": [
-         "65a86b508f470e945dd102b9e0e7043e80844034",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-basis-content-004b.html": [
-         "a686f1aa1e19bdc7ebbec7a3ddb105031818a4f2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-flow-001.html": [
-         "a29b89aa6904ca41a773638c99dec4da733fb5bc",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-flow-002.html": [
-         "8ba3abdf4bc39ee818c06bcdc3cf0fba281c1696",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-wrap-horiz-001.html": [
-         "75137a2f312a237ec77669a8b0310d7425e3bf4b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-wrap-horiz-002.html": [
-         "901a31ec578d301bbf845ac356e2c5c167a0084e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-wrap-vert-001.html": [
-         "b5229b65be4653a67d8de2be793ee1c93819be5b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-flex-wrap-vert-002.html": [
-         "8a2dcbc402d7c3e8addc7a5b623b935922f6ff08",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-items-as-stacking-contexts-001.xhtml": [
-         "fac905339110967578289f18ae156e4a651d81ab",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-items-as-stacking-contexts-002.html": [
-         "4b21404a9bd71ce25aafbe1f972b6716f91bad8f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-items-as-stacking-contexts-003.html": [
-         "5f0fd8ba35ee8214ac61edec55577b28b0e1c3f4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-001a.xhtml": [
-         "494c35bb68703a67ceb6e15817b221ddf488c13a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-001b.xhtml": [
-         "468d5150fb33d22e9bf56b23af6b74e87d04dd74",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-002.xhtml": [
-         "93d34ab798ba277e1a77506aaa764cee4c80b7ca",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-003.xhtml": [
-         "40c8fb5c027bd5f0c7823f4a327d97513a187d3c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-004.xhtml": [
-         "8f46426e4f67df2e13ad47a69a31a86d909b66de",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-005.xhtml": [
-         "53cba03fbe579ee64179cb5c90cc9734beab9366",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-horiz-006.xhtml": [
-         "dcbe6184c7e8156bad3c87c95af58d8e335fe958",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-006-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-001a.xhtml": [
-         "d4b32b3914483f7673ba28b14914e7587556e5a1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-001b.xhtml": [
-         "0ce154e2421b14c0707f5243760e878c71e2e280",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-002.xhtml": [
-         "21683a6cc7d3e480409849b11e5fd3baecb60644",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-003.xhtml": [
-         "8b99455e71590dc294be187f8ebfde6a43d6ed76",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-004.xhtml": [
-         "770ba7ba44c01f68250137c88c28f0596eec06c2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-005.xhtml": [
-         "bb99dd09b45f72c6aeb260ebd8e37782c173c01d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-vert-006.xhtml": [
-         "38a7f91d783c246a42b2e88c14d0a173142afddf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-006-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-justify-content-wmvert-001.xhtml": [
-         "f676c6c1cdc5eceaa0ccb5fb77e7f4650618fb0b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-wmvert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-margin-auto-horiz-001.xhtml": [
-         "76d7a88312aee623aacbecfe3c6d28a0d41834f4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-margin-auto-horiz-002.xhtml": [
-         "a31bc7d6f7ad433fe628a4e6fee507a24c2a921e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-001-reverse.xhtml": [
-         "11c723221ff426891b6e3c9ddc1f36b659eada58",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-001-rtl-reverse.xhtml": [
-         "51186205db6959e2f76a97f4f79ae41f2c73ed0d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-001-rtl.xhtml": [
-         "00f5aa54f68a2dc47ea870b1904f021669024f67",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-001.xhtml": [
-         "31560f4461872bb0cabf43a928f23ff239accdb7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-002a.xhtml": [
-         "b47b7aa55a7858781f72ff1408623d8bf97b8d44",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-002b.xhtml": [
-         "b8a8616552e850bc9b1149cbe4cb6a3c552cb19c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-002v.xhtml": [
-         "a02e3406c90d9b3d1077d988e20344540f3b5084",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-003-reverse.xhtml": [
-         "cbe4c58b41634042d196ff8b4de43c0d2ba0d901",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-003.xhtml": [
-         "f0dc49b5ac20e00de54801daf406f937f2cecab1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-003v.xhtml": [
-         "8baef3022729bb7a59b94b84c7054a28e1d78646",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-mbp-horiz-004.xhtml": [
-         "b513253fd19fdace9da5e3ba45ccc4915b47d03b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-001.html": [
-         "f69ed9561914980f534a89e65a69fcde35bb9e4f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-002a.html": [
-         "0fd9207fb4b9c0c87fd3ae28994b757b992205c7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-002b.html": [
-         "e8c94f766f74583abc64c7af1ed6a16317442292",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-002c.html": [
-         "3093c65e5f9f259446a6c9605e98fb0f5ba48b0e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-003.html": [
-         "15ef35d9cd7f46078af9084832f841ed9a3e2e80",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-height-auto-004.html": [
-         "a04b9b573e2b9c8c8a44f10ee35ecc7c711f5e7f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-001.html": [
-         "cb347abead55e6739fe5a04b203a1aeb6eb1af4a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-002a.html": [
-         "fe60255c937bc579b953c59b6b9ad596cab07daf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-002b.html": [
-         "a56b214dc6820838903b12c8a60e53da601dbe98",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-002c.html": [
-         "95b98e5b583c511a26d3d76b2565af9d8631b1b4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-003.html": [
-         "ecc7ab71700450c5f0859891ea11783a24761807",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-min-width-auto-004.html": [
-         "a090f2154f8e6ad8c5c46ed87d224b5ef37f6c10",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-horiz-001.html": [
-         "afc08d8c470d484db1b51ca1b7931d9bdf8b1ac2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-horiz-002.html": [
-         "545ebb12e742200d3f55013e90f109f5ebc88f8f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-horiz-003.html": [
-         "66cbe76622530018b05fe1e5bdcd0406caf2aa54",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-horiz-004.html": [
-         "ca7471f1d28a08a0d61480783f46221abc34e89e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-horiz-005.html": [
-         "da4e063ca8719449ebcdae6b310850e21be3f018",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-vert-001.html": [
-         "9c6ad35c18b7ce820cafff3ee45c270b159f1cb8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-vert-002.html": [
-         "aeec44e54d17632dd9f4fa76dc42c48b6ca611ca",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-vert-003.html": [
-         "965b99a40fe28dc01b31f6bb422fdfe5ef7ee3df",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-vert-004.html": [
-         "579cb4fd1a2031867978713a22c3fac9a59a1bed",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-overflow-vert-005.html": [
-         "1de6d1b8c0756457e2bdbd39945c97755054b583",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-paint-ordering-001.xhtml": [
-         "06b42e126a82a4717b4eb7a32875aa9079b4d2bb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-paint-ordering-002.xhtml": [
-         "55a18d5b77773d03d18c1dab5aaffc508434f262",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-paint-ordering-003.html": [
-         "1a5175cb312b7203ca103d5423d3641184aacc48",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-root-node-001a.html": [
-         "195503b943b9ca53543f7c950d0fe110c3745a99",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-root-node-001b.html": [
-         "87d4fc1e10049f93c33bad30c2418055d9a36f5f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-safe-overflow-position-001.html": [
-         "8114832aa3493dbc0953c59ad4c84bb2754eb0c3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-safe-overflow-position-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-single-line-clamp-1.html": [
-         "f97d5c578a190ad775918e15ae755c30cdfff877",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-single-line-clamp-2.html": [
-         "be9e50b90d6876b888be93746219782cfbe785b5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-single-line-clamp-3.html": [
-         "f3afbd41001139ea8e77e883697bd391611c2659",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-sizing-horiz-001.xhtml": [
-         "0f9b5846de892a857916996662409e620586cae1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-sizing-horiz-002.xhtml": [
-         "c450dd30169b5abf3065960a5b70991a68bc5022",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-sizing-vert-001.xhtml": [
-         "5ac29a7001b62a63f05803b44f2a6e304e5977f7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-sizing-vert-002.xhtml": [
-         "9cba454e909b46684e5ec550c577a6e06e6f0c02",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-table-fixup-001.xhtml": [
-         "00e1a54ffa198298cd1500343265a2a8fa6c5e93",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-whitespace-handling-001a.xhtml": [
-         "3bae116b40aa472ab7b77381b8b55595ce17afb8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-whitespace-handling-001b.xhtml": [
-         "43a4c60ce0c87913883e905024fd1f6fb5e1b5dc",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-whitespace-handling-002.xhtml": [
-         "e7d00d2f29424ce133e014929a07c4eec248d8b7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002-ref.xhtml",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-with-pseudo-elements-001.html": [
-         "0abf6ea898a7fe69a3232327d4c176a4ddd0e3e1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-with-pseudo-elements-002.html": [
-         "6e0738e7496d8f36304118a8cc1be4ac945b552f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-with-pseudo-elements-003.html": [
-         "fe531b126f31ad159ecdc572312252dd82d6aa80",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-001.html": [
-         "b2fb6d3f1f070a5ca7540c8f67b71ca855b9b70a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-002.html": [
-         "8e1c724ed7bf574d5558a2f467e50ec95408cda1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-003.html": [
-         "9b4450487f3694c7509507301f32bed496736925",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-004.html": [
-         "38f4158680859b236b1d54054f1cf6b50137181a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-005.html": [
-         "65826fc2e37f5eba89bb7be6a86a51d1410eb19c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-006.html": [
-         "3e8352a45a2c519d53e8eea64c2c7d17270e2f4b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-007.html": [
-         "521af54af49fbb4901dca1b7a0243135c0b35c23",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-008.html": [
-         "98fd83fbc86118e827b9766dd8b74898b5f7fe54",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-009.html": [
-         "edd63a982a3771e0e1c789c6369e0279558b821f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-010.html": [
-         "b7c44b26bab5b2909078e1750951ec99523928d7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-011.html": [
-         "9e7d2a9b45922b8972816e428f5f6e45278c2df0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-012.html": [
-         "ecbbe6a5f7d79a71fc83b991dc8024aba402ebf8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-013.html": [
-         "22deeb285d94bb25179709973aa6bae5e71cb9e9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-014.html": [
-         "e1559faf5e6ba6a61be9e5706cb18dc5638fd825",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-015.html": [
-         "69c16f15dfc411ea04f4674efe159e53e8f10d98",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-writing-mode-016.html": [
-         "94c732358351f990c2a4d7533b2e36598c2ec197",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-016-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "position-absolute-containing-block-001.html": [
-         "1edfdb04caa0d65148a6994a8c85d8363c74850a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "position-absolute-containing-block-002.html": [
-         "aecbf0b4c997ceb748496d7fa09aed6ba8c0f92a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "fonts3": {
         "font-size-adjust-zero-1.html": [
          "ea1e57453b6e3ce9993215041dfb257c1a28a51a",
@@ -236125,7 +236045,7 @@
          ]
         ],
         "ruby-text-combine-upright-001a.html": [
-         "a35772ac0749b5a20fd121efa6085257a76154df",
+         "bdb87e29b9b1b011868a6c03082fc60f80f72e36",
          [
           null,
           [
@@ -236138,7 +236058,7 @@
          ]
         ],
         "ruby-text-combine-upright-001b.html": [
-         "4997bdc9bf6861aa973d70bc7b0944b86de7819a",
+         "8aed0146b5493d2219129ff02de11daa68820d94",
          [
           null,
           [
@@ -236151,7 +236071,7 @@
          ]
         ],
         "ruby-text-combine-upright-002a.html": [
-         "411c5b24806d93ea940b559b23f49c2c7e6ef8d4",
+         "6c95c169e240f99d145506d3df854ed9d9fb6509",
          [
           null,
           [
@@ -236164,7 +236084,7 @@
          ]
         ],
         "ruby-text-combine-upright-002b.html": [
-         "df57bf886aba09ff66448b5be39ebc8267fe5503",
+         "ed7dabb0269789e73d1073fbf1a9af2a68d1d1d6",
          [
           null,
           [
@@ -236337,7 +236257,7 @@
        },
        "sizing": {
         "block-size-with-min-or-max-content-1a.html": [
-         "74314e525691f9d913cbf35f174725dc5c998f53",
+         "22193a9fd0e1236dcbb5c799df5931a674fd25a8",
          [
           null,
           [
@@ -236350,7 +236270,7 @@
          ]
         ],
         "block-size-with-min-or-max-content-1b.html": [
-         "ab510fab9305ef32fca1c0281c31389aa785f449",
+         "35174cd885745e779aa2af450db0e8d97092fc53",
          [
           null,
           [
@@ -236389,7 +236309,7 @@
          ]
         ],
         "hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html": [
-         "57a165d317cbfa08717b7c7373e4ec505d7cc67f",
+         "68860be223474aac0eca9b408f4f8bb6ae6c61b5",
          [
           null,
           [
@@ -236402,7 +236322,7 @@
          ]
         ],
         "hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html": [
-         "232753c70984a6bc08b9c1638e0e70475421b2df",
+         "8592c7d66bf06535e427c742e555293be8bb3d6c",
          [
           null,
           [
@@ -236415,7 +236335,7 @@
          ]
         ],
         "hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html": [
-         "5ee74f98114743d514ef703967564c5a0955ed65",
+         "f7844a0b34edde547aacf7a6759f74bd3caf1ba7",
          [
           null,
           [
@@ -236428,7 +236348,7 @@
          ]
         ],
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html": [
-         "741c03992d71899965b28673dffb8128b8b78e98",
+         "15fdaa9dacc1e4704603c60b77e7f8b073fd3e4b",
          [
           null,
           [
@@ -236441,7 +236361,7 @@
          ]
         ],
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html": [
-         "0b97a41f488a1b451ead14295954023709621f6a",
+         "8b863db4045ba5f5e1ccd049eada6aa15ad4b348",
          [
           null,
           [
@@ -236454,7 +236374,7 @@
          ]
         ],
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html": [
-         "4167c674870b1c9bdd418ced3629857cc9a4776e",
+         "55223533a2e6e363f00eb0373da78c6d9558e1a8",
          [
           null,
           [
@@ -237953,7 +237873,7 @@
          ]
         ],
         "segment-break-transformation-removable-1.html": [
-         "b8848622e5a2cd8984940c1e074dc5c47cb03b57",
+         "7c2b820bee0022c8ec93ca9c52f52e3f697af883",
          [
           null,
           [
@@ -237966,7 +237886,7 @@
          ]
         ],
         "segment-break-transformation-removable-2.html": [
-         "ef78b57196d58e56a300d06a2264bbdcf83a21bb",
+         "47bbaddfef8372c08df62e494690cfede7625ebc",
          [
           null,
           [
@@ -237979,7 +237899,7 @@
          ]
         ],
         "segment-break-transformation-removable-3.html": [
-         "4c09dabf114c86dc83a736c66d8b7ca1c89d204e",
+         "fd0ff31607dbe2fd9bf67748c072eb3551e68299",
          [
           null,
           [
@@ -237992,7 +237912,7 @@
          ]
         ],
         "segment-break-transformation-removable-4.html": [
-         "835c146e9305ecf4e29af322ad4cfadf848dce77",
+         "6fb51beeae325297922fa007aefeaea29122c5dd",
          [
           null,
           [
@@ -238005,7 +237925,7 @@
          ]
         ],
         "segment-break-transformation-rules-001.html": [
-         "4488e93569c8abaa5c1697bb325c299a5481da9e",
+         "7c80115ae4bad4b7d8508df5f7ee0f972be41995",
          [
           null,
           [
@@ -238018,7 +237938,7 @@
          ]
         ],
         "segment-break-transformation-rules-002.html": [
-         "be2b77c08888ea374e1352d520b2af40945405f4",
+         "efd26a55cfb744cade089bdc498b42ada5b2d0e2",
          [
           null,
           [
@@ -238031,7 +237951,7 @@
          ]
         ],
         "segment-break-transformation-rules-003.html": [
-         "cf6847f86006add2c1f394c3e1a07230985989a8",
+         "2461cc9cf73a69f6bd7b7f60e4b1e1054e27d0c3",
          [
           null,
           [
@@ -238044,7 +237964,7 @@
          ]
         ],
         "segment-break-transformation-rules-004.html": [
-         "b968a215cc0f230e66682d0b27359a82409211bd",
+         "26a5986bafe60dd123f304188ca6b4ca1a76b1c0",
          [
           null,
           [
@@ -238057,7 +237977,7 @@
          ]
         ],
         "segment-break-transformation-rules-005.html": [
-         "8faf540fa86c2f809cefeb276390ae8026aafd8d",
+         "41de8899f987f5d772d336a62bffc36419f4cfab",
          [
           null,
           [
@@ -238070,7 +237990,7 @@
          ]
         ],
         "segment-break-transformation-rules-006.html": [
-         "7887f2e173cba68a59a06d56a6e34a4d211bfda6",
+         "83eebb05218bbe6e93732037c19622528deca039",
          [
           null,
           [
@@ -238083,7 +238003,7 @@
          ]
         ],
         "segment-break-transformation-rules-007.html": [
-         "96298559192ba2175bb2961018297926be240226",
+         "46c27e6b1793170f479a0ae8721dfb0fdc87d544",
          [
           null,
           [
@@ -238096,7 +238016,7 @@
          ]
         ],
         "segment-break-transformation-rules-008.html": [
-         "48a9b5bccd193806cedabe9a4f36fec5a0012f4d",
+         "756422f7fbc4ced55f09765af16774f92ba8f7c1",
          [
           null,
           [
@@ -238109,7 +238029,7 @@
          ]
         ],
         "segment-break-transformation-rules-009.html": [
-         "c8c6a96131af61f4b12c27a3067aee22b49f940c",
+         "8d41c8477db002c3e499d6efea58114cdc3076ae",
          [
           null,
           [
@@ -238122,7 +238042,7 @@
          ]
         ],
         "segment-break-transformation-rules-010.html": [
-         "1aa9253df31b5bf6610be8c12842a0d35c55a83d",
+         "24504d3b0347970c4738e1e64007e162e7bdd96b",
          [
           null,
           [
@@ -238135,7 +238055,7 @@
          ]
         ],
         "segment-break-transformation-rules-011.html": [
-         "923a0f57b3923663ccfb529b784074850dc52230",
+         "017801fd0bb064e1c1aaaa9a886bef2912630611",
          [
           null,
           [
@@ -238148,7 +238068,7 @@
          ]
         ],
         "segment-break-transformation-rules-012.html": [
-         "2e0a6eef1f6d57cd31cd99f3b6412d1a8bf5690c",
+         "22b012f3f64e33e1c584ea105136b9ec9e49b886",
          [
           null,
           [
@@ -238161,7 +238081,7 @@
          ]
         ],
         "segment-break-transformation-rules-013.html": [
-         "4346d7af0e91762e5562ffdddc8bfcfc4ee02d43",
+         "74f5f4dd4e9509bae41fcb2198fceb68a983df2e",
          [
           null,
           [
@@ -238174,7 +238094,7 @@
          ]
         ],
         "segment-break-transformation-rules-014.html": [
-         "9e9d80d6057f37304bcd78b2d7221ee49de14a59",
+         "693763a9c2e80b84a6d08352cd556623e65b6365",
          [
           null,
           [
@@ -238187,7 +238107,7 @@
          ]
         ],
         "segment-break-transformation-rules-015.html": [
-         "f6a379479f9ebe8e50c3762577052d35ddf6287a",
+         "c063d9f231420026871db82d8e8180dfe8e7199e",
          [
           null,
           [
@@ -238200,7 +238120,7 @@
          ]
         ],
         "segment-break-transformation-rules-016.html": [
-         "a2b60d0893bf3787fb80ffee3e255297215edc7d",
+         "f3cc8f6bf65a2c1f24edeb9c0ef97fac3b82c420",
          [
           null,
           [
@@ -238213,7 +238133,7 @@
          ]
         ],
         "segment-break-transformation-rules-017.html": [
-         "1ee94d9f753b101bfb61f397788d61bf36da4ff4",
+         "fe85a65e4b5b1a6a5e8a7995217fa711ea13f32a",
          [
           null,
           [
@@ -238226,7 +238146,7 @@
          ]
         ],
         "segment-break-transformation-rules-018.html": [
-         "6884e7e0649cdebb7d17b46c56d9ce83a0e597b3",
+         "fa4d5515b2a76c93d862082295d4641a40c5b259",
          [
           null,
           [
@@ -238239,7 +238159,7 @@
          ]
         ],
         "segment-break-transformation-rules-019.html": [
-         "b02af78878ec3c01c5cdef03fdd40dac0e12c75b",
+         "a442ca7cc813afe1cf516a77242ca3e9b56bff1d",
          [
           null,
           [
@@ -238252,7 +238172,7 @@
          ]
         ],
         "segment-break-transformation-rules-020.html": [
-         "b946a38443e11f549f05e7d04970690f041bd3b8",
+         "6e25a4523db1839529ace0f8aaaa2b74969fe964",
          [
           null,
           [
@@ -238265,7 +238185,7 @@
          ]
         ],
         "segment-break-transformation-rules-021.html": [
-         "947edc6af0b6f639df307bf063a44d17d7364b1e",
+         "db373d6b3d4a1c41644abe2b9925b0cba42dc494",
          [
           null,
           [
@@ -238278,7 +238198,7 @@
          ]
         ],
         "segment-break-transformation-rules-022.html": [
-         "bae2f82c6ece8b0359b05efbe84c3fa264ecbae1",
+         "f13b581f652f9a176d68e796f7cc914174be89c4",
          [
           null,
           [
@@ -238291,7 +238211,7 @@
          ]
         ],
         "segment-break-transformation-rules-023.html": [
-         "e95cb479ada1d185021bec70197c8387161ffaa7",
+         "423a4ec2102c6f679ecc41a990b22fad9e887f9d",
          [
           null,
           [
@@ -238304,7 +238224,7 @@
          ]
         ],
         "segment-break-transformation-rules-024.html": [
-         "eb3e102d7181ce43058111675234ef1d349be741",
+         "d49a1701601e4558c9fc19f86d0bd8956bb8e22a",
          [
           null,
           [
@@ -238317,7 +238237,7 @@
          ]
         ],
         "segment-break-transformation-rules-025.html": [
-         "b08bd0025c23a4681f3a1666cd976fed5b604cb0",
+         "36be6391c68d55006ad0513a3e96a090d3552457",
          [
           null,
           [
@@ -238330,7 +238250,7 @@
          ]
         ],
         "segment-break-transformation-rules-026.html": [
-         "99fff6a4badd87f8eaeb0c8fb9295ad21add5302",
+         "56dddce49188b913c76ce4fd68cc2b9fa277433b",
          [
           null,
           [
@@ -238343,7 +238263,7 @@
          ]
         ],
         "segment-break-transformation-rules-027.html": [
-         "1643198d32380a9041260f59b736fcff60c44c22",
+         "c0d24e11a9d477d43e1618a237c4eab7ac025de3",
          [
           null,
           [
@@ -238356,7 +238276,7 @@
          ]
         ],
         "segment-break-transformation-rules-028.html": [
-         "33a2af2bdd3208ff73abb4d19f56b7778221b2a9",
+         "4b9857b01e8d00d5b482ebe4bc0a5934b85c51a1",
          [
           null,
           [
@@ -238369,7 +238289,7 @@
          ]
         ],
         "segment-break-transformation-rules-029.html": [
-         "3cab89d1886fbbb809f740e0dea6c0cb65ae1cf5",
+         "4950374456c8dc0772992ec175edf187499fadc0",
          [
           null,
           [
@@ -238382,7 +238302,7 @@
          ]
         ],
         "segment-break-transformation-rules-030.html": [
-         "b0a06881958b218b02ca5786ec2ef2e23457b85a",
+         "398117d22e837c23db99f4e471a9d7e72cf22c51",
          [
           null,
           [
@@ -238395,7 +238315,7 @@
          ]
         ],
         "segment-break-transformation-rules-031.html": [
-         "df1bf1430456a83e49b3f6b60d2d8bf9619ce653",
+         "2ca442e6e8693fd12fd866400bc4df36d9de4b27",
          [
           null,
           [
@@ -238408,7 +238328,7 @@
          ]
         ],
         "segment-break-transformation-rules-032.html": [
-         "2d1a91015b8d5963daee8ccfd814f02124a3ea7d",
+         "62fe0f26c146a97cfc644fe23351f8b9407b9121",
          [
           null,
           [
@@ -238421,7 +238341,7 @@
          ]
         ],
         "segment-break-transformation-rules-033.html": [
-         "3b83a47579d7acd751ce629a5c0b8cb865069366",
+         "4663e4aa008afa146d72ed660c2324e0bd5ca49a",
          [
           null,
           [
@@ -238434,7 +238354,7 @@
          ]
         ],
         "segment-break-transformation-rules-034.html": [
-         "89b12125f5ec19c5e8560adb6db87b27d0143aca",
+         "3378077c53dc203d82c9c11b42256f16487dc32d",
          [
           null,
           [
@@ -238447,7 +238367,7 @@
          ]
         ],
         "segment-break-transformation-rules-035.html": [
-         "a7d01eb751a3202f2d23a6eaa72f69e341263d5e",
+         "08b310bacbb803bc67af9d4a8c0eba2cd5babfac",
          [
           null,
           [
@@ -238460,7 +238380,7 @@
          ]
         ],
         "segment-break-transformation-rules-036.html": [
-         "9ce839cf442e26e76f9f705ae807ecd74864826d",
+         "5eef20dec6c2b24c50eb9170c1cdd31f0a809c16",
          [
           null,
           [
@@ -238473,7 +238393,7 @@
          ]
         ],
         "segment-break-transformation-rules-037.html": [
-         "a4e97d56b4c5b6689ac2c2ef1af73e6f64c972dc",
+         "2bd4ca1fee071532d3d1201d39afb392b70b447d",
          [
           null,
           [
@@ -238486,7 +238406,7 @@
          ]
         ],
         "segment-break-transformation-rules-038.html": [
-         "d2069e10c2d1e0716a0cef1d4a078d1f2ca282d0",
+         "57f78fecdc30210d707b4a62e3116b7f1cd15c9f",
          [
           null,
           [
@@ -238499,7 +238419,7 @@
          ]
         ],
         "segment-break-transformation-rules-039.html": [
-         "d8d3d77cdc8f3b84ad54fe6956b6ec74a97a5714",
+         "55e7cc208f143ac0fdb24974ff0fe57ec33dbedf",
          [
           null,
           [
@@ -238512,7 +238432,7 @@
          ]
         ],
         "segment-break-transformation-rules-040.html": [
-         "3786d843413df9cd14d714dcf3abb555b2c38294",
+         "cb26c669bd9857b65ce5f449f4199c8d808cea9c",
          [
           null,
           [
@@ -238525,7 +238445,7 @@
          ]
         ],
         "segment-break-transformation-rules-041.html": [
-         "5d7d4fea62169aaddbfa4939b3a157b81ff4cb66",
+         "62d29356cf0a21faacd7ad0268de1a4bc13cadda",
          [
           null,
           [
@@ -238538,7 +238458,7 @@
          ]
         ],
         "segment-break-transformation-rules-042.html": [
-         "25e4e161e87548fea01e819bc3815d76653b5e23",
+         "a067773171f9b17d0fbe8b4c2828968b7fdf53b5",
          [
           null,
           [
@@ -238551,7 +238471,7 @@
          ]
         ],
         "segment-break-transformation-rules-043.html": [
-         "ef44694b75af8eba37b236dc82781b0cdf8c26c7",
+         "de3f1941d61ae1782287a99734da1b75a9b0afa8",
          [
           null,
           [
@@ -238564,7 +238484,7 @@
          ]
         ],
         "segment-break-transformation-rules-044.html": [
-         "22488c8b673ae5e346632d8173f96a2182b14eb0",
+         "9dafd2e7571de1ac046a4dcae7ea674beca4850b",
          [
           null,
           [
@@ -238577,7 +238497,7 @@
          ]
         ],
         "segment-break-transformation-rules-045.html": [
-         "988b89b90e82ee90cecc2b5c58edf094b14ecd5f",
+         "719dc917c6b02d7ea617bac7eba308542ca5e01c",
          [
           null,
           [
@@ -238590,7 +238510,7 @@
          ]
         ],
         "segment-break-transformation-rules-046.html": [
-         "5d39f46604a396497081a765cec13d35cc1c4441",
+         "8e04c8e00d5026c2db5d728d8865c0f012c8084a",
          [
           null,
           [
@@ -238603,7 +238523,7 @@
          ]
         ],
         "segment-break-transformation-rules-047.html": [
-         "c67c95a0f3a2477a613f794a0cfe6bfdde358d33",
+         "81b95a1a59d4d79fc829ac9c30e949a78c41ba74",
          [
           null,
           [
@@ -238616,7 +238536,7 @@
          ]
         ],
         "segment-break-transformation-rules-048.html": [
-         "a39a0ff57babb58cb9488bd7294e1760bc30185d",
+         "f578fa0145b457a847d1ddbf93bd552f7d9ad455",
          [
           null,
           [
@@ -238629,7 +238549,7 @@
          ]
         ],
         "segment-break-transformation-rules-049.html": [
-         "b96db3bbb718ebbd1063fd1612004037e603bc9d",
+         "a55af42b45abe4ca110326788ba8b57ef9b94811",
          [
           null,
           [
@@ -238642,7 +238562,7 @@
          ]
         ],
         "segment-break-transformation-unremovable-1.html": [
-         "cf7031571723431dea60cc6d38eae2185310bf33",
+         "4882f06c9310f7b4ef6fc455a9df9d0e5410abd2",
          [
           null,
           [
@@ -238655,7 +238575,7 @@
          ]
         ],
         "segment-break-transformation-unremovable-2.html": [
-         "2779a64204607b71e827627a9f123ad4b5bb9f04",
+         "6627e0708eaab8c433147c05eb36b9bf3fe6efab",
          [
           null,
           [
@@ -238668,7 +238588,7 @@
          ]
         ],
         "segment-break-transformation-unremovable-3.html": [
-         "5b47806799dff1d68da03fd5e8a9b74fd0be3542",
+         "e4b3ab9b73442136b92ca7b8259ab8b7caced003",
          [
           null,
           [
@@ -238681,7 +238601,7 @@
          ]
         ],
         "segment-break-transformation-unremovable-4.html": [
-         "194eea2528b77d1a2631447f66cf33a4c48e8b84",
+         "e266f592fc757e1853c0d1c8c0a57d1e38e18102",
          [
           null,
           [
@@ -238824,7 +238744,7 @@
          ]
         ],
         "text-word-spacing-001.html": [
-         "a9bcfd93be750b437662adb69b20c9b223c3e561",
+         "31bf1b3282c0e9f49edd2a47de16f8b3d452d25b",
          [
           null,
           [
@@ -239664,7 +239584,7 @@
          ]
         ],
         "variable-declaration-15.html": [
-         "1b3ca7a9db8d015fe65f28881c4faeb23abab29b",
+         "9b0fcffc7312f2f73e70aa78fe5527f2de05eeb8",
          [
           null,
           [
@@ -239677,7 +239597,7 @@
          ]
         ],
         "variable-declaration-16.html": [
-         "41f2b77e294f3f40af718960bdd24125a40c79ed",
+         "bb047bb53d6830ab6091a60793d3ed236a2f4d5f",
          [
           null,
           [
@@ -239690,7 +239610,7 @@
          ]
         ],
         "variable-declaration-17.html": [
-         "2e0f0049ec3c44cc87604c7bfad949996ee807d3",
+         "f0e3c9c79b34a9741ec295e2f45ac3a0cc86212e",
          [
           null,
           [
@@ -239703,7 +239623,7 @@
          ]
         ],
         "variable-declaration-18.html": [
-         "8b2880f0944f99457cfc23fcbee21dfadb9ee8e7",
+         "7262e375e61b77daf4e0d47050cc6eb093751e87",
          [
           null,
           [
@@ -240301,7 +240221,7 @@
          ]
         ],
         "variable-font-face-01.html": [
-         "cbb7a4f4e6d81fb5a6c78b857fc5c5e2db11b02e",
+         "168d970075d5b769c5fa97dbf1dfd1500c30c5f4",
          [
           null,
           [
@@ -240314,7 +240234,7 @@
          ]
         ],
         "variable-font-face-02.html": [
-         "6cb5a1eb1d3d9404494f7e47744daa92b573d8f8",
+         "8b29d8d63a08371999f82437adf30f28516c335d",
          [
           null,
           [
@@ -282781,7 +282701,7 @@
       []
      ],
      "cors-makeheader.py": [
-      "a860f6fcdea55ef52509095030dbac9024f47cdb",
+      "e0576a003dfb918c45d8ae2afa80c98a64287387",
       []
      ],
      "expose-headers.py": [
@@ -296370,11 +296290,11 @@
        []
       ],
       "border-collapse-offset-001-ref.xht": [
-       "7c8e252de3992748809c7dafbe04c69d8bc7451d",
+       "245d49c10b77ba0cdc69cf6115e58872318b995f",
        []
       ],
       "border-collapse-offset-002-ref.xht": [
-       "c0c95d7bb4ec4b98f3214185e1f7b776adb2e3e8",
+       "c2658c7a1cbc3d5c0fe04f4011c44349d9ab70d1",
        []
       ],
       "border-conflict-element-001d-ref.xht": [
@@ -304140,14 +304060,634 @@
       "02f0eb35752e805aa2bc0bd339f73ff2b197c99e",
       []
      ],
+     "flexbox-abspos-child-001-ref.html": [
+      "95c1f3341d048664792cfaad92be4ae2c3971dd7",
+      []
+     ],
+     "flexbox-abspos-child-002-ref.html": [
+      "876e5d6c2cbd282bd0e35dac0433a2413180f620",
+      []
+     ],
+     "flexbox-align-items-center-nested-001-ref.html": [
+      "2473417b82b333e93baf1889f0fb229211591e2f",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-001-ref.xhtml": [
+      "e5efb756093f8d26d445cc957ce7b2e4da8dd277",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-002-ref.xhtml": [
+      "7cfded59991cd7da9d09bee267d4954202dc8712",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-003-ref.xhtml": [
+      "6e941360fb1e62075baa6c3058362c126dd2d6ab",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-004-ref.xhtml": [
+      "73a31237552c988af781b2c4154296c25a8a53e8",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-005-ref.xhtml": [
+      "e8b2791f44d4ae3de515e4e74a9d4d53f73c3699",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-006-ref.xhtml": [
+      "50036ff6d271ca2db4ef779ebf4429907a8aec2e",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-007-ref.xhtml": [
+      "37520d66c5256f489ca516c8ffb256729d97a2bf",
+      []
+     ],
+     "flexbox-align-self-baseline-horiz-008-ref.xhtml": [
+      "19049d3895c7611c665161058f1c31b5e5414a04",
+      []
+     ],
+     "flexbox-align-self-horiz-001-ref.xhtml": [
+      "a95a724811d0bfedeff62a4d387775ac3683da08",
+      []
+     ],
+     "flexbox-align-self-horiz-002-ref.xhtml": [
+      "bc73fa7f926715b7b813e67bf0558ba041461112",
+      []
+     ],
+     "flexbox-align-self-horiz-003-ref.xhtml": [
+      "229087cb875ccd78d128fb0432fbbf64386ead45",
+      []
+     ],
+     "flexbox-align-self-horiz-004-ref.xhtml": [
+      "5143e07c489373eafc3957da4b46d94a03effb30",
+      []
+     ],
+     "flexbox-align-self-horiz-005-ref.xhtml": [
+      "48c215ad6ceb1c903e4dfe935767436de87ce4d2",
+      []
+     ],
+     "flexbox-align-self-stretch-vert-001-ref.html": [
+      "3ffa8647bb2676146cee6377cc6a9220f751f051",
+      []
+     ],
+     "flexbox-align-self-stretch-vert-002-ref.html": [
+      "4e02cd8b10d376be8d895921da851e57f8b6a175",
+      []
+     ],
+     "flexbox-align-self-vert-001-ref.xhtml": [
+      "2288c21ace97e032b7274643cfa5ecf126f6a80a",
+      []
+     ],
+     "flexbox-align-self-vert-002-ref.xhtml": [
+      "14b456e67128e5ffbbaf5d570016ad4670f45871",
+      []
+     ],
+     "flexbox-align-self-vert-003-ref.xhtml": [
+      "4412b3931972988975a3f185a0d0b296abe3821b",
+      []
+     ],
+     "flexbox-align-self-vert-004-ref.xhtml": [
+      "b63c2c7fbcb27b4b64b111498ecdd5c6db8e6cae",
+      []
+     ],
+     "flexbox-align-self-vert-rtl-001-ref.xhtml": [
+      "5c2f62abebac7efb66369e4464a53b288f2a1d8c",
+      []
+     ],
+     "flexbox-align-self-vert-rtl-002-ref.xhtml": [
+      "16cd5611c8c80e11984024a61d1133c7039233dd",
+      []
+     ],
+     "flexbox-align-self-vert-rtl-003-ref.xhtml": [
+      "5be37085af697afb5c53eba4e450050c02fa94ae",
+      []
+     ],
+     "flexbox-align-self-vert-rtl-004-ref.xhtml": [
+      "faeb28662f71d7c8fe05d075aa7581acaf286c8c",
+      []
+     ],
+     "flexbox-align-self-vert-rtl-005-ref.xhtml": [
+      "b0c46adcb9d786cc5d7fb1455aea7c6e9dcc7d77",
+      []
+     ],
+     "flexbox-anonymous-items-001-ref.html": [
+      "8f99ea1d56ae19136b91c460003ebdab1bd821b6",
+      []
+     ],
+     "flexbox-baseline-align-self-baseline-horiz-001-ref.html": [
+      "84e231512e3afcba20f68f6f688ea19224dce18b",
+      []
+     ],
+     "flexbox-baseline-align-self-baseline-vert-001-ref.html": [
+      "f200983b7ab17021bcd5ea3aaaaf2444e6197fd1",
+      []
+     ],
+     "flexbox-baseline-empty-001-ref.html": [
+      "21139d36461848c9ced103a162fcde1428641dc0",
+      []
+     ],
+     "flexbox-baseline-multi-item-horiz-001-ref.html": [
+      "e6f570ed2074a78bd37f3e029a0a7ae746a7d9fc",
+      []
+     ],
+     "flexbox-baseline-multi-item-vert-001-ref.html": [
+      "1cd4fa95c7cc0ca48f0e06d6afb0561ebac977ba",
+      []
+     ],
+     "flexbox-baseline-multi-line-horiz-001-ref.html": [
+      "66513652a60352ceafd5738a0b41fa6f506c66dd",
+      []
+     ],
+     "flexbox-baseline-multi-line-horiz-002-ref.html": [
+      "361f0965b29b616bf2fb0510c1ea9e112dd8321a",
+      []
+     ],
+     "flexbox-baseline-multi-line-horiz-003-ref.html": [
+      "ef9e8051ddaceb4d6b5ef08744dae421566dc523",
+      []
+     ],
+     "flexbox-baseline-multi-line-horiz-004-ref.html": [
+      "212b3b1e979ddd72a6aac9b22560495d1d12c68d",
+      []
+     ],
+     "flexbox-baseline-multi-line-vert-001-ref.html": [
+      "ce47baa87d52cb883b16a46e886ae7a0abc959e7",
+      []
+     ],
+     "flexbox-baseline-multi-line-vert-002-ref.html": [
+      "f66096644b17694c7f423013357eea049a666edd",
+      []
+     ],
+     "flexbox-baseline-single-item-001-ref.html": [
+      "afca911546d842818e6ef3d2e0a68359232ac781",
+      []
+     ],
+     "flexbox-basic-block-horiz-001-ref.xhtml": [
+      "9076e10816009918539b00c4fefa796e50cb6869",
+      []
+     ],
+     "flexbox-basic-block-vert-001-ref.xhtml": [
+      "c8a6ae4d338352f163289cca50267ff046744fd7",
+      []
+     ],
+     "flexbox-basic-canvas-horiz-001-ref.xhtml": [
+      "274ac15fcd348463db10863f9d04b0b746edd091",
+      []
+     ],
+     "flexbox-basic-canvas-vert-001-ref.xhtml": [
+      "232ae9e7674c55b1bc7de6a4f972a7f23000e4ca",
+      []
+     ],
+     "flexbox-basic-fieldset-horiz-001-ref.xhtml": [
+      "edb4a42f2e342dba684eba6e1657f62d80e27414",
+      []
+     ],
+     "flexbox-basic-fieldset-vert-001-ref.xhtml": [
+      "41b1930197f49c99e09c0a492604e78c1d097c0c",
+      []
+     ],
+     "flexbox-basic-iframe-horiz-001-ref.xhtml": [
+      "bee1ae0bf31fc858a8c43985acbafa87af1d8271",
+      []
+     ],
+     "flexbox-basic-iframe-vert-001-ref.xhtml": [
+      "7737008f18d2e827f1579f59e786fc8b32f83507",
+      []
+     ],
+     "flexbox-basic-img-horiz-001-ref.xhtml": [
+      "a6cd54312466eb4c7c6621a9f198e7383b4c40f8",
+      []
+     ],
+     "flexbox-basic-img-vert-001-ref.xhtml": [
+      "09c7fc87fbc6d6201455c569ec5e4da2cfd97c18",
+      []
+     ],
+     "flexbox-basic-textarea-horiz-001-ref.xhtml": [
+      "7ea5a05d8c0f9f90bd75f2057dabd4b7483a85dc",
+      []
+     ],
+     "flexbox-basic-textarea-vert-001-ref.xhtml": [
+      "dbef1eac5480fd07691d649a02ca6105e231fc91",
+      []
+     ],
+     "flexbox-basic-video-horiz-001-ref.xhtml": [
+      "e37920f17c092d85aaabbc0dcee293620f953d0f",
+      []
+     ],
+     "flexbox-basic-video-vert-001-ref.xhtml": [
+      "552d14e4c761a73f374f92f5d863c2e7e5705ea7",
+      []
+     ],
+     "flexbox-break-request-horiz-001-ref.html": [
+      "642c1e3d1c996e66957e6a37fe8a137cec2bcdb4",
+      []
+     ],
+     "flexbox-break-request-horiz-002-ref.html": [
+      "28943c5085c1b39279b56dfc1312bc6ff4a0a3d9",
+      []
+     ],
+     "flexbox-break-request-vert-001-ref.html": [
+      "a9a286770bc8d5bfe054a84797af0eb5d8be45b9",
+      []
+     ],
+     "flexbox-break-request-vert-002-ref.html": [
+      "eeb8a4ea72da08cdc5bcefa77b7912f4da17d9bb",
+      []
+     ],
+     "flexbox-collapsed-item-baseline-001-ref.html": [
+      "2aa1d74bfdba369783f5995051405bf4cabd08b2",
+      []
+     ],
+     "flexbox-collapsed-item-horiz-001-ref.html": [
+      "90131878421d0cea156226866bff2974342eb708",
+      []
+     ],
+     "flexbox-collapsed-item-horiz-002-ref.html": [
+      "a9040e306c8cf0b3d809fa0c3da743ecb2c6e006",
+      []
+     ],
+     "flexbox-collapsed-item-horiz-003-ref.html": [
+      "c8242106ba143269630ab10b69351ca95442f5b7",
+      []
+     ],
+     "flexbox-column-row-gap-001-ref.html": [
+      "0606afe53987d562897aa13f057daa294acdbdc8",
+      []
+     ],
+     "flexbox-column-row-gap-002-ref.html": [
+      "e23ddfe26151f407b10bba1abb7914933b1a3ba8",
+      []
+     ],
+     "flexbox-column-row-gap-003-ref.html": [
+      "6e7f220b4470f400b458aa73e49a7213790d2315",
+      []
+     ],
+     "flexbox-column-row-gap-004-ref.html": [
+      "0b40fb2d6267157f391a8a020af3868fd5d783a2",
+      []
+     ],
+     "flexbox-definite-sizes-001-ref.html": [
+      "ed0cc575f56bf8e7c9db37ee8a5355fe432236a4",
+      []
+     ],
+     "flexbox-definite-sizes-005-ref.html": [
+      "fca146671cfb80cd3ae0264a8466be0b9823b3ae",
+      []
+     ],
+     "flexbox-dyn-resize-001-ref.html": [
+      "5e5561cadf2ddbd6dfd2c7b4819f146f61be006b",
+      []
+     ],
+     "flexbox-flex-basis-content-001-ref.html": [
+      "3ed3687cf0e706aeceba8682ad05a1360ad86244",
+      []
+     ],
+     "flexbox-flex-basis-content-002-ref.html": [
+      "35b4b783a1a4c77d48082e0428e7bc22e94901ea",
+      []
+     ],
+     "flexbox-flex-basis-content-003-ref.html": [
+      "63ce9d74292c7a9699894783ae2e66fe412a33b6",
+      []
+     ],
+     "flexbox-flex-basis-content-004-ref.html": [
+      "7da4de7a5aff52bc8ce4b13909f24a9ad5d7117d",
+      []
+     ],
+     "flexbox-flex-flow-001-ref.html": [
+      "f46e11b39af20ec8bbe2688dde5b6ec66f7828ce",
+      []
+     ],
+     "flexbox-flex-flow-002-ref.html": [
+      "a325959a23eca85e375fe0691b7a9d18fd3057c0",
+      []
+     ],
      "flexbox-flex-wrap-flexing-ref.html": [
       "924297d051c375f44e95dacc1ab2f54848882b40",
       []
      ],
+     "flexbox-flex-wrap-horiz-001-ref.html": [
+      "bb76cafff144e012dc97a270835339d6ce29b5fa",
+      []
+     ],
+     "flexbox-flex-wrap-horiz-002-ref.html": [
+      "88c3beb19e90a3731a7da8aed3ef7170ea3fca07",
+      []
+     ],
+     "flexbox-flex-wrap-vert-001-ref.html": [
+      "67f2c75da282128c8026a7072e2730cc15bd7b03",
+      []
+     ],
+     "flexbox-flex-wrap-vert-002-ref.html": [
+      "f9a4553ccbee361f31491dc91989d341ad9ac1d3",
+      []
+     ],
      "flexbox-gap-position-absolute-ref.html": [
       "7cea1fb1ddb24e046845732f627f0459c2cbfc4a",
       []
      ],
+     "flexbox-items-as-stacking-contexts-001-ref.xhtml": [
+      "7e02b799f0f75b5d238ecc3c7bbaf87a53572e88",
+      []
+     ],
+     "flexbox-items-as-stacking-contexts-002-ref.html": [
+      "a67a31936d9a09176e7e74115fd2d273734ad032",
+      []
+     ],
+     "flexbox-items-as-stacking-contexts-003-ref.html": [
+      "814f06cca118885757e02d8d12c9b4d1df642dd9",
+      []
+     ],
+     "flexbox-justify-content-horiz-001-ref.xhtml": [
+      "e3f0276fda17436b653e236b359f5837c9257b40",
+      []
+     ],
+     "flexbox-justify-content-horiz-002-ref.xhtml": [
+      "0e43e6ff880f9dba20c6cca74eaf5e4a51458496",
+      []
+     ],
+     "flexbox-justify-content-horiz-003-ref.xhtml": [
+      "4ad2dc202ea3c1800fb189315b691c8ada9aaadd",
+      []
+     ],
+     "flexbox-justify-content-horiz-004-ref.xhtml": [
+      "231729d8565fe7c232c0506a9d161031428c63b7",
+      []
+     ],
+     "flexbox-justify-content-horiz-005-ref.xhtml": [
+      "82f872d2918c4701854ac366cf6a850a2440ea7c",
+      []
+     ],
+     "flexbox-justify-content-horiz-006-ref.xhtml": [
+      "7723b5fa2080af80c15890c7e0b73b16ae25c7fa",
+      []
+     ],
+     "flexbox-justify-content-vert-001-ref.xhtml": [
+      "20f1c5df34e257358ad8c5ace97ee5b0fafb8864",
+      []
+     ],
+     "flexbox-justify-content-vert-002-ref.xhtml": [
+      "d0ca310120185f630170218f97bb70ead05d837e",
+      []
+     ],
+     "flexbox-justify-content-vert-003-ref.xhtml": [
+      "12064db1a5df2dbe82b214d8bc92ee78dcd0b350",
+      []
+     ],
+     "flexbox-justify-content-vert-004-ref.xhtml": [
+      "b3a45e06f13fdfee0672197b49db244e90cf73d2",
+      []
+     ],
+     "flexbox-justify-content-vert-005-ref.xhtml": [
+      "ebc97819a5002c97d1bc57e895755176c114732f",
+      []
+     ],
+     "flexbox-justify-content-vert-006-ref.xhtml": [
+      "b1a5bf2a9894bd421759a3abdb21fe9181a3672d",
+      []
+     ],
+     "flexbox-justify-content-wmvert-001-ref.xhtml": [
+      "0b99be2f2538d1cafbaeec4485a9c7dcd4f0cfde",
+      []
+     ],
+     "flexbox-margin-auto-horiz-001-ref.xhtml": [
+      "1321e5a3878b353f54db7459517539dd9b779ab2",
+      []
+     ],
+     "flexbox-margin-auto-horiz-002-ref.xhtml": [
+      "b310ab97cc36a9c717215eb9b68117fe8b892748",
+      []
+     ],
+     "flexbox-mbp-horiz-001-ref.xhtml": [
+      "d30386618e7bb3df6172e1d94cc0e8e3e479eef6",
+      []
+     ],
+     "flexbox-mbp-horiz-001-reverse-ref.xhtml": [
+      "ca4ef80ba34ae0f211a43546c2e332c6af76b495",
+      []
+     ],
+     "flexbox-mbp-horiz-002-ref.xhtml": [
+      "6203a40a0078f6d2af8ac0ead51c75b454722844",
+      []
+     ],
+     "flexbox-mbp-horiz-003-ref.xhtml": [
+      "a91d72b9f5ddc32fbac728726605a0af8cf09701",
+      []
+     ],
+     "flexbox-mbp-horiz-003-reverse-ref.xhtml": [
+      "7929c8907027b3558e3c953eeeac2bf33d8cb611",
+      []
+     ],
+     "flexbox-mbp-horiz-004-ref.xhtml": [
+      "245e6f9e3c9314a0af9a2d34afabbd42c52940fc",
+      []
+     ],
+     "flexbox-min-height-auto-001-ref.html": [
+      "146a6ad6bc9e5698371d061c2cb2eb65e97b31ab",
+      []
+     ],
+     "flexbox-min-height-auto-002-ref.html": [
+      "ca1aad42aa0eb710266fc5f0f62f31511c31511f",
+      []
+     ],
+     "flexbox-min-height-auto-003-ref.html": [
+      "ff1ced0c03517681c46f05f74aa93283f3587a9e",
+      []
+     ],
+     "flexbox-min-height-auto-004-ref.html": [
+      "768185d43194279b5648092715a1846fdfb917a5",
+      []
+     ],
+     "flexbox-min-width-auto-001-ref.html": [
+      "946db39cf1e17fa3be729f319cfd28738ceafef1",
+      []
+     ],
+     "flexbox-min-width-auto-002-ref.html": [
+      "21beb3f934ff6ce1f4153d564c5982a110a92b41",
+      []
+     ],
+     "flexbox-min-width-auto-003-ref.html": [
+      "09066eef7480923a3eb57d942424c55b0ca6f6c4",
+      []
+     ],
+     "flexbox-min-width-auto-004-ref.html": [
+      "64501367ac3109817820a0361a58cc7470975b31",
+      []
+     ],
+     "flexbox-overflow-horiz-001-ref.html": [
+      "82af03233541c92851d189b1a4173aaadc9bda1e",
+      []
+     ],
+     "flexbox-overflow-horiz-002-ref.html": [
+      "16cc9f4fa4ee758bd6373d72472997ee18a6f9a1",
+      []
+     ],
+     "flexbox-overflow-horiz-003-ref.html": [
+      "5693c9328e4d38a1df9c87ea0860f7112c684f3f",
+      []
+     ],
+     "flexbox-overflow-horiz-004-ref.html": [
+      "f9ae88ce4849283208f144c5a7cf0702ea2633de",
+      []
+     ],
+     "flexbox-overflow-horiz-005-ref.html": [
+      "589712c6ac7985978b47144f3fe3d2772749335b",
+      []
+     ],
+     "flexbox-overflow-vert-001-ref.html": [
+      "3dfddb7bbc85f6500d57123d7cb38a926ae205d3",
+      []
+     ],
+     "flexbox-overflow-vert-002-ref.html": [
+      "cf95a6b7bc27de6c723912e1abc9de5f8dc98422",
+      []
+     ],
+     "flexbox-overflow-vert-003-ref.html": [
+      "84bf022276ab0ed6e2248e7074caa242171d7677",
+      []
+     ],
+     "flexbox-overflow-vert-004-ref.html": [
+      "154fca8cc5d8c216f536228c347af69fddd2733d",
+      []
+     ],
+     "flexbox-overflow-vert-005-ref.html": [
+      "56022a478da97480e3c8bcea4b5b7a6b0b690bcc",
+      []
+     ],
+     "flexbox-paint-ordering-001-ref.xhtml": [
+      "635b0b29c0f233045fcafaf10d78d992fa43ebf2",
+      []
+     ],
+     "flexbox-paint-ordering-002-ref.xhtml": [
+      "55ca62df74adb2962542a84c7f78ed9b08c439ca",
+      []
+     ],
+     "flexbox-paint-ordering-003-ref.html": [
+      "5eadc304189c7e7b6b4e35a6826992a04348b94e",
+      []
+     ],
+     "flexbox-root-node-001-ref.html": [
+      "6a72f7618bad99ca4792b8a05c1120b5ee1632d8",
+      []
+     ],
+     "flexbox-safe-overflow-position-001-ref.html": [
+      "b921f35ca3b8cdfd2c86c512b8b76b9a9c6d0ab8",
+      []
+     ],
+     "flexbox-single-line-clamp-1-ref.html": [
+      "602c027f7012af33f9dfc9ceaca821205fe1094a",
+      []
+     ],
+     "flexbox-single-line-clamp-2-ref.html": [
+      "fda5fa7ccc507a15e6bfe7801704f00d2b725115",
+      []
+     ],
+     "flexbox-single-line-clamp-3-ref.html": [
+      "02f7eaa96a416427c503158e787589ed196da3cc",
+      []
+     ],
+     "flexbox-sizing-horiz-001-ref.xhtml": [
+      "54bafd034eb81452ab1a378a26d7b61488cc550b",
+      []
+     ],
+     "flexbox-sizing-horiz-002-ref.xhtml": [
+      "29aa55a624d9be8ce0caf2c1c88c01b9b110e7dd",
+      []
+     ],
+     "flexbox-sizing-vert-001-ref.xhtml": [
+      "00c8dbaa4021812e2534418d752f2ebffa7e8c4e",
+      []
+     ],
+     "flexbox-sizing-vert-002-ref.xhtml": [
+      "4a4cc5891b3e0aa7f3aee3211239ea7a005ba57e",
+      []
+     ],
+     "flexbox-table-fixup-001-ref.xhtml": [
+      "4611521543a712d0385f89554712d9b9978562ae",
+      []
+     ],
+     "flexbox-whitespace-handling-001-ref.xhtml": [
+      "236e3ee3bb9f2e2c2c4f6631bb730fca9f7e929a",
+      []
+     ],
+     "flexbox-whitespace-handling-002-ref.xhtml": [
+      "eeeebb482d39bd800efebe32292275eea82fe2fd",
+      []
+     ],
+     "flexbox-with-pseudo-elements-001-ref.html": [
+      "98d23cc8de2108606b24e9ddfc3de5b3a3ff5c8c",
+      []
+     ],
+     "flexbox-with-pseudo-elements-002-ref.html": [
+      "48d17019b6dee0a44511f06582c839ab69479236",
+      []
+     ],
+     "flexbox-with-pseudo-elements-003-ref.html": [
+      "bdb973023aed9fc02176521062c9eff7ec94bc68",
+      []
+     ],
+     "flexbox-writing-mode-001-ref.html": [
+      "e2d59662a7bc8a1eefa114ecd4bf348ca4624153",
+      []
+     ],
+     "flexbox-writing-mode-002-ref.html": [
+      "4c3166171b36ad1c770007bb0211b49329592beb",
+      []
+     ],
+     "flexbox-writing-mode-003-ref.html": [
+      "2d89eea66bb9ffb85e596031d7d2f0a44d9883b8",
+      []
+     ],
+     "flexbox-writing-mode-004-ref.html": [
+      "1176830b56e74b133d0bcc85c3000d04f04dbfaa",
+      []
+     ],
+     "flexbox-writing-mode-005-ref.html": [
+      "a0894911bd8131c26758c71008d310c1ce52452a",
+      []
+     ],
+     "flexbox-writing-mode-006-ref.html": [
+      "8c045354bc687d566d85efd2236ac8efafec787c",
+      []
+     ],
+     "flexbox-writing-mode-007-ref.html": [
+      "0d2e9207beeaa4c7931f82213d233df700d6360c",
+      []
+     ],
+     "flexbox-writing-mode-008-ref.html": [
+      "8a21dd65f331d9b767111d496d72e4f6562c0d8d",
+      []
+     ],
+     "flexbox-writing-mode-009-ref.html": [
+      "5a96eb9998106821b9cac791058868399652243c",
+      []
+     ],
+     "flexbox-writing-mode-010-ref.html": [
+      "d30d71e4d2c9d4269837089120cee1b8f3472d3d",
+      []
+     ],
+     "flexbox-writing-mode-011-ref.html": [
+      "0f97d42ce5a08cc0e3c6769a746989c12b232d3a",
+      []
+     ],
+     "flexbox-writing-mode-012-ref.html": [
+      "7d6ca8e5654a302666781e487729efa9f3cb9a1c",
+      []
+     ],
+     "flexbox-writing-mode-013-ref.html": [
+      "d57e801aec1cbdd51a0f2d322fc690c16da438bd",
+      []
+     ],
+     "flexbox-writing-mode-014-ref.html": [
+      "d57910ee61695e9876c1e9a6e167d83d2fca544a",
+      []
+     ],
+     "flexbox-writing-mode-015-ref.html": [
+      "c8df3cbb878a3c5cd56fa3e4f65890b8e75a1b12",
+      []
+     ],
+     "flexbox-writing-mode-016-ref.html": [
+      "c3a223389d0455b2fe71d74837e5ff6121567432",
+      []
+     ],
      "flexbox_absolute-atomic-ref.html": [
       "310ea204b32da7b43b8fda0526ae7b037b3c53ce",
       []
@@ -304918,6 +305458,14 @@
       "2f7e669c72fc263d4b39d7a198d8abafbf54b463",
       []
      ],
+     "position-absolute-containing-block-001-ref.html": [
+      "5f8bcaf539f7004b226ab625d4357e4c831d6ac7",
+      []
+     ],
+     "position-absolute-containing-block-002-ref.html": [
+      "90ee38856cccd568352c5b6a4f14acc2274605c6",
+      []
+     ],
      "position-absolute-scrollbar-freeze-ref.html": [
       "d0bf617951f3a9b5e3ae8e4b77e6ff3762b3cde1",
       []
@@ -330905,672 +331453,10 @@
         ]
        },
        "flexbox": {
-        "flexbox-abspos-child-001-ref.html": [
-         "95c1f3341d048664792cfaad92be4ae2c3971dd7",
-         []
-        ],
-        "flexbox-abspos-child-002-ref.html": [
-         "876e5d6c2cbd282bd0e35dac0433a2413180f620",
-         []
-        ],
-        "flexbox-align-content-horiz-001-ref.xhtml": [
-         "517b7f465ddc9059053b84219b57247afc22b4b7",
-         []
-        ],
-        "flexbox-align-content-horiz-002-ref.xhtml": [
-         "f0d286494e428fcc6afbe642da0ea6fd0ae1ccc8",
-         []
-        ],
-        "flexbox-align-content-vert-001-ref.xhtml": [
-         "ef2a0685f25d84ed8cc1f9272a3c59b3ccb3470b",
-         []
-        ],
-        "flexbox-align-content-vert-002-ref.xhtml": [
-         "b514d840489dcc027be492ffd5081fe0a124b8e4",
-         []
-        ],
-        "flexbox-align-content-wmvert-001-ref.xhtml": [
-         "2902a09c163759bd604b53e0b04a0be8f3bdb8c6",
-         []
-        ],
-        "flexbox-align-items-center-nested-001-ref.html": [
-         "2473417b82b333e93baf1889f0fb229211591e2f",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-001-ref.xhtml": [
-         "e5efb756093f8d26d445cc957ce7b2e4da8dd277",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-002-ref.xhtml": [
-         "7cfded59991cd7da9d09bee267d4954202dc8712",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-003-ref.xhtml": [
-         "6e941360fb1e62075baa6c3058362c126dd2d6ab",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-004-ref.xhtml": [
-         "73a31237552c988af781b2c4154296c25a8a53e8",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-005-ref.xhtml": [
-         "e8b2791f44d4ae3de515e4e74a9d4d53f73c3699",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-006-ref.xhtml": [
-         "50036ff6d271ca2db4ef779ebf4429907a8aec2e",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-007-ref.xhtml": [
-         "37520d66c5256f489ca516c8ffb256729d97a2bf",
-         []
-        ],
-        "flexbox-align-self-baseline-horiz-008-ref.xhtml": [
-         "19049d3895c7611c665161058f1c31b5e5414a04",
-         []
-        ],
-        "flexbox-align-self-horiz-001-ref.xhtml": [
-         "a95a724811d0bfedeff62a4d387775ac3683da08",
-         []
-        ],
-        "flexbox-align-self-horiz-002-ref.xhtml": [
-         "bc73fa7f926715b7b813e67bf0558ba041461112",
-         []
-        ],
-        "flexbox-align-self-horiz-003-ref.xhtml": [
-         "229087cb875ccd78d128fb0432fbbf64386ead45",
-         []
-        ],
-        "flexbox-align-self-horiz-004-ref.xhtml": [
-         "5143e07c489373eafc3957da4b46d94a03effb30",
-         []
-        ],
-        "flexbox-align-self-horiz-005-ref.xhtml": [
-         "48c215ad6ceb1c903e4dfe935767436de87ce4d2",
-         []
-        ],
-        "flexbox-align-self-stretch-vert-001-ref.html": [
-         "3ffa8647bb2676146cee6377cc6a9220f751f051",
-         []
-        ],
-        "flexbox-align-self-stretch-vert-002-ref.html": [
-         "4e02cd8b10d376be8d895921da851e57f8b6a175",
-         []
-        ],
-        "flexbox-align-self-vert-001-ref.xhtml": [
-         "2288c21ace97e032b7274643cfa5ecf126f6a80a",
-         []
-        ],
-        "flexbox-align-self-vert-002-ref.xhtml": [
-         "14b456e67128e5ffbbaf5d570016ad4670f45871",
-         []
-        ],
-        "flexbox-align-self-vert-003-ref.xhtml": [
-         "4412b3931972988975a3f185a0d0b296abe3821b",
-         []
-        ],
-        "flexbox-align-self-vert-004-ref.xhtml": [
-         "b63c2c7fbcb27b4b64b111498ecdd5c6db8e6cae",
-         []
-        ],
-        "flexbox-align-self-vert-rtl-001-ref.xhtml": [
-         "5c2f62abebac7efb66369e4464a53b288f2a1d8c",
-         []
-        ],
-        "flexbox-align-self-vert-rtl-002-ref.xhtml": [
-         "16cd5611c8c80e11984024a61d1133c7039233dd",
-         []
-        ],
-        "flexbox-align-self-vert-rtl-003-ref.xhtml": [
-         "5be37085af697afb5c53eba4e450050c02fa94ae",
-         []
-        ],
-        "flexbox-align-self-vert-rtl-004-ref.xhtml": [
-         "faeb28662f71d7c8fe05d075aa7581acaf286c8c",
-         []
-        ],
-        "flexbox-align-self-vert-rtl-005-ref.xhtml": [
-         "b0c46adcb9d786cc5d7fb1455aea7c6e9dcc7d77",
-         []
-        ],
-        "flexbox-anonymous-items-001-ref.html": [
-         "8f99ea1d56ae19136b91c460003ebdab1bd821b6",
-         []
-        ],
-        "flexbox-baseline-align-self-baseline-horiz-001-ref.html": [
-         "84e231512e3afcba20f68f6f688ea19224dce18b",
-         []
-        ],
-        "flexbox-baseline-align-self-baseline-vert-001-ref.html": [
-         "5419833c5c3a946e10128c9edcf99c00148fdbf4",
-         []
-        ],
-        "flexbox-baseline-empty-001-ref.html": [
-         "8642391fa8dd041af53caff179fb64f2c99f43d5",
-         []
-        ],
-        "flexbox-baseline-multi-item-horiz-001-ref.html": [
-         "e6f570ed2074a78bd37f3e029a0a7ae746a7d9fc",
-         []
-        ],
-        "flexbox-baseline-multi-item-vert-001-ref.html": [
-         "04e916ce777bca4d0ea715cd235275e7ca67b24c",
-         []
-        ],
-        "flexbox-baseline-multi-line-horiz-001-ref.html": [
-         "66513652a60352ceafd5738a0b41fa6f506c66dd",
-         []
-        ],
-        "flexbox-baseline-multi-line-horiz-002-ref.html": [
-         "361f0965b29b616bf2fb0510c1ea9e112dd8321a",
-         []
-        ],
-        "flexbox-baseline-multi-line-horiz-003-ref.html": [
-         "ef9e8051ddaceb4d6b5ef08744dae421566dc523",
-         []
-        ],
-        "flexbox-baseline-multi-line-horiz-004-ref.html": [
-         "212b3b1e979ddd72a6aac9b22560495d1d12c68d",
-         []
-        ],
-        "flexbox-baseline-multi-line-vert-001-ref.html": [
-         "ce47baa87d52cb883b16a46e886ae7a0abc959e7",
-         []
-        ],
-        "flexbox-baseline-multi-line-vert-002-ref.html": [
-         "f66096644b17694c7f423013357eea049a666edd",
-         []
-        ],
-        "flexbox-baseline-single-item-001-ref.html": [
-         "afca911546d842818e6ef3d2e0a68359232ac781",
-         []
-        ],
-        "flexbox-basic-block-horiz-001-ref.xhtml": [
-         "9076e10816009918539b00c4fefa796e50cb6869",
-         []
-        ],
-        "flexbox-basic-block-vert-001-ref.xhtml": [
-         "c8a6ae4d338352f163289cca50267ff046744fd7",
-         []
-        ],
-        "flexbox-basic-canvas-horiz-001-ref.xhtml": [
-         "274ac15fcd348463db10863f9d04b0b746edd091",
-         []
-        ],
-        "flexbox-basic-canvas-vert-001-ref.xhtml": [
-         "232ae9e7674c55b1bc7de6a4f972a7f23000e4ca",
-         []
-        ],
-        "flexbox-basic-fieldset-horiz-001-ref.xhtml": [
-         "edb4a42f2e342dba684eba6e1657f62d80e27414",
-         []
-        ],
-        "flexbox-basic-fieldset-vert-001-ref.xhtml": [
-         "41b1930197f49c99e09c0a492604e78c1d097c0c",
-         []
-        ],
-        "flexbox-basic-iframe-horiz-001-ref.xhtml": [
-         "bee1ae0bf31fc858a8c43985acbafa87af1d8271",
-         []
-        ],
-        "flexbox-basic-iframe-vert-001-ref.xhtml": [
-         "7737008f18d2e827f1579f59e786fc8b32f83507",
-         []
-        ],
-        "flexbox-basic-img-horiz-001-ref.xhtml": [
-         "a6cd54312466eb4c7c6621a9f198e7383b4c40f8",
-         []
-        ],
-        "flexbox-basic-img-vert-001-ref.xhtml": [
-         "09c7fc87fbc6d6201455c569ec5e4da2cfd97c18",
-         []
-        ],
-        "flexbox-basic-textarea-horiz-001-ref.xhtml": [
-         "7ea5a05d8c0f9f90bd75f2057dabd4b7483a85dc",
-         []
-        ],
-        "flexbox-basic-textarea-vert-001-ref.xhtml": [
-         "dbef1eac5480fd07691d649a02ca6105e231fc91",
-         []
-        ],
-        "flexbox-basic-video-horiz-001-ref.xhtml": [
-         "e37920f17c092d85aaabbc0dcee293620f953d0f",
-         []
-        ],
-        "flexbox-basic-video-vert-001-ref.xhtml": [
-         "552d14e4c761a73f374f92f5d863c2e7e5705ea7",
-         []
-        ],
-        "flexbox-break-request-horiz-001-ref.html": [
-         "642c1e3d1c996e66957e6a37fe8a137cec2bcdb4",
-         []
-        ],
-        "flexbox-break-request-horiz-002-ref.html": [
-         "28943c5085c1b39279b56dfc1312bc6ff4a0a3d9",
-         []
-        ],
-        "flexbox-break-request-vert-001-ref.html": [
-         "a9a286770bc8d5bfe054a84797af0eb5d8be45b9",
-         []
-        ],
-        "flexbox-break-request-vert-002-ref.html": [
-         "eeb8a4ea72da08cdc5bcefa77b7912f4da17d9bb",
-         []
-        ],
-        "flexbox-collapsed-item-baseline-001-ref.html": [
-         "2aa1d74bfdba369783f5995051405bf4cabd08b2",
-         []
-        ],
-        "flexbox-collapsed-item-horiz-001-ref.html": [
-         "90131878421d0cea156226866bff2974342eb708",
-         []
-        ],
-        "flexbox-collapsed-item-horiz-002-ref.html": [
-         "a9040e306c8cf0b3d809fa0c3da743ecb2c6e006",
-         []
-        ],
-        "flexbox-collapsed-item-horiz-003-ref.html": [
-         "c8242106ba143269630ab10b69351ca95442f5b7",
-         []
-        ],
-        "flexbox-column-row-gap-001-ref.html": [
-         "0606afe53987d562897aa13f057daa294acdbdc8",
-         []
-        ],
-        "flexbox-column-row-gap-002-ref.html": [
-         "e23ddfe26151f407b10bba1abb7914933b1a3ba8",
-         []
-        ],
-        "flexbox-column-row-gap-003-ref.html": [
-         "6e7f220b4470f400b458aa73e49a7213790d2315",
-         []
-        ],
-        "flexbox-column-row-gap-004-ref.html": [
-         "0b40fb2d6267157f391a8a020af3868fd5d783a2",
-         []
-        ],
-        "flexbox-definite-sizes-001-ref.html": [
-         "ed0cc575f56bf8e7c9db37ee8a5355fe432236a4",
-         []
-        ],
-        "flexbox-definite-sizes-005-ref.html": [
-         "fca146671cfb80cd3ae0264a8466be0b9823b3ae",
-         []
-        ],
-        "flexbox-dyn-resize-001-ref.html": [
-         "5e5561cadf2ddbd6dfd2c7b4819f146f61be006b",
-         []
-        ],
-        "flexbox-flex-basis-content-001-ref.html": [
-         "a3416a3793555c6d4065dacb1cf967136ea0238f",
-         []
-        ],
-        "flexbox-flex-basis-content-002-ref.html": [
-         "bb845e35e26cbb91926b1ed6464271422bd08dcb",
-         []
-        ],
-        "flexbox-flex-basis-content-003-ref.html": [
-         "63ce9d74292c7a9699894783ae2e66fe412a33b6",
-         []
-        ],
-        "flexbox-flex-basis-content-004-ref.html": [
-         "7da4de7a5aff52bc8ce4b13909f24a9ad5d7117d",
-         []
-        ],
-        "flexbox-flex-flow-001-ref.html": [
-         "f46e11b39af20ec8bbe2688dde5b6ec66f7828ce",
-         []
-        ],
-        "flexbox-flex-flow-002-ref.html": [
-         "a325959a23eca85e375fe0691b7a9d18fd3057c0",
-         []
-        ],
-        "flexbox-flex-wrap-horiz-001-ref.html": [
-         "bb76cafff144e012dc97a270835339d6ce29b5fa",
-         []
-        ],
-        "flexbox-flex-wrap-horiz-002-ref.html": [
-         "88c3beb19e90a3731a7da8aed3ef7170ea3fca07",
-         []
-        ],
-        "flexbox-flex-wrap-vert-001-ref.html": [
-         "67f2c75da282128c8026a7072e2730cc15bd7b03",
-         []
-        ],
-        "flexbox-flex-wrap-vert-002-ref.html": [
-         "f9a4553ccbee361f31491dc91989d341ad9ac1d3",
-         []
-        ],
-        "flexbox-items-as-stacking-contexts-001-ref.xhtml": [
-         "7e02b799f0f75b5d238ecc3c7bbaf87a53572e88",
-         []
-        ],
-        "flexbox-items-as-stacking-contexts-002-ref.html": [
-         "a67a31936d9a09176e7e74115fd2d273734ad032",
-         []
-        ],
-        "flexbox-items-as-stacking-contexts-003-ref.html": [
-         "814f06cca118885757e02d8d12c9b4d1df642dd9",
-         []
-        ],
-        "flexbox-justify-content-horiz-001-ref.xhtml": [
-         "e3f0276fda17436b653e236b359f5837c9257b40",
-         []
-        ],
-        "flexbox-justify-content-horiz-002-ref.xhtml": [
-         "0e43e6ff880f9dba20c6cca74eaf5e4a51458496",
-         []
-        ],
-        "flexbox-justify-content-horiz-003-ref.xhtml": [
-         "4ad2dc202ea3c1800fb189315b691c8ada9aaadd",
-         []
-        ],
-        "flexbox-justify-content-horiz-004-ref.xhtml": [
-         "231729d8565fe7c232c0506a9d161031428c63b7",
-         []
-        ],
-        "flexbox-justify-content-horiz-005-ref.xhtml": [
-         "82f872d2918c4701854ac366cf6a850a2440ea7c",
-         []
-        ],
-        "flexbox-justify-content-horiz-006-ref.xhtml": [
-         "7723b5fa2080af80c15890c7e0b73b16ae25c7fa",
-         []
-        ],
-        "flexbox-justify-content-vert-001-ref.xhtml": [
-         "20f1c5df34e257358ad8c5ace97ee5b0fafb8864",
-         []
-        ],
-        "flexbox-justify-content-vert-002-ref.xhtml": [
-         "d0ca310120185f630170218f97bb70ead05d837e",
-         []
-        ],
-        "flexbox-justify-content-vert-003-ref.xhtml": [
-         "12064db1a5df2dbe82b214d8bc92ee78dcd0b350",
-         []
-        ],
-        "flexbox-justify-content-vert-004-ref.xhtml": [
-         "b3a45e06f13fdfee0672197b49db244e90cf73d2",
-         []
-        ],
-        "flexbox-justify-content-vert-005-ref.xhtml": [
-         "ebc97819a5002c97d1bc57e895755176c114732f",
-         []
-        ],
-        "flexbox-justify-content-vert-006-ref.xhtml": [
-         "b1a5bf2a9894bd421759a3abdb21fe9181a3672d",
-         []
-        ],
-        "flexbox-justify-content-wmvert-001-ref.xhtml": [
-         "0b99be2f2538d1cafbaeec4485a9c7dcd4f0cfde",
-         []
-        ],
-        "flexbox-margin-auto-horiz-001-ref.xhtml": [
-         "1321e5a3878b353f54db7459517539dd9b779ab2",
-         []
-        ],
-        "flexbox-margin-auto-horiz-002-ref.xhtml": [
-         "b310ab97cc36a9c717215eb9b68117fe8b892748",
-         []
-        ],
-        "flexbox-mbp-horiz-001-ref.xhtml": [
-         "d30386618e7bb3df6172e1d94cc0e8e3e479eef6",
-         []
-        ],
-        "flexbox-mbp-horiz-001-reverse-ref.xhtml": [
-         "ca4ef80ba34ae0f211a43546c2e332c6af76b495",
-         []
-        ],
-        "flexbox-mbp-horiz-002-ref.xhtml": [
-         "6203a40a0078f6d2af8ac0ead51c75b454722844",
-         []
-        ],
-        "flexbox-mbp-horiz-003-ref.xhtml": [
-         "a91d72b9f5ddc32fbac728726605a0af8cf09701",
-         []
-        ],
-        "flexbox-mbp-horiz-003-reverse-ref.xhtml": [
-         "7929c8907027b3558e3c953eeeac2bf33d8cb611",
-         []
-        ],
-        "flexbox-mbp-horiz-004-ref.xhtml": [
-         "245e6f9e3c9314a0af9a2d34afabbd42c52940fc",
-         []
-        ],
-        "flexbox-min-height-auto-001-ref.html": [
-         "146a6ad6bc9e5698371d061c2cb2eb65e97b31ab",
-         []
-        ],
-        "flexbox-min-height-auto-002-ref.html": [
-         "ca1aad42aa0eb710266fc5f0f62f31511c31511f",
-         []
-        ],
-        "flexbox-min-height-auto-003-ref.html": [
-         "ff1ced0c03517681c46f05f74aa93283f3587a9e",
-         []
-        ],
-        "flexbox-min-height-auto-004-ref.html": [
-         "768185d43194279b5648092715a1846fdfb917a5",
-         []
-        ],
-        "flexbox-min-width-auto-001-ref.html": [
-         "946db39cf1e17fa3be729f319cfd28738ceafef1",
-         []
-        ],
-        "flexbox-min-width-auto-002-ref.html": [
-         "21beb3f934ff6ce1f4153d564c5982a110a92b41",
-         []
-        ],
-        "flexbox-min-width-auto-003-ref.html": [
-         "09066eef7480923a3eb57d942424c55b0ca6f6c4",
-         []
-        ],
-        "flexbox-min-width-auto-004-ref.html": [
-         "64501367ac3109817820a0361a58cc7470975b31",
-         []
-        ],
-        "flexbox-overflow-horiz-001-ref.html": [
-         "82af03233541c92851d189b1a4173aaadc9bda1e",
-         []
-        ],
-        "flexbox-overflow-horiz-002-ref.html": [
-         "16cc9f4fa4ee758bd6373d72472997ee18a6f9a1",
-         []
-        ],
-        "flexbox-overflow-horiz-003-ref.html": [
-         "5693c9328e4d38a1df9c87ea0860f7112c684f3f",
-         []
-        ],
-        "flexbox-overflow-horiz-004-ref.html": [
-         "f9ae88ce4849283208f144c5a7cf0702ea2633de",
-         []
-        ],
-        "flexbox-overflow-horiz-005-ref.html": [
-         "589712c6ac7985978b47144f3fe3d2772749335b",
-         []
-        ],
-        "flexbox-overflow-vert-001-ref.html": [
-         "3dfddb7bbc85f6500d57123d7cb38a926ae205d3",
-         []
-        ],
-        "flexbox-overflow-vert-002-ref.html": [
-         "cf95a6b7bc27de6c723912e1abc9de5f8dc98422",
-         []
-        ],
-        "flexbox-overflow-vert-003-ref.html": [
-         "84bf022276ab0ed6e2248e7074caa242171d7677",
-         []
-        ],
-        "flexbox-overflow-vert-004-ref.html": [
-         "154fca8cc5d8c216f536228c347af69fddd2733d",
-         []
-        ],
-        "flexbox-overflow-vert-005-ref.html": [
-         "56022a478da97480e3c8bcea4b5b7a6b0b690bcc",
-         []
-        ],
-        "flexbox-paint-ordering-001-ref.xhtml": [
-         "635b0b29c0f233045fcafaf10d78d992fa43ebf2",
-         []
-        ],
-        "flexbox-paint-ordering-002-ref.xhtml": [
-         "55ca62df74adb2962542a84c7f78ed9b08c439ca",
-         []
-        ],
-        "flexbox-paint-ordering-003-ref.html": [
-         "5eadc304189c7e7b6b4e35a6826992a04348b94e",
-         []
-        ],
-        "flexbox-root-node-001-ref.html": [
-         "6a72f7618bad99ca4792b8a05c1120b5ee1632d8",
-         []
-        ],
-        "flexbox-safe-overflow-position-001-ref.html": [
-         "b921f35ca3b8cdfd2c86c512b8b76b9a9c6d0ab8",
-         []
-        ],
-        "flexbox-single-line-clamp-1-ref.html": [
-         "602c027f7012af33f9dfc9ceaca821205fe1094a",
-         []
-        ],
-        "flexbox-single-line-clamp-2-ref.html": [
-         "fda5fa7ccc507a15e6bfe7801704f00d2b725115",
-         []
-        ],
-        "flexbox-single-line-clamp-3-ref.html": [
-         "02f7eaa96a416427c503158e787589ed196da3cc",
-         []
-        ],
-        "flexbox-sizing-horiz-001-ref.xhtml": [
-         "54bafd034eb81452ab1a378a26d7b61488cc550b",
-         []
-        ],
-        "flexbox-sizing-horiz-002-ref.xhtml": [
-         "29aa55a624d9be8ce0caf2c1c88c01b9b110e7dd",
-         []
-        ],
-        "flexbox-sizing-vert-001-ref.xhtml": [
-         "00c8dbaa4021812e2534418d752f2ebffa7e8c4e",
-         []
-        ],
-        "flexbox-sizing-vert-002-ref.xhtml": [
-         "4a4cc5891b3e0aa7f3aee3211239ea7a005ba57e",
-         []
-        ],
-        "flexbox-table-fixup-001-ref.xhtml": [
-         "4611521543a712d0385f89554712d9b9978562ae",
-         []
-        ],
-        "flexbox-whitespace-handling-001-ref.xhtml": [
-         "236e3ee3bb9f2e2c2c4f6631bb730fca9f7e929a",
-         []
-        ],
-        "flexbox-whitespace-handling-002-ref.xhtml": [
-         "b7de647279d76ea580b82a960adebacdb1295939",
-         []
-        ],
-        "flexbox-with-pseudo-elements-001-ref.html": [
-         "98d23cc8de2108606b24e9ddfc3de5b3a3ff5c8c",
-         []
-        ],
-        "flexbox-with-pseudo-elements-002-ref.html": [
-         "48d17019b6dee0a44511f06582c839ab69479236",
-         []
-        ],
-        "flexbox-with-pseudo-elements-003-ref.html": [
-         "bdb973023aed9fc02176521062c9eff7ec94bc68",
-         []
-        ],
-        "flexbox-writing-mode-001-ref.html": [
-         "e2d59662a7bc8a1eefa114ecd4bf348ca4624153",
-         []
-        ],
-        "flexbox-writing-mode-002-ref.html": [
-         "4c3166171b36ad1c770007bb0211b49329592beb",
-         []
-        ],
-        "flexbox-writing-mode-003-ref.html": [
-         "2d89eea66bb9ffb85e596031d7d2f0a44d9883b8",
-         []
-        ],
-        "flexbox-writing-mode-004-ref.html": [
-         "1176830b56e74b133d0bcc85c3000d04f04dbfaa",
-         []
-        ],
-        "flexbox-writing-mode-005-ref.html": [
-         "a0894911bd8131c26758c71008d310c1ce52452a",
-         []
-        ],
-        "flexbox-writing-mode-006-ref.html": [
-         "8c045354bc687d566d85efd2236ac8efafec787c",
-         []
-        ],
-        "flexbox-writing-mode-007-ref.html": [
-         "0d2e9207beeaa4c7931f82213d233df700d6360c",
-         []
-        ],
-        "flexbox-writing-mode-008-ref.html": [
-         "8a21dd65f331d9b767111d496d72e4f6562c0d8d",
-         []
-        ],
-        "flexbox-writing-mode-009-ref.html": [
-         "5a96eb9998106821b9cac791058868399652243c",
-         []
-        ],
-        "flexbox-writing-mode-010-ref.html": [
-         "0301e838d2892d10eac3b28af72a0935491e5688",
-         []
-        ],
-        "flexbox-writing-mode-011-ref.html": [
-         "d1e0018a276c22e46113efaf933723a6eefe45b4",
-         []
-        ],
-        "flexbox-writing-mode-012-ref.html": [
-         "93623410577b69ca25ad77362744b7f026dbaf73",
-         []
-        ],
-        "flexbox-writing-mode-013-ref.html": [
-         "dd7fe458833258602983541dcfba5e3a9b4e408d",
-         []
-        ],
-        "flexbox-writing-mode-014-ref.html": [
-         "c1959c3678f36aac33336bb3a6256d372b52fa92",
-         []
-        ],
-        "flexbox-writing-mode-015-ref.html": [
-         "ca116669b1d6776436c0445000002188c68e0525",
-         []
-        ],
-        "flexbox-writing-mode-016-ref.html": [
-         "c3a223389d0455b2fe71d74837e5ff6121567432",
-         []
-        ],
-        "position-absolute-containing-block-001-ref.html": [
-         "5f8bcaf539f7004b226ab625d4357e4c831d6ac7",
-         []
-        ],
-        "position-absolute-containing-block-002-ref.html": [
-         "90ee38856cccd568352c5b6a4f14acc2274605c6",
-         []
-        ],
         "reftest.list": [
          "8e2c24584021a59b4e6292537ef44a80a721d191",
          []
-        ],
-        "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ],
-         "ahem.css": [
-          "82ee466791e8c3319ac518e58d6806c1616d783b",
-          []
-         ],
-         "solidblue.png": [
-          "a64b6a4255c9f99fd7bb87449a6d798a3c7f039d",
-          []
-         ]
-        }
+        ]
        },
        "fonts3": {
         "font-size-zero-1-notref.html": [
@@ -332206,22 +332092,14 @@
          []
         ],
         "ruby-text-combine-upright-001-ref.html": [
-         "580bcd3fbbc01e9a451bd34e5cd002037edf4144",
+         "db4f23c886c44282afc27fd09475ade0c189e6f8",
          []
         ],
         "ruby-text-combine-upright-002-ref.html": [
-         "796cd90b8b1db2026fe24766f37a3a4b9491ce14",
+         "1bb4386e7abfb468de92edcb9a2633d5ceb96174",
          []
         ],
         "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ],
-         "ahem.css": [
-          "82ee466791e8c3319ac518e58d6806c1616d783b",
-          []
-         ],
          "rbc.css": [
           "75620e1e3eadd78b3786cd533cd4a5c4187c1dfe",
           []
@@ -332272,7 +332150,7 @@
        },
        "sizing": {
         "block-size-with-min-or-max-content-1-ref.html": [
-         "ae170ffd9a25473c94fa237090db5d2b5b78b4b9",
+         "c52d3aa4cd55ed7828320b7c20f7861c0bc04fc0",
          []
         ],
         "block-size-with-min-or-max-content-table-1-ref.html": [
@@ -332280,11 +332158,11 @@
          []
         ],
         "hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html": [
-         "6d56cca0462d926d424281956449cc8a3bcc4d1e",
+         "263a0869aedbaceb06ebe81a53372c905e8acd9e",
          []
         ],
         "hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html": [
-         "0e2e449bfb7d184ba681999d41730ab72c140d2f",
+         "172f00d58ee29853d7b9ed4df97d4a19447ae1fc",
          []
         ],
         "reftest.list": [
@@ -332292,25 +332170,17 @@
          []
         ],
         "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ],
-         "ahem.css": [
-          "82ee466791e8c3319ac518e58d6806c1616d783b",
-          []
-         ],
          "min-content-max-content.css": [
           "60947153b358c1b3db9fec9f95704ac497e17169",
           []
          ]
         },
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html": [
-         "647fccc8e22f5b5d8ec45ae8ba130c91f63d123e",
+         "0a5de8da1461fe972a8e64f089feb9b70d226e55",
          []
         ],
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html": [
-         "55d6965adfc147da8a14798a7e940da16e98ec75",
+         "5a170d5c4c36481244d70073e1f5d01c0c76351d",
          []
         ]
        },
@@ -332504,220 +332374,212 @@
          []
         ],
         "segment-break-transformation-removable-ref.html": [
-         "5964fa593df372d4fcebb4e8ce8d24ac2c5ee2a3",
+         "0fa64d71dfee76e640870828277fda62c02ad0c8",
          []
         ],
         "segment-break-transformation-rules-001-ref.html": [
-         "f66bccefcb75260974e44858f1487c2a267bf887",
+         "62bc0f69903b3529f62feeb6b77fc66daba0935d",
          []
         ],
         "segment-break-transformation-rules-002-ref.html": [
-         "b01ea124e4a94d1124d0abd13b97970fa98e409f",
+         "1827ec05b3f2186abe6b5ddf0d05c4862a7766da",
          []
         ],
         "segment-break-transformation-rules-003-ref.html": [
-         "c82aa1c18462be12e39113ea8ebb9562e9aac86e",
+         "12df12e09bfdb4094a932bc0fc1dce18523cf68e",
          []
         ],
         "segment-break-transformation-rules-004-ref.html": [
-         "5b94f905d3488d652aaec3d718bc167c3331470b",
+         "1c218c2f61e1af2567c9e84731df5ffeb19d79ce",
          []
         ],
         "segment-break-transformation-rules-005-ref.html": [
-         "7899dbaa0e78760a49b47fa11ea91c9950a62813",
+         "d51e638a316e79fa80ec4af86f71b9cc0f426658",
          []
         ],
         "segment-break-transformation-rules-006-ref.html": [
-         "02845041f154680f719b6ec473cbe532c61648bb",
+         "c07f3c5f962bf40178fb0e40fad63864404f996a",
          []
         ],
         "segment-break-transformation-rules-007-ref.html": [
-         "82a674ba2bb7e6b0d78891b53aa043839b1b8d59",
+         "602e9c151c2163846606777c5545d9728fa4fd57",
          []
         ],
         "segment-break-transformation-rules-008-ref.html": [
-         "fdb0abe18be35d63cfa126e5f6d5b7928800779e",
+         "a5e36f8d70e722db6437f204dc0cf4bf24793c4f",
          []
         ],
         "segment-break-transformation-rules-009-ref.html": [
-         "225a033ea36f35d44b0c0e2532c62ccb3131e3f5",
+         "94c5f29f890c62809ba19f10c91bf6c5ec869bb9",
          []
         ],
         "segment-break-transformation-rules-010-ref.html": [
-         "ff1f441f83e21ccd6d4c8e5757c52819681aaf88",
+         "1e8296b31988223fa48311c70c732487dbd1fcc6",
          []
         ],
         "segment-break-transformation-rules-011-ref.html": [
-         "5df8d43d2e4a97fae0936ea5e7e7fbac06500abd",
+         "394acf0b5f5d28be290a7f302472996a2570a39e",
          []
         ],
         "segment-break-transformation-rules-012-ref.html": [
-         "dfec0f4646a3cd2b949a8fb340292ba81689d74f",
+         "ef2030a5cf9a5724cab6f05e06b5bb95f42bc6fb",
          []
         ],
         "segment-break-transformation-rules-013-ref.html": [
-         "b0b9ad58b9eb55e94c3395817131acb7fe650f58",
+         "4b71f6f1f05f949c2009885fe27e91677704ed8b",
          []
         ],
         "segment-break-transformation-rules-014-ref.html": [
-         "040b4410b34dc4f1099f957cf20dc7b6b044d4ff",
+         "6a92922f4875bd69dcf9d2933d2612cce6e3b50b",
          []
         ],
         "segment-break-transformation-rules-015-ref.html": [
-         "2a281589329263a63f98bda5207eb0a29f7b20d4",
+         "53d4d3676560617657123a8e4984127e2ae439f4",
          []
         ],
         "segment-break-transformation-rules-016-ref.html": [
-         "339aaa4ab9cbabc6e9b7363fe38163ae6708765f",
+         "705ceddcc85ba3098b5dfb1575778200fa1730d9",
          []
         ],
         "segment-break-transformation-rules-017-ref.html": [
-         "ede6f889dad1c9bcdb26f945ea40f75947b74c7d",
+         "fd04992ac53da422ae692218fb4f82445e8bdc9b",
          []
         ],
         "segment-break-transformation-rules-018-ref.html": [
-         "a4ac3be9762ea9a2875469ae3eeec68e19463944",
+         "d42603b9a897d1b6e18ddd8a46e8e79f9e507ace",
          []
         ],
         "segment-break-transformation-rules-019-ref.html": [
-         "a4106d7bd3e21d143428d1dd8e8606dcb3982d33",
+         "9e499adb01dfdc0b9df55e1a78c1b420f98c10b1",
          []
         ],
         "segment-break-transformation-rules-020-ref.html": [
-         "95224a24a84eeb54c36f4012b9d4b6c36d27758e",
+         "4ed13984fc000af5e2ff84f01cebc285aa347239",
          []
         ],
         "segment-break-transformation-rules-021-ref.html": [
-         "55c414a206f26a2a8feec49726a3f63cad692cd2",
+         "13a8d12c6550b88d0fcbc9df9ca05f82a2929150",
          []
         ],
         "segment-break-transformation-rules-022-ref.html": [
-         "1dc537bc341df0eae2eae0f875e26b8cc2523283",
+         "58c224e3f3e83da47f32e5a35cfdf7c438390566",
          []
         ],
         "segment-break-transformation-rules-023-ref.html": [
-         "0fe815bbebb327a5df3fff32426bb14eaac92d92",
+         "12f4df127b742bb0d7c5b1d7b6e3bf71fe58dfd2",
          []
         ],
         "segment-break-transformation-rules-024-ref.html": [
-         "096aab333daaf1fc3a28180598246d30ebe1c431",
+         "18e2af4f5e8306eceb0989efae285e1472b7aec3",
          []
         ],
         "segment-break-transformation-rules-025-ref.html": [
-         "1e797d5194e8340bb4733bfdbaad2bb3976a36ec",
+         "384bcaf1ecc116bd3abc70e96544892040126a11",
          []
         ],
         "segment-break-transformation-rules-026-ref.html": [
-         "269ef7a4f19e2d61fe9b17628092e23086fd0761",
+         "56ae5a0a536888b14a2220176f7b2f95eabd9666",
          []
         ],
         "segment-break-transformation-rules-027-ref.html": [
-         "bf678c7c20fee14c30d8142ecc671e48bd52c48a",
+         "b5fb675abec9fec4f94e690c81b4493901676de9",
          []
         ],
         "segment-break-transformation-rules-028-ref.html": [
-         "642e21f334d1ef6c54e53c87b06bdaaff5b3096e",
+         "dbcca9389a7fcd6d7ac793e0303ee8abff9125c6",
          []
         ],
         "segment-break-transformation-rules-029-ref.html": [
-         "69b43f61e705577f6fee6ab7c3edfdee9d257a3f",
+         "1803b4e1648bfa6240e04187f6ad48226d7e11aa",
          []
         ],
         "segment-break-transformation-rules-030-ref.html": [
-         "3c3cc2658a43d37ec97e147570b0c38454018864",
+         "6fdfff16a3b0d8548a246d5b1e0dfae263a60be8",
          []
         ],
         "segment-break-transformation-rules-031-ref.html": [
-         "4902bf1e784827354dcf33d69efef33933171020",
+         "3d14600e43227a37b03f8555669ffe3f2f7b1d13",
          []
         ],
         "segment-break-transformation-rules-032-ref.html": [
-         "a2bd3b472b9bc8dab31e2671ff8a6b1edbaa3369",
+         "c2b8451c96424feabbf302e1ce053aedfeccffc3",
          []
         ],
         "segment-break-transformation-rules-033-ref.html": [
-         "0b3ab3e92868ba23472e15bfc47c839d18012354",
+         "bbeeeabd5cc82e47c66856ddcf096a175be2ccd8",
          []
         ],
         "segment-break-transformation-rules-034-ref.html": [
-         "3c55aa257b1c04b8b5544f516875de862248769c",
+         "4949f59db27a7c90992a830679f1c6037640bc54",
          []
         ],
         "segment-break-transformation-rules-035-ref.html": [
-         "5160d4a7c9fe505a3853c99f671c43229423c9b8",
+         "0e64bb2c9f14cdc636e24c5046cab285e31dd834",
          []
         ],
         "segment-break-transformation-rules-036-ref.html": [
-         "f15f8c68530a67af5143a933c624042a7ec816a3",
+         "1b9242d08fadc8594656fc33ee6fd1d1676cc1ac",
          []
         ],
         "segment-break-transformation-rules-037-ref.html": [
-         "9716239f3de686d6f96995c74c5902f2df01c933",
+         "d3205b4c3db9bb746c1a698c3973b8f2308dab69",
          []
         ],
         "segment-break-transformation-rules-038-ref.html": [
-         "a24b5d429690dc7900737a6071e62aa95cfb246c",
+         "0873382eff02f33a41289fc7d49b5aeb0e23671d",
          []
         ],
         "segment-break-transformation-rules-039-ref.html": [
-         "b20aa3ba938f5222b5cd30e25fbe652d3355252d",
+         "2a62fa149c9f0df0f96a3b9408fd79cb0a32abe9",
          []
         ],
         "segment-break-transformation-rules-040-ref.html": [
-         "1efeb6813289987e47704cf3ee6432ee1a93a983",
+         "9505af9af7d71f86383c74ff3c576bde5a4e0ba8",
          []
         ],
         "segment-break-transformation-rules-041-ref.html": [
-         "21fe9aa30519492bed2ea82ceaaf98b720fb6ffd",
+         "f3d0918a41aedb8ce44edc41d537eb6b9951126f",
          []
         ],
         "segment-break-transformation-rules-042-ref.html": [
-         "f164d1bd3b7ed2e137eb66da1d0af70305bdbc2f",
+         "979ca514a86ab7f4e46c9667848fd6b956df54bd",
          []
         ],
         "segment-break-transformation-rules-043-ref.html": [
-         "657ea9dd04fd74459d7cbd33cdc41e29a574fdaf",
+         "2d467b0dfbba27638e2bb66378d519229e7db048",
          []
         ],
         "segment-break-transformation-rules-044-ref.html": [
-         "93cb2234e73bd647f3eb529bc3114c5bf9f04bc4",
+         "89dcd61291a7d47c992869aca9f8e396ca69fddc",
          []
         ],
         "segment-break-transformation-rules-045-ref.html": [
-         "7839b74dad4c9370da8da7d2bbdaec4d7262dde9",
+         "d788c276b544ab374a7de1d7a1fa02fa1290ebad",
          []
         ],
         "segment-break-transformation-rules-046-ref.html": [
-         "5a457be71b335fb585abe3a6c13fe38bfa690ac5",
+         "50b7733edc9922bc71a2287ac5e5dc5cf418657c",
          []
         ],
         "segment-break-transformation-rules-047-ref.html": [
-         "c3e890c66b12541255df3c9dcd55be7e4813fd56",
+         "a63575d11e45b0d54c692d3a5a9c438841236c10",
          []
         ],
         "segment-break-transformation-rules-048-ref.html": [
-         "e27b09d3fad1071ef97edbbd7d9aacbe77280340",
+         "55bb19bbbfff43c42b37c255ae369985c2e4471c",
          []
         ],
         "segment-break-transformation-rules-049-ref.html": [
-         "f1cce478a10a49415e15ce74722176ff4c23d86f",
+         "77b1348f653d904ca7b80e7381a57df9c173ca18",
          []
         ],
         "segment-break-transformation-unremovable-ref.html": [
-         "589da00bbb4a0e45fb53d5297003060f482bbd1f",
+         "a01122900982ce9b7aa2cd71094a1c2a0ba2c976",
          []
         ],
         "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ],
-         "ahem.css": [
-          "82ee466791e8c3319ac518e58d6806c1616d783b",
-          []
-         ],
          "generate-segment-break-transformation-rules-tests.py": [
-          "6e13861374a6f6d5def71d7c2c1a59fbd57b2895",
+          "fc894161bda1b4e3f5b643b6e668a6d1d0bcc614",
           []
          ]
         },
@@ -332746,7 +332608,7 @@
          []
         ],
         "text-word-spacing-ref.html": [
-         "5cbd7a550c78f4e68d6cd5ad4dab345118546b38",
+         "f48a0178d5a5033d4fd7e7fc566f76264b2b4cea",
          []
         ]
        },
@@ -333016,14 +332878,6 @@
          []
         ],
         "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ],
-         "ahem.css": [
-          "82ee466791e8c3319ac518e58d6806c1616d783b",
-          []
-         ],
          "color-green-ref.html": [
           "0eabe58c81f60fa197fc0ed08393d70b44d6d87f",
           []
@@ -333033,7 +332887,7 @@
           []
          ],
          "external-variable-font-face.css": [
-          "87f0609ba3d1422eb2af8ddbb73e13d9892ecccb",
+          "e3ad1eddb425ec0d38336e226dc4439272e76051",
           []
          ],
          "external-variable-reference.css": [
@@ -333046,31 +332900,31 @@
          ]
         },
         "variable-declaration-15-ref.html": [
-         "f8e3d91372014d1671f3e0a03ff039d3a5f63b76",
+         "6679d0de9558b1f1c591212a80cec6ef5aea3907",
          []
         ],
         "variable-declaration-16-ref.html": [
-         "f8e3d91372014d1671f3e0a03ff039d3a5f63b76",
+         "6679d0de9558b1f1c591212a80cec6ef5aea3907",
          []
         ],
         "variable-declaration-17-ref.html": [
-         "ce24112a6a0af5f1bec09c944c0a8f7e84cec245",
+         "b0075fc38f77384dcd95f6e5c7e2889cc7b8308b",
          []
         ],
         "variable-declaration-18-ref.html": [
-         "f8e3d91372014d1671f3e0a03ff039d3a5f63b76",
+         "6679d0de9558b1f1c591212a80cec6ef5aea3907",
          []
         ],
         "variable-external-font-face-01-ref.html": [
-         "b84d1ff44c44d824d1c804ee3123592b643caa26",
+         "3e7fd9a26365bdf45684ffd328abac6668d7f414",
          []
         ],
         "variable-font-face-01-ref.html": [
-         "b84d1ff44c44d824d1c804ee3123592b643caa26",
+         "3e7fd9a26365bdf45684ffd328abac6668d7f414",
          []
         ],
         "variable-font-face-02-ref.html": [
-         "b84d1ff44c44d824d1c804ee3123592b643caa26",
+         "3e7fd9a26365bdf45684ffd328abac6668d7f414",
          []
         ],
         "variable-reference-12-ref.html": [
@@ -339295,7 +339149,7 @@
         []
        ],
        "document-open.html": [
-        "c53c9fbfe3d8b486bb88acd3761ced781edd3fa3",
+        "136c494d5ad866a12e361b95e8ca29e377f4c0fd",
         []
        ],
        "post-done-to-opener.html": [
@@ -340884,7 +340738,7 @@
          []
         ],
         "drawing-images-to-the-canvas.yaml": [
-         "e71f46f61e2fe999981a04120ba2b17b5c5ff2cc",
+         "133807fb285da0e897d84b688da39281d5b67bfc",
          []
         ],
         "drawing-rectangles-to-the-canvas.yaml": [
@@ -351033,10 +350887,6 @@
       },
       "testdriver": {
        "actions": {
-        "crossOrigin.sub.html.ini": [
-         "8cb7d29239b20fab711bbafb881628bd8af568f3",
-         []
-        ],
         "eventOrder.html.ini": [
          "4df08aa7e31b9c866a5a4408d29819ec80e0b610",
          []
@@ -352197,7 +352047,7 @@
     ]
    },
    "lint.ignore": [
-    "e63b152d7ec9d9eb23ee7052346a7e2408b207d3",
+    "814007b02ee63cfbab5d10d2785c5e5c7a4692f4",
     []
    ],
    "loading": {
@@ -353405,6 +353255,14 @@
       []
      ]
     },
+    "mse-for-webcodecs": {
+     "tentative": {
+      "vp9.mp4": [
+       "7553e5cae9202c0f144126910e9471658038b455",
+       []
+      ]
+     }
+    },
     "webm": {
      "invalid-codec.webm": [
       "f1c8bdd7abba1f6b24dc0a5d44463c3bda770d0d",
@@ -354087,7 +353945,7 @@
     ],
     "concurrent_io": {
      "operation_helpers.js": [
-      "d85a153bab1dd2ea971997f88a3b146be85aae25",
+      "769d283bd24e0f9be74b45f20002da1b2919b957",
       []
      ]
     },
@@ -354331,69 +354189,69 @@
    "origin-isolation": {
     "1-iframe": {
      "parent-yes-child-no-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child-no-same.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child-no-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child-yes-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child-yes-same.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child-yes-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ]
     },
     "2-iframes": {
      "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ]
     },
@@ -354402,15 +354260,15 @@
      []
     ],
     "README.md": [
-     "693ab4048c0736b4d3072e25d2874228263bda3b",
+     "7446ff2495d6ac03d38335817364a6ead115d61e",
      []
     ],
     "about-blank.https.sub.html.headers": [
-     "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+     "79a20f30fc0f486014c8b93edef7483605101504",
      []
     ],
     "document-domain.sub.https.html.headers": [
-     "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+     "79a20f30fc0f486014c8b93edef7483605101504",
      []
     ],
     "getter-special-cases": {
@@ -354419,23 +354277,23 @@
       []
      ],
      "csp-sandbox-yes.https.html.headers": [
-      "3fd1539d4aec261080c0f4a1cea1fd98c3ae9196",
+      "a52bf509006a3b9a5518f4f0679b05d7cff12b42",
       []
      ],
      "data-to-javascript-yes.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "data-url-yes.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "javascript-url-yes.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "removed-iframe.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "resources": {
@@ -354448,7 +354306,7 @@
        []
       ],
       "helpers.mjs": [
-       "d1e3cc17a13e28873ad84f2ad8c9a1cba8cdc9ed",
+       "6cc2ed6b697956b859ade3e0c0956c804cc5f8a4",
        []
       ],
       "javascript-url-test.mjs": [
@@ -354465,60 +354323,60 @@
       ]
      },
      "sandboxed-iframe-yes.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "sandboxed-same-origin-iframe-yes.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ]
     },
     "going-back.sub.https.html.headers": [
-     "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+     "79a20f30fc0f486014c8b93edef7483605101504",
      []
     ],
     "iframe-navigation": {
      "parent-yes-1-no-same-2-no-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ]
     },
     "insecure-http.sub.html.headers": [
-     "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+     "79a20f30fc0f486014c8b93edef7483605101504",
      []
     ],
     "popups": {
      "opener-yes-openee-no-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "opener-yes-openee-no-same.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "opener-yes-openee-no-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "opener-yes-openee-yes-port.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "opener-yes-openee-yes-same.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "opener-yes-openee-yes-subdomain.sub.https.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ]
     },
     "removing-iframes.sub.https.html.headers": [
-     "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+     "79a20f30fc0f486014c8b93edef7483605101504",
      []
     ],
     "resources": {
@@ -354531,7 +354389,7 @@
       []
      ],
      "crashy-popup.sub.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "frame.html": [
@@ -354539,11 +354397,11 @@
       []
      ],
      "frame.html.headers": [
-      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      "79a20f30fc0f486014c8b93edef7483605101504",
       []
      ],
      "helpers.mjs": [
-      "43cfffd5f26f0a3bd89367d5ec544a07e4b62a37",
+      "02ba405c60190019b909ca84bb05c3370b912855",
       []
      ],
      "helpers.mjs.headers": [
@@ -354551,7 +354409,7 @@
       []
      ],
      "send-header-page-script.mjs": [
-      "fe3dc6a8e0943ed1176aa05a088ce91ab0a03708",
+      "515987f3f20de655f4d1bab87850e7a625fd1faa",
       []
      ],
      "send-header-page-script.mjs.headers": [
@@ -354559,7 +354417,7 @@
       []
      ],
      "send-origin-isolation-header.py": [
-      "fe3234b6501ed0aa6c74458f0c53d765d0cd85f3",
+      "8acf989f964d9964007fa84771843525580fc5fc",
       []
      ]
     }
@@ -362654,7 +362512,7 @@
        []
       ],
       "safari-technology-preview.rb": [
-       "3f9a3679080344df29824872522a19d523cecc87",
+       "c78bcef5c454c0e023c411f09753aedb1b90df0b",
        []
       ],
       "system_info.yml": [
@@ -369114,7 +368972,7 @@
        []
       ],
       "client.py": [
-       "73fec5a892523b8965deead70a39eb02ffc01242",
+       "fc4222a9ce959861d18e845b28f2f4fbce116a67",
        []
       ],
       "error.py": [
@@ -369126,7 +368984,7 @@
        []
       ],
       "transport.py": [
-       "e836b19a158d5d99d3f87d314ec95ba77df130ad",
+       "33142d30fce00c85bafff3fa62eadb7cc0772fe9",
        []
       ]
      }
@@ -400568,7 +400426,7 @@
      ]
     ],
     "basic.htm": [
-     "96cc4b98be9646742c2e81f4fcc0edbf8bcb4035",
+     "85d443190db2c2ea5151cb4a03b7332c43d646b0",
      [
       null,
       {}
@@ -422935,7 +422793,7 @@
        ]
       ],
       "resize-computed.html": [
-       "303d2b6a6b56822cefac5ff884bde308c8200f62",
+       "c4111f7aeb163c772c564af75b40fef62beaf815",
        [
         null,
         {}
@@ -458629,7 +458487,7 @@
        ]
       ],
       "sandbox-document-open.html": [
-       "8c6c220291c19b19c058c5fa041c36ae05f3b769",
+       "3f754374ba12a38b3c838b37f9fe02eecb731a41",
        [
         null,
         {}
@@ -460426,6 +460284,13 @@
          {}
         ]
        ],
+       "2d.drawImage.nonexistent.html": [
+        "a1d8badb069b7ee0a00c153b018926d158d3ba4d",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.drawImage.nonfinite.html": [
         "cda50dfc5c1622ec92bf24b62759816d81fbbc1d",
         [
@@ -463211,7 +463076,7 @@
          ]
         ],
         "canvas-createPutGetImageData-colorManaged.html": [
-         "b58d78ffafc36a4afcd57ceba0cc1d1e0d312513",
+         "c2d0294f9fd2710f7f4628d860f0ffdf5cf8bd4f",
          [
           null,
           {}
@@ -463246,7 +463111,7 @@
          ]
         ],
         "imageData-colorManagedBehavior.html": [
-         "c82bf4cc74b9b8c3c33084b9e631f925f7f17f9b",
+         "ff7c1437b502da323cba0c7dead62afb1df18d21",
          [
           null,
           {}
@@ -500937,6 +500802,13 @@
         null,
         {}
        ]
+      ],
+      "mediasource-webcodecs-appendencodedchunks-play.html": [
+       "4df317a537ea0f6929caaf94a3d9f8009cf4f656",
+       [
+        null,
+        {}
+       ]
       ]
      }
     }
@@ -504224,7 +504096,7 @@
    },
    "native-io": {
     "close_async.tentative.https.any.js": [
-     "7545cedaffd1718b9f84742f21b3f9a4d5d89033",
+     "fb53e3d4ca646ea57ef9b4b4d3510cddf0d9c299",
      [
       "native-io/close_async.tentative.https.any.html",
       {
@@ -504236,6 +504108,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -504251,6 +504127,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -504266,6 +504146,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -504281,6 +504165,10 @@
         [
          "global",
          "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
         ]
        ]
       }
@@ -504306,7 +504194,7 @@
     ],
     "concurrent_io": {
      "concurrent_io_flush_async.tentative.https.any.js": [
-      "7436b86b704dfac99f84f38c74eae25408703115",
+      "518527821e7e82ca1e3032640cea1143ae95a8f3",
       [
        "native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.html",
        {
@@ -504591,7 +504479,7 @@
       ]
      ],
      "concurrent_io_setLength_async.tentative.https.any.js": [
-      "cb7d6642c845f6b8c5c7f3d06e3e785e0ddc6644",
+      "abff5d89dd06564c123a67a14cf20f2deacf1f12",
       [
        "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.html",
        {
@@ -506934,7 +506822,7 @@
       ]
      ],
      "removed-iframe.sub.https.html": [
-      "d7ad4903ab9bfb2d07858f688238967f7817d90e",
+      "8a29076e56111444a7f8d83b8d0e413291de4e51",
       [
        null,
        {}
@@ -523185,7 +523073,7 @@
       ]
      ],
      "sandboxed-iframe-with-opaque-origin.html": [
-      "f6ecd884df3dd073e9440a0003d5d92135ed2c9c",
+      "fd1857e0ddbfcdb3a398203ecafe2accd5ae8748",
       [
        null,
        {}
diff --git a/tests/wpt/metadata/cors/basic.htm.ini b/tests/wpt/metadata/cors/basic.htm.ini
index 4fd11a97b09..f10af999034 100644
--- a/tests/wpt/metadata/cors/basic.htm.ini
+++ b/tests/wpt/metadata/cors/basic.htm.ini
@@ -2,3 +2,12 @@
   [Same domain basic usage]
     expected: FAIL
 
+  [Cross domain basic usage, origin: echo]
+    expected: FAIL
+
+  [Cross domain different port, origin: echo]
+    expected: FAIL
+
+  [Cross domain different protocol, origin: echo]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
new file mode 100644
index 00000000000..f64b45fea6b
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-002.html]
+  [Hit test float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
new file mode 100644
index 00000000000..10e67a8135e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-items-center-nested-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-align-items-center-nested-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
new file mode 100644
index 00000000000..1a8c2d6bc37
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-001a.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
new file mode 100644
index 00000000000..f08ba3ef89b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-001b.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
new file mode 100644
index 00000000000..48562db38c3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
new file mode 100644
index 00000000000..f13dcc89a05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
new file mode 100644
index 00000000000..5e562813705
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-005.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
new file mode 100644
index 00000000000..b22554bd4cd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-006.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
new file mode 100644
index 00000000000..9317b81da2c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-007.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
new file mode 100644
index 00000000000..225f94870ca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-baseline-horiz-008.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
new file mode 100644
index 00000000000..b9ba3ae31e7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-horiz-001-block.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
new file mode 100644
index 00000000000..7003e92b8fc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-horiz-001-table.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
new file mode 100644
index 00000000000..4f314573c7a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-horiz-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
new file mode 100644
index 00000000000..73eac7e6752
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-horiz-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
new file mode 100644
index 00000000000..c24022052ca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-horiz-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-horiz-004.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
new file mode 100644
index 00000000000..dab9d6e1cf9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-stretch-vert-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-stretch-vert-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
new file mode 100644
index 00000000000..74decb76cb6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
new file mode 100644
index 00000000000..82e6e6f0359
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
new file mode 100644
index 00000000000..bca40042647
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
new file mode 100644
index 00000000000..98820d74fab
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-004.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
new file mode 100644
index 00000000000..837886b0dad
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
new file mode 100644
index 00000000000..9509f937736
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
new file mode 100644
index 00000000000..2fff2b7cd45
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
new file mode 100644
index 00000000000..817b0705577
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-004.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
new file mode 100644
index 00000000000..1ffe25b3d11
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-align-self-vert-rtl-005.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
new file mode 100644
index 00000000000..31bd462cde0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-align-self-baseline-horiz-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
new file mode 100644
index 00000000000..f36c4c09f52
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-align-self-baseline-vert-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
new file mode 100644
index 00000000000..4dbf80b31a0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-horiz-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
new file mode 100644
index 00000000000..750b638c8cf
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-horiz-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
new file mode 100644
index 00000000000..81fa961021c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-vert-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
new file mode 100644
index 00000000000..3fecf90b40d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-item-vert-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
new file mode 100644
index 00000000000..8fa413cb2ee
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-horiz-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
new file mode 100644
index 00000000000..ace598f2e60
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-horiz-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
new file mode 100644
index 00000000000..78dccae8b39
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-horiz-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
new file mode 100644
index 00000000000..6fce1f0f9fb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-horiz-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
new file mode 100644
index 00000000000..fe421486b25
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-vert-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
new file mode 100644
index 00000000000..83faeb35bca
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-multi-line-vert-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
new file mode 100644
index 00000000000..578b123bd47
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-single-item-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
new file mode 100644
index 00000000000..4b224870ff8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-baseline-single-item-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-baseline-single-item-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
new file mode 100644
index 00000000000..ec95c66a56f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-block-horiz-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
new file mode 100644
index 00000000000..b171dce1090
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-block-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
new file mode 100644
index 00000000000..1e6f0388287
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-block-vert-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..33508636edf
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
new file mode 100644
index 00000000000..c33eb69f9e9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-horiz-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
new file mode 100644
index 00000000000..50da74a7d55
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
new file mode 100644
index 00000000000..33cdfcd51ee
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-canvas-vert-001v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..ab01e596fb6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-fieldset-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
new file mode 100644
index 00000000000..bdb738da04e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-fieldset-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..36cc12e570c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-iframe-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
new file mode 100644
index 00000000000..98e1aadf6ea
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-iframe-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..b81dc136ed2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-img-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
new file mode 100644
index 00000000000..8d2aa03e0d7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-img-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-img-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..fcbae31856f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-textarea-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
new file mode 100644
index 00000000000..6209fc1effc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-textarea-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..228a9d52f61
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-video-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
new file mode 100644
index 00000000000..78a712924f5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-basic-video-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-basic-video-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
new file mode 100644
index 00000000000..88b0e3f1aa9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-horiz-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
new file mode 100644
index 00000000000..cfecd9e45e0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-horiz-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
new file mode 100644
index 00000000000..787758ff28e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-horiz-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
new file mode 100644
index 00000000000..8ee43106a11
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-horiz-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-horiz-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
new file mode 100644
index 00000000000..c93bf834730
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-vert-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
new file mode 100644
index 00000000000..3e447e342d1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-vert-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
new file mode 100644
index 00000000000..8cc9d834de2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-vert-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
new file mode 100644
index 00000000000..6b8f967725e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-break-request-vert-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-break-request-vert-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
new file mode 100644
index 00000000000..9dbefcf8718
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-baseline-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-collapsed-item-baseline-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
new file mode 100644
index 00000000000..88b5593245a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-collapsed-item-horiz-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
new file mode 100644
index 00000000000..8e80306b708
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-collapsed-item-horiz-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
new file mode 100644
index 00000000000..85c12ad74b5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-collapsed-item-horiz-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-collapsed-item-horiz-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-001.html.ini
new file mode 100644
index 00000000000..00add169953
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-002.html.ini
new file mode 100644
index 00000000000..f86a9a6f6cc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-003.html.ini
new file mode 100644
index 00000000000..1efedb0d6eb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-004.html.ini
new file mode 100644
index 00000000000..7727699cd09
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-column-row-gap-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-column-row-gap-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-001.html.ini
new file mode 100644
index 00000000000..8a5d723170b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-002.html.ini
new file mode 100644
index 00000000000..8284af93cce
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-003.html.ini
new file mode 100644
index 00000000000..a69e85c365e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-004.html.ini
new file mode 100644
index 00000000000..e5f35d2edae
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-005.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-005.html.ini
new file mode 100644
index 00000000000..114ce712ac4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-definite-sizes-005.html.ini
@@ -0,0 +1,2 @@
+[flexbox-definite-sizes-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
new file mode 100644
index 00000000000..2a9a0d6b670
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-001a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
new file mode 100644
index 00000000000..8f3bd004b8c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-001b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-001b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
new file mode 100644
index 00000000000..d2f6a544244
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
new file mode 100644
index 00000000000..b7833e0156f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
new file mode 100644
index 00000000000..07ae8a1f0d8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-004a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
new file mode 100644
index 00000000000..473babe7d40
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-basis-content-004b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-basis-content-004b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-001.html.ini
new file mode 100644
index 00000000000..268e9474749
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-flow-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-002.html.ini
new file mode 100644
index 00000000000..7e6594850eb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-flow-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-flow-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
new file mode 100644
index 00000000000..945a8e0c072
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-wrap-vert-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
new file mode 100644
index 00000000000..deca711477d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-flex-wrap-vert-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-wrap-vert-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
new file mode 100644
index 00000000000..1368cdf2367
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-items-as-stacking-contexts-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
new file mode 100644
index 00000000000..74ecf610afc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-001a.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
new file mode 100644
index 00000000000..7cd548352d9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-001b.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
new file mode 100644
index 00000000000..272354a198d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
new file mode 100644
index 00000000000..742f5dfdb8a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
new file mode 100644
index 00000000000..85bda5dda03
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-004.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
new file mode 100644
index 00000000000..1aa27969f37
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-005.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
new file mode 100644
index 00000000000..f8b3dc233db
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-horiz-006.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
new file mode 100644
index 00000000000..c27504c826b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-001a.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
new file mode 100644
index 00000000000..807a7a36ae2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-001b.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
new file mode 100644
index 00000000000..c89a4d4010b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
new file mode 100644
index 00000000000..1416bdedf25
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-003.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
new file mode 100644
index 00000000000..a53ba9778e7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-004.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
new file mode 100644
index 00000000000..d9ce1e3c389
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-005.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-005.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
new file mode 100644
index 00000000000..f0cd24820f4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-vert-006.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-006.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
new file mode 100644
index 00000000000..586a6be1f7e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-wmvert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..23ba0b62849
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-margin-auto-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
new file mode 100644
index 00000000000..57977cc1eef
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-mbp-horiz-001-rtl-reverse.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
new file mode 100644
index 00000000000..ab2abca56b0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-mbp-horiz-001-rtl.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
new file mode 100644
index 00000000000..f09d7e6290f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-mbp-horiz-002v.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-001.html.ini
new file mode 100644
index 00000000000..8158009ceaa
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
new file mode 100644
index 00000000000..52e14a67a05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
new file mode 100644
index 00000000000..fe71f687818
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002c.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
new file mode 100644
index 00000000000..8a387e1761c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-002c.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-003.html.ini
new file mode 100644
index 00000000000..4bdbe70d1c7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-004.html.ini
new file mode 100644
index 00000000000..e275f10a12b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-height-auto-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-height-auto-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-001.html.ini
new file mode 100644
index 00000000000..3f082265ebe
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002a.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
new file mode 100644
index 00000000000..20b250f350d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002a.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-002a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002b.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
new file mode 100644
index 00000000000..197af149381
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002b.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-002b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002c.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
new file mode 100644
index 00000000000..915e99a7f45
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-002c.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-002c.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-003.html.ini
new file mode 100644
index 00000000000..150d543188f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-004.html.ini
new file mode 100644
index 00000000000..23081b20a15
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-min-width-auto-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-min-width-auto-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
new file mode 100644
index 00000000000..fd6fa5c3057
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-overflow-horiz-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
new file mode 100644
index 00000000000..8c587804213
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-horiz-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-overflow-horiz-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-001.html.ini
new file mode 100644
index 00000000000..5c0f0370da5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-overflow-vert-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-004.html.ini
new file mode 100644
index 00000000000..2ba772d0507
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-overflow-vert-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-005.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-005.html.ini
new file mode 100644
index 00000000000..62e1fc67d94
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-overflow-vert-005.html.ini
@@ -0,0 +1,2 @@
+[flexbox-overflow-vert-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
new file mode 100644
index 00000000000..f940711d2e5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-paint-ordering-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
new file mode 100644
index 00000000000..4b1519eda79
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-paint-ordering-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-paint-ordering-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
new file mode 100644
index 00000000000..f22ee915dcb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-safe-overflow-position-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-safe-overflow-position-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-1.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
new file mode 100644
index 00000000000..d25f6f6fbdc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-1.html.ini
@@ -0,0 +1,2 @@
+[flexbox-single-line-clamp-1.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-3.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
new file mode 100644
index 00000000000..8ee6ca6fddd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-single-line-clamp-3.html.ini
@@ -0,0 +1,2 @@
+[flexbox-single-line-clamp-3.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
new file mode 100644
index 00000000000..9b2276474c2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-sizing-horiz-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
new file mode 100644
index 00000000000..2298c6f2d27
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-horiz-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-sizing-horiz-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
new file mode 100644
index 00000000000..913bdcff6ae
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-001.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-sizing-vert-001.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
new file mode 100644
index 00000000000..8dcd3a3c5b1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-sizing-vert-002.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-sizing-vert-002.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
new file mode 100644
index 00000000000..2afbeeb72ed
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-whitespace-handling-001a.xhtml]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-001.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-001.html.ini
new file mode 100644
index 00000000000..4da5307bbfa
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-001.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-002.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-002.html.ini
new file mode 100644
index 00000000000..1548606c0f1
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-002.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-003.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-003.html.ini
new file mode 100644
index 00000000000..9b8fc9ac80e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-004.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-004.html.ini
new file mode 100644
index 00000000000..476e9a916fd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-004.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-005.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-005.html.ini
new file mode 100644
index 00000000000..091dae624f3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-005.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-006.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-006.html.ini
new file mode 100644
index 00000000000..0cb21a3b80b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-006.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-008.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-008.html.ini
new file mode 100644
index 00000000000..a63a144817a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-008.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-009.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-009.html.ini
new file mode 100644
index 00000000000..833ac0c4008
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-009.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-009.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-010.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-010.html.ini
new file mode 100644
index 00000000000..c4f6c29179a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-010.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-010.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-011.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-011.html.ini
new file mode 100644
index 00000000000..ada4d8bfa05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-011.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-011.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-012.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-012.html.ini
new file mode 100644
index 00000000000..e15687f9ad2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-012.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-012.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-013.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-013.html.ini
new file mode 100644
index 00000000000..7467a967374
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-013.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-014.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-014.html.ini
new file mode 100644
index 00000000000..0970faa5328
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-014.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-015.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-015.html.ini
new file mode 100644
index 00000000000..ef5a3dacaad
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-015.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-016.html.ini b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-016.html.ini
new file mode 100644
index 00000000000..8b4582a2fc2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flexbox-writing-mode-016.html.ini
@@ -0,0 +1,2 @@
+[flexbox-writing-mode-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini b/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini
new file mode 100644
index 00000000000..403c792b263
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-001.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini b/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini
new file mode 100644
index 00000000000..fa0829507e4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/position-absolute-containing-block-002.html.ini
@@ -0,0 +1,2 @@
+[position-absolute-containing-block-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
new file mode 100644
index 00000000000..70a00a101f6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-ui/parsing/resize-computed.html.ini b/tests/wpt/metadata/css/css-ui/parsing/resize-computed.html.ini
index 16a68e628d6..8f0ebd3554e 100644
--- a/tests/wpt/metadata/css/css-ui/parsing/resize-computed.html.ini
+++ b/tests/wpt/metadata/css/css-ui/parsing/resize-computed.html.ini
@@ -23,3 +23,9 @@
   [Property resize value 'both']
     expected: FAIL
 
+  [Property resize value 'both' in ::before]
+    expected: FAIL
+
+  [Property resize value 'vertical' in ::after]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml.ini
deleted file mode 100644
index 3c8bcb80782..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-content-horiz-001a.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml.ini
deleted file mode 100644
index 66a7095c564..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-content-horiz-001b.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml.ini
deleted file mode 100644
index b1262a6c1df..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-content-vert-001a.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml.ini
deleted file mode 100644
index 8f6852c43b2..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-align-content-vert-001b.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml.ini
deleted file mode 100644
index 31e3c75a7fc..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-mbp-horiz-004.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml.ini
deleted file mode 100644
index 081f03998ec..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-table-fixup-001.xhtml]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 085f21877a5..677788133a5 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,12 +315,15 @@
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..e67f0406fc3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..7277f622b20 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20%2Cnosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
deleted file mode 100644
index 75d75b4cda2..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_2.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 442db3cb549..fd369192a02 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
@@ -6,5 +7,5 @@
     expected: FAIL
 
   [opener of discarded auxiliary browsing context]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
index d76c9d0e9b4..c0779ccfdd8 100644
--- a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
@@ -7,3 +7,15 @@
   [Sandboxed iframe with tuple origin sends referrers.]
     expected: TIMEOUT
 
+  [Sandboxed iframe with tuple origin sends referrers to subresources]
+    expected: NOTRUN
+
+  [Sandboxed iframe with opaque origin doesn't send referrers on navigation]
+    expected: NOTRUN
+
+  [Sandboxed iframe with opaque origin doesn't send referrers to subresources]
+    expected: TIMEOUT
+
+  [Sandboxed iframe with tuple origin sends referrers on navigation]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 2f2f3588b86..fd678b765ae 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -620,3 +620,9 @@
   [X SNR (-288.2714546901987 dB) is not greater than or equal to 65.737. Got -288.2714546901987.]
     expected: FAIL
 
+  [X SNR (-480.9918233980252 dB) is not greater than or equal to 65.737. Got -480.9918233980252.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t1.6645447185027924e+26\t9.3139332532882690e-1\t1.6645447185027924e+26\t1.7871555155445501e+26\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 1.6645447185027924e+26 at index of 28696.\n\tMax RelError of 1.7871555155445501e+26 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/cors/basic.htm b/tests/wpt/web-platform-tests/cors/basic.htm
index 96cc4b98be9..85d443190db 100644
--- a/tests/wpt/web-platform-tests/cors/basic.htm
+++ b/tests/wpt/web-platform-tests/cors/basic.htm
@@ -6,48 +6,40 @@
 
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src=/common/utils.js></script>
 <script src=support.js?pipe=sub></script>
 <div id=log></div>
 
 <script>
+function cors(desc, scheme, subdomain = "", port = location.port) {
+    const sameorigin = !scheme;
+    const base =
+        sameorigin ? "" : `${scheme}://${subdomain}${location.hostname}:${port}${dirname(location.pathname)}`;
 
-var counter = 0;
-
-function cors(desc, scheme, subdomain, port) {
-    if (!scheme) {
-        var url = "";
-    } else {
-        if (!port) {
-            port = location.port;
-        }
-        var url = scheme + "://" + (subdomain ? subdomain + "." : "") + location.hostname + ":" + port + dirname(location.pathname)
-    }
-    async_test(desc).step(function() {
-        var client = new XMLHttpRequest();
-        this.count = counter++;
-
-        client.open("GET", url + "resources/cors-makeheader.py?get_value=hest_er_best&origin=none&" + this.count);
-
-        client.onreadystatechange = this.step_func(function(e) {
-            // First request, test that it fails with no origin
-            if (client.readyState < 4) return;
-            if (!url)
-                assert_true(client.response.indexOf("hest_er_best") != -1, "Got response");
-            else
-                assert_false(!!client.response, "Got CORS-disallowed response");
-
-            client = new XMLHttpRequest();
-            client.open("GET", url + "resources/cors-makeheader.py?get_value=hest_er_best&" + this.count);
-            client.onreadystatechange = this.step_func(function(e) {
-                // Second request, test that it passes with the allowed-origin
-                if (client.readyState < 4) return;
-                assert_true(client.response.indexOf("hest_er_best") != -1, "Got CORS-allowed response");
-                this.done();
-            });
-            client.send();
-        });
+    async_test((t) => {
+        const client = new XMLHttpRequest();
+        client.open("GET", `${base}resources/cors-makeheader.py?get_value=hest_er_best&origin=none&${token()}`);
         client.send();
-    });
+
+        client.onload = t.step_func_done(() => {
+            assert_true(sameorigin, "Cross origin request must be rejected.");
+            assert_true(client.response.includes("hest_er_best"), "Got response");
+        });
+        client.onerror = t.step_func_done(() => {
+            assert_false(sameorigin, "Same origin request must be accepted.");
+        });
+    }, `${desc}, origin: none`);
+
+    async_test((t) => {
+        const client = new XMLHttpRequest();
+        client.open("GET", `${base}resources/cors-makeheader.py?get_value=hest_er_best&${token()}`);
+        client.send();
+
+        client.onload = t.step_func_done(() => {
+            assert_true(client.response.includes("hest_er_best"), "Got response");
+        });
+        client.onerror = t.unreached_func("Should be accepted");
+    }, `${desc}, origin: echo`);
 }
 
 cors("Same domain basic usage");
diff --git a/tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py b/tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py
index a860f6fcdea..e0576a003df 100644
--- a/tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py
+++ b/tests/wpt/web-platform-tests/cors/resources/cors-makeheader.py
@@ -3,7 +3,7 @@ import json
 from wptserve.utils import isomorphic_decode
 
 def main(request, response):
-    origin = request.GET.first(b"origin", request.headers.get(b'origin'))
+    origin = request.GET.first(b"origin", request.headers.get(b'origin') or b'none')
 
     if b"check" in request.GET:
         token = request.GET.first(b"token")
diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht
index 7c8e252de39..245d49c10b7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-001-ref.xht
@@ -10,9 +10,9 @@ div {position:absolute; border:green 4px solid}
 <!-- the height for table cells includes the border -->
 <div>
 <table cellspacing="0">
-  <tbody><tr><td style="border:solid 4px orange; height:34px">cell 1</td></tr>
+  <tbody><tr><td style="border:solid 4px orange; height:30px">cell 1</td></tr>
 </tbody></table>
 </div>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht
index c0c95d7bb4e..c2658c7a1cb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/tables/border-collapse-offset-002-ref.xht
@@ -11,9 +11,9 @@ caption {border:solid 4px green}
 
 <table cellpadding="0" cellspacing="0"><caption>caption</caption>
   <tbody><tr>
-    <td style="border:solid 4px orange; width:102px; height:34px">cell 1</td>
+    <td style="border:solid 4px orange; width:102px; height:32px">cell 1</td>
   </tr>
 </tbody></table>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-abspos-child-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-items-center-nested-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001a.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-001b.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-005.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-005.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-006.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-007.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-008.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-baseline-horiz-008.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-baseline-horiz-008.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-block.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-block.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-001-table.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-001-table.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-005-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-005-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-005.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-005.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-horiz-005.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-stretch-vert-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-stretch-vert-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-005.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-vert-rtl-005.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-anonymous-items-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-anonymous-items-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-anonymous-items-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-anonymous-items-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-anonymous-items-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-horiz-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-horiz-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html
similarity index 91%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html
index 5419833c5c3..f200983b7ab 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001-ref.html
@@ -12,8 +12,7 @@
   <title>CSS Reftest Reference</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html
index 2d5b1124fd5..97963fb41e6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-align-self-baseline-vert-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html
@@ -17,8 +17,7 @@
   <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-baselines">
   <link rel="match" href="flexbox-baseline-align-self-baseline-vert-001-ref.html">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html
index 8642391fa8d..21139d36461 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001-ref.html
@@ -10,8 +10,7 @@
   <title>CSS Reftest Reference</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       font: 20px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001a.html
similarity index 92%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001a.html
index fc6898881b0..50334acc8ba 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001a.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001a.html
@@ -20,8 +20,7 @@
   <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-baselines">
   <link rel="match" href="flexbox-baseline-empty-001-ref.html">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       font: 20px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001b.html
similarity index 92%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001b.html
index aea906e0484..2195df4f543 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-empty-001b.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-empty-001b.html
@@ -20,8 +20,7 @@
   <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-baselines">
   <link rel="match" href="flexbox-baseline-empty-001-ref.html">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       font: 20px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-horiz-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-horiz-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html
index 04e916ce777..1cd4fa95c7c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001-ref.html
@@ -12,8 +12,7 @@
   <title>CSS Reftest Reference</title>
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html
similarity index 92%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html
index 507166da35d..06c2f7063e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001a.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001a.html
@@ -18,8 +18,7 @@
   <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-baselines">
   <link rel="match" href="flexbox-baseline-multi-item-vert-001-ref.html">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html
similarity index 92%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html
index 3c0f984a12f..6928bba97fb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-item-vert-001b.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-item-vert-001b.html
@@ -18,8 +18,7 @@
   <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-baselines">
   <link rel="match" href="flexbox-baseline-multi-item-vert-001-ref.html">
   <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css" />
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
     body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-horiz-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-horiz-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-multi-line-vert-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-baseline-single-item-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-baseline-single-item-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-horiz-001v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-horiz-001v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-block-vert-001v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-block-vert-001v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-horiz-001v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-horiz-001v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-canvas-vert-001v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-canvas-vert-001v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-fieldset-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-fieldset-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-iframe-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-iframe-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-img-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-img-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-textarea-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-textarea-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-basic-video-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-basic-video-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-horiz-002b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-horiz-002b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-break-request-vert-002b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-break-request-vert-002b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-baseline-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-baseline-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-collapsed-item-horiz-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-collapsed-item-horiz-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-column-row-gap-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-column-row-gap-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-definite-sizes-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-definite-sizes-005.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-dyn-resize-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-dyn-resize-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-dyn-resize-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-dyn-resize-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-dyn-resize-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html
index a3416a37935..3ed3687cf0e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001a.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001a.html
index 259b8c2b5d8..1ac926498cb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001a.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001a.html
@@ -12,8 +12,7 @@
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis">
   <link rel="match" href="flexbox-flex-basis-content-001-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001b.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001b.html
index 52aae36eaea..b41fd409b74 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-001b.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-001b.html
@@ -13,8 +13,7 @@
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis">
   <link rel="match" href="flexbox-flex-basis-content-001-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html
index bb845e35e26..35b4b783a1a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002a.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002a.html
index 4281959a3d8..68c67987dd8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002a.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002a.html
@@ -12,8 +12,7 @@
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis">
   <link rel="match" href="flexbox-flex-basis-content-002-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002b.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002b.html
index a76f24681a7..d6d4171eed1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-002b.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-002b.html
@@ -13,8 +13,7 @@
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#propdef-flex-basis">
   <link rel="match" href="flexbox-flex-basis-content-002-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-003b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-003b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-basis-content-004b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-basis-content-004b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-flow-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-flow-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-horiz-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-horiz-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-flex-wrap-vert-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-flex-wrap-vert-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-items-as-stacking-contexts-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-items-as-stacking-contexts-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001a.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001a.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001a.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001b.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-001b.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-001b.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-005.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-005.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-006-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-006-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-006.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-horiz-006.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-horiz-006.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001a.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001a.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001b.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-001b.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-001b.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-005.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-005.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-006-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-006-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-006.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-006.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-vert-006.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-wmvert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-wmvert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-wmvert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-wmvert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-justify-content-wmvert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-margin-auto-horiz-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-margin-auto-horiz-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-reverse.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-reverse.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
similarity index 99%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
index 51186205db6..b09f121fe77 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
@@ -5,7 +5,7 @@
 -->
 <!-- Testcase with borders on flex items, and "direction: rtl" and
      "flex-direction: row-reverse" to *doubly* reverse the flex container's
-     main axis. --> 
+     main axis. -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>CSS Test: Testing borders on flex items in a row-reverse horizontal flex container, with 'direction: rtl'</title>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001-rtl.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002a.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002a.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002a.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002b.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002b.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002b.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-002v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-002v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-reverse.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003-reverse.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003-reverse.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003v.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-003v.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-003v.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-004.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-mbp-horiz-004.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002c.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002c.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-002c.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002c.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-height-auto-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002c.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002c.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-002c.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-002c.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-min-width-auto-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-width-auto-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-horiz-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-horiz-005.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-overflow-vert-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-overflow-vert-005.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-paint-ordering-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-paint-ordering-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001a.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001a.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001a.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001a.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001b.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-root-node-001b.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-root-node-001b.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-safe-overflow-position-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-safe-overflow-position-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-safe-overflow-position-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-safe-overflow-position-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-safe-overflow-position-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-1.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-1.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-2.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-2.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-single-line-clamp-3.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-single-line-clamp-3.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-horiz-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-horiz-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-sizing-vert-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-sizing-vert-002.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-table-fixup-001.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-table-fixup-001.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001-ref.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001a.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001a.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001a.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001b.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-001b.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-001b.xhtml
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002-ref.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002-ref.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml
index b7de647279d..eeeebb482d3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002-ref.xhtml
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002-ref.xhtml
@@ -12,7 +12,7 @@
   <head>
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="stylesheet" type="text/css" href="support/ahem.css" />
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"/>
     <style>
       div { height: 100px; }
       div.flexbox {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002.xhtml b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002.xhtml
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml
index e7d00d2f294..c80947f8122 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-whitespace-handling-002.xhtml
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-whitespace-handling-002.xhtml
@@ -14,7 +14,7 @@
     <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
     <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-items"/>
     <link rel="match" href="flexbox-whitespace-handling-002-ref.xhtml"/>
-    <link rel="stylesheet" type="text/css" href="support/ahem.css" />
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css"/>
     <style>
       div { height: 100px; }
       div.flexbox {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-with-pseudo-elements-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-with-pseudo-elements-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-002.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-003.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-003.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-004.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-004.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-005.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-005.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-006.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-006.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-007-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-007.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-007.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-007.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-008.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-008.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-009.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-009.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010-ref.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010-ref.html
index 0301e838d28..d30d71e4d2c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010.html
index b7c44b26bab..542bde16ce5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-010.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-010.html
@@ -14,8 +14,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-010-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011-ref.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011-ref.html
index d1e0018a276..0f97d42ce5a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011.html
index 9e7d2a9b459..697edb9be00 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-011.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-011.html
@@ -14,8 +14,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-011-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012-ref.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012-ref.html
index 93623410577..7d6ca8e5654 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012.html
index ecbbe6a5f7d..b722d459e14 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-012.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-012.html
@@ -15,8 +15,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-012-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013-ref.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013-ref.html
index dd7fe458833..d57e801aec1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013.html
index 22deeb285d9..3d90e712027 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-013.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-013.html
@@ -14,8 +14,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-013-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014-ref.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014-ref.html
index c1959c3678f..d57910ee616 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014.html
index e1559faf5e6..299229b1c3b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-014.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-014.html
@@ -14,8 +14,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-014-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015-ref.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015-ref.html
index ca116669b1d..c8df3cbb878 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015-ref.html
@@ -8,8 +8,7 @@
   <title>CSS Reftest Reference</title>
   <meta charset="utf-8">
   <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: block;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015.html
index 69c16f15dfc..eb7fa1b981c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-015.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-015.html
@@ -15,8 +15,7 @@
   <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
   <link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
   <link rel="match" href="flexbox-writing-mode-015-ref.html">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
   .container {
     display: flex;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-016-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-016-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-016.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-writing-mode-016.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexbox-writing-mode-016.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-001-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-001.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-001.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002.html b/tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/position-absolute-containing-block-002.html
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html
index 303d2b6a6b5..c4111f7aeb1 100644
--- a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-computed.html
@@ -16,6 +16,8 @@ test_computed_value("resize", "none");
 test_computed_value("resize", "both");
 test_computed_value("resize", "horizontal");
 test_computed_value("resize", "vertical");
+test_pseudo_computed_value("::before", "resize", "both");
+test_pseudo_computed_value("::after", "resize", "vertical");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html b/tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html
new file mode 100644
index 00000000000..462a81118bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/resize-generated-content.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Basic User Interface Test: resize - generated content</title>
+<meta name="assert" content="The resize property should not apply to generated content, the behavior is undefined">
+<link rel="help" href="http://drafts.csswg.org/css-ui/#resize">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<style>
+  #test::before {
+    content: "";
+    display: block;
+    width: 100px;
+    height: 100px;
+    overflow: hidden;
+    resize: both;
+    background: green;
+  }
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div id="test"></div>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
deleted file mode 100644
index 517b7f465dd..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <style>
-      div.flexbox {
-        width: 20px;
-        height: 200px;
-        margin-right: 2px;
-        float: left;
-        background: lightgray;
-      }
-      div.a {
-        width: 20px;
-        height: 10px;
-        background: lightgreen;
-      }
-      div.b {
-        width: 20px;
-        height: 30px;
-        background: pink;
-      }
-      div.c {
-        width: 20px;
-        height: 40px;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 10px;
-        height: 30px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-top:80px; height:110px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-top:40px; height: 70px"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 80px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 60px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-top: 60px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-top: 60px"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 40px"/>
-      <div class="b" style="margin-top: 80px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 20px"/>
-      <div class="b" style="margin-top: 40px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-top: 40px"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: calc(160px / 3)"/>
-      <div class="b" style="margin-top: calc(160px / 3)"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 30px"/>
-      <div class="b" style="margin-top: 30px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-top: 30px"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-top: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
deleted file mode 100644
index bb592b74a8b..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a horizontal flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-horiz-001-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 20px; /* Skinny, to force us to wrap */
-        height: 200px;
-        display: flex;
-        flex-wrap: wrap;
-        margin-right: 2px;
-        float: left;
-        background: lightgray;
-      }
-      div.a {
-        width: 20px;
-        height: 10px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: 20px;
-        height: auto; /* height comes from contents */
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 20px;
-        height: 40px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 10px;
-        height: 30px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
deleted file mode 100644
index 3de740e9a3f..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. Additionally,
-     the flex container derives its width from the "max-width" property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a horizontal flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-horiz-001-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        max-width: 20px; /* Skinny, to force us to wrap */
-        height: 200px;
-        display: flex;
-        flex-wrap: wrap;
-        margin-right: 2px;
-        float: left;
-        background: lightgray;
-      }
-      div.a {
-        height: 10px;
-        width: 20px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        height: auto; /* height comes from contents */
-        width: 20px;
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        height: 40px;
-        width: 20px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 10px;
-        height: 30px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml
deleted file mode 100644
index f0d286494e4..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <style>
-      div.flexbox {
-        width: 20px;
-        height: 200px;
-        margin-right: 2px;
-        float: left;
-        background: lightgray;
-      }
-      div.a {
-        width: 20px;
-        height: 10px;
-        background: lightgreen;
-      }
-      div.b {
-        width: 20px;
-        height: 30px;
-        background: pink;
-      }
-      div.c {
-        width: 20px;
-        height: 40px;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 10px;
-        height: 30px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="height:110px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top:80px"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top:40px"/>
-      <div class="b" style="height: 70px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top:40px"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-top: 80px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top: 60px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: 160px"/>
-    </div>
-    <div class="flexbox">
-      <div class="c"/>
-      <div class="b" style="margin-top: 60px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: 60px"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-top: 40px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: 80px"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top: 20px"/>
-      <div class="b" style="margin-top: 40px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: 40px"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-top: calc(160px / 3)"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: calc(160px / 3)"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top: 30px"/>
-      <div class="b" style="margin-top: 30px"><div class="fixedSizeChild"/></div>
-      <div class="a" style="margin-top: 30px"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox">
-      <div class="a" style="margin-top: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-top: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml
deleted file mode 100644
index 902b26ba23e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of row wrap-reverse flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a row wrap-reverse flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-horiz-002-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 20px; /* Skinny, to force us to wrap */
-        height: 200px;
-        display: flex;
-        flex-wrap: wrap-reverse;
-        margin-right: 2px;
-        float: left;
-        background: lightgray;
-      }
-      div.a {
-        width: 20px;
-        height: 10px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: 20px;
-        height: auto; /* height comes from contents */
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 20px;
-        height: 40px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 10px;
-        height: 30px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
deleted file mode 100644
index ef2a0685f25..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        margin-bottom: 2px;
-        background: lightgray;
-        height: 10px;
-        clear: all;
-      }
-      div.a {
-        width: 10px;
-        height: 10px;
-        background: lightgreen;
-        float: left;
-      }
-      div.b {
-        width: 30px;
-        height: 10px;
-        background: pink;
-        float: left;
-      }
-      div.c {
-        width: 40px;
-        height: 10px;
-        background: orange;
-        float: left;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 5px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left:80px; width:110px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 40px; width: 70px"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 80px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 60px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 160px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 60px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 60px"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 40px"/>
-      <div class="b" style="margin-left: 80px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 20px"/>
-      <div class="b" style="margin-left: 40px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 40px"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: calc(160px / 3)"/>
-      <div class="b" style="margin-left: calc(160px / 3)"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 30px"/>
-      <div class="b" style="margin-left: 30px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 30px"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
deleted file mode 100644
index 678b7f5096e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of vertical flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a vertical flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-vert-001-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        height: 10px; /* Short, to force us to wrap */
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        margin-bottom: 2px;
-        background: lightgray;
-      }
-      div.a {
-        width: 10px;
-        height: 10px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: auto; /* width comes from contents */
-        height: 10px;
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 40px;
-        height: 10px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 5px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
deleted file mode 100644
index faed08350aa..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of vertical flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. Additionally,
-     the flex container derives its height from the "max-height" property.-->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a vertical flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-vert-001-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        max-height: 10px; /* Short, to force us to wrap */
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        margin-bottom: 2px;
-        background: lightgray;
-      }
-      div.a {
-        width: 10px;
-        height: 10px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: auto; /* width comes from contents */
-        height: 10px;
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 40px;
-        height: 10px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 5px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml
deleted file mode 100644
index b514d840489..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        margin-bottom: 2px;
-        background: lightgray;
-        height: 20px;
-        clear: all;
-      }
-      div.a {
-        width: 10px;
-        height: 20px;
-        background: lightgreen;
-        float: right;
-      }
-      div.b {
-        width: 30px;
-        height: 20px;
-        background: pink;
-        float: right;
-      }
-      div.c {
-        width: 40px;
-        height: 20px;
-        background: orange;
-        float: right;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 10px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-right:80px; width:110px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-right: 40px; width: 70px"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox">
-      <div class="a" style="margin-right: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox">
-      <div class="a" style="margin-right: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 80px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 60px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-right: 160px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-right: 60px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-right: 60px"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox">
-      <div class="a" style="margin-right: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 40px"/>
-      <div class="b" style="margin-right: 80px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 20px"/>
-      <div class="b" style="margin-right: 40px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-right: 40px"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox">
-      <div class="a" style="margin-right: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: calc(160px / 3)"/>
-      <div class="b" style="margin-right: calc(160px / 3)"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 30px"/>
-      <div class="b" style="margin-right: 30px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-right: 30px"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox">
-      <div class="a" style="margin-right: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-right: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml
deleted file mode 100644
index b4a8ccf3dd1..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of column wrap-reverse flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a column wrap-reverse flex container</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-vert-002-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        height: 20px; /* Short, to force us to wrap */
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap-reverse;
-        margin-bottom: 2px;
-        background: lightgray;
-      }
-      div.a {
-        width: 10px;
-        height: 20px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: auto; /* width comes from contents */
-        height: 20px;
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 40px;
-        height: 20px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 10px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml
deleted file mode 100644
index 2902a09c163..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        margin-bottom: 2px;
-        background: lightgray;
-        height: 20px;
-        clear: all;
-      }
-      div.a {
-        width: 10px;
-        height: 20px;
-        background: lightgreen;
-        float: left;
-      }
-      div.b {
-        width: 30px;
-        height: 20px;
-        background: pink;
-        float: left;
-      }
-      div.c {
-        width: 40px;
-        height: 20px;
-        background: orange;
-        float: left;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 10px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left:80px; width:110px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 40px; width: 70px"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 160px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 80px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 60px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 160px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b" style="margin-left: 60px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 60px"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 40px"/>
-      <div class="b" style="margin-left: 80px"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 20px"/>
-      <div class="b" style="margin-left: 40px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 40px"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 95px"/>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: calc(160px / 3)"/>
-      <div class="b" style="margin-left: calc(160px / 3)"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a" style="margin-left: 30px"/>
-      <div class="b" style="margin-left: 30px"><div class="fixedSizeChild"/></div>
-      <div class="c" style="margin-left: 30px"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox">
-      <div class="a" style="margin-left: 190px"/>
-    </div>
-    <div class="flexbox">
-      <div class="b" style="margin-left: 160px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="c" style="margin-left: 120px"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml
deleted file mode 100644
index e0c40a72553..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
-     testing each possible value of the 'align-content' property. -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>CSS Test: Testing 'align-content' in a vertical writing-mode flex container</title>
-    <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com"/>
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
-    <link rel="match" href="flexbox-align-content-wmvert-001-ref.xhtml"/>
-    <style>
-      div.flexbox {
-        width: 200px;
-        height: 20px; /* Short, to force us to wrap */
-        display: flex;
-        flex-wrap: wrap;
-        margin-bottom: 2px;
-        background: lightgray;
-        writing-mode: vertical-lr;
-      }
-      div.a {
-        width: 10px;
-        height: 20px;
-        flex: none;
-        background: lightgreen;
-      }
-      div.b {
-        width: auto;
-        height: 20px; /* height comes from contents */
-        flex: none;
-        background: pink;
-      }
-      div.c {
-        width: 40px;
-        height: 20px;
-        flex: none;
-        background: orange;
-      }
-
-      /* Inside of 'b': */
-      div.fixedSizeChild {
-        width: 30px;
-        height: 10px;
-        background: purple;
-      }
-    </style>
-  </head>
-  <body>
-
-    <!-- default (stretch) -->
-    <div class="flexbox">
-      <div class="a"/>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-start -->
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-start">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- flex-end -->
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: flex-end">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- center -->
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: center">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-between -->
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-between">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-around -->
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-around">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- space-evenly -->
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: space-evenly">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- start -->
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-
-    <!-- end -->
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
-      <div class="a"/>
-    </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-    </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
-      <div class="a"/>
-      <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="c"/>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/ahem.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/ahem.css
deleted file mode 100644
index 82ee466791e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/ahem.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(./Ahem.ttf);
-}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/solidblue.png b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/solidblue.png
deleted file mode 100644
index a64b6a4255c9f99fd7bb87449a6d798a3c7f039d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-MC9V-A
z!TD(=<%vb93;~Imc_n&&t|1C##(D;ZGV4@afoh~YT^vI!PA8`btowi7fiXeGG~r4^
dAah$cBg3=Pl8P(8`~sQG;OXk;vd$@?2>@O)C0qai

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001-ref.html
index 580bcd3fbbc..db4f23c886c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001-ref.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>CSS Reference: Ruby with text-combine-upright in base</title>
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001a.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001a.html
index a35772ac074..bdb87e29b9b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001a.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001a.html
@@ -6,7 +6,7 @@
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
   <link rel="help" href="https://drafts.csswg.org/css-ruby-1/#ruby-align-property">
   <link rel="match" href="ruby-text-combine-upright-001-ref.html">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001b.html
index 4997bdc9bf6..8aed0146b54 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-001b.html
@@ -6,7 +6,7 @@
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
   <link rel="help" href="https://drafts.csswg.org/css-ruby-1/#ruby-align-property">
   <link rel="match" href="ruby-text-combine-upright-001-ref.html">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002-ref.html
index 796cd90b8b1..1bb4386e7ab 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002-ref.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>CSS Reference: Ruby with text-combine-upright annotation</title>
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002a.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002a.html
index 411c5b24806..6c95c169e24 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002a.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002a.html
@@ -6,7 +6,7 @@
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
   <link rel="help" href="https://drafts.csswg.org/css-ruby-1/#ruby-align-property">
   <link rel="match" href="ruby-text-combine-upright-002-ref.html">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002b.html
index df57bf886ab..ed7dabb0269 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/ruby-text-combine-upright-002b.html
@@ -6,7 +6,7 @@
   <link rel="author" title="Xidorn Quan" href="mailto:csswg@upsuper.org">
   <link rel="help" href="https://drafts.csswg.org/css-ruby-1/#ruby-align-property">
   <link rel="match" href="ruby-text-combine-upright-002-ref.html">
-  <link rel="stylesheet" href="support/ahem.css">
+  <link rel="stylesheet" href="/fonts/ahem.css">
   <style>
     .test {
       font: 52px Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/ahem.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/ahem.css
deleted file mode 100644
index 82ee466791e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/ruby/support/ahem.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(./Ahem.ttf);
-}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1-ref.html
index ae170ffd9a2..c52d3aa4cd5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1-ref.html
@@ -3,9 +3,8 @@
   <title>CSS Reference Case: Basic cases with max-content and min-content</title>
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a.html
index 74314e52569..22193a9fd0e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a.html
@@ -7,9 +7,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="block-size-with-min-or-max-content-1-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1b.html
index ab510fab930..35174cd8857 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1b.html
@@ -7,9 +7,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="block-size-with-min-or-max-content-1-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
index 6d56cca0462..263a0869aed 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
@@ -6,9 +6,8 @@
   </title>
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html, body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
index 57a165d317c..68860be2234 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="hori-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html, body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
index 0e2e449bfb7..172f00d58ee 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
@@ -6,9 +6,8 @@
   </title>
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
index 232753c7098..8592c7d66bf 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
index 5ee74f98114..f7844a0b34e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/ahem.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/ahem.css
deleted file mode 100644
index 82ee466791e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/support/ahem.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(./Ahem.ttf);
-}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
index 647fccc8e22..0a5de8da146 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html
@@ -6,9 +6,8 @@
   </title>
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
index 741c03992d7..15fdaa9dacc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-1.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="vert-block-size-small-or-larger-than-container-with-min-or-max-content-1-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
index 55d6965adfc..5a170d5c4c3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html
@@ -6,9 +6,8 @@
   </title>
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
index 0b97a41f488..8b863db4045 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
index 4167c674870..55223533a2e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
@@ -9,9 +9,8 @@
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
   <link rel="match" href="vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
   <meta name="flags" content="ahem">
-  <link rel="stylesheet" type="text/css" href="support/ahem.css">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
-  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style>
     html,body {
       margin: 0;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-1.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-1.html
index b8848622e5a..7c2b820bee0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-1.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-1.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-removable-ref.html">
 <meta name="assert" content="Test checks that a collapsible segment break should be removed correctly,
 if the character immediately before/after the segment break is the zero-width space character (U+200B),
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-2.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-2.html
index ef78b57196d..47bbaddfef8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-2.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-2.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-removable-ref.html">
 <meta name="assert" content="Test checks that multiple segment breaks should be removed correctly,
 if the character immediately before/after the segment breaks is the zero-width space character (U+200B),
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-3.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-3.html
index 4c09dabf114..fd0ff31607d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-3.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-3.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-removable-ref.html">
 <meta name="assert" content="Test checks that a sequence which consists of a collapsible segment break
 surrounded by multiple white spaces should be removed correctly,
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-4.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-4.html
index 835c146e930..6fb51beeae3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-4.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-4.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-removable-ref.html">
 <meta name="assert" content="Test checks that a sequence which consists of multiple collapsible
 segment breaks mixed with multiple white spaces should be removed correctly,
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-ref.html
index 5964fa593df..0fa64d71dfe 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-removable-ref.html
@@ -5,7 +5,7 @@
 <title>CSS Text 4.1.2. Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { line-height: 1; font-family: ahem; } </style>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001-ref.html
index f66bccefcb7..62bc0f69903 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001.html
index 4488e93569c..7c80115ae4b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-001.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-001-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002-ref.html
index b01ea124e4a..1827ec05b3f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002.html
index be2b77c0888..efd26a55cfb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-002.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-002-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003-ref.html
index c82aa1c1846..12df12e09bf 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨ測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003.html
index cf6847f8600..2461cc9cf73 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-003.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-003-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004-ref.html
index 5b94f905d34..1c218c2f61e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨ&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004.html
index b968a215cc0..26a5986bafe 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-004.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-004-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005-ref.html
index 7899dbaa0e7..d51e638a316 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨ&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005.html
index 8faf540fa86..41de8899f98 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-005.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-005-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006-ref.html
index 02845041f15..c07f3c5f962 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨ&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006.html
index 7887f2e173c..83eebb05218 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-006.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-006-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007-ref.html
index 82a674ba2bb..602e9c151c2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ＦＵＬＬＷＩＤＴＨ&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007.html
index 96298559192..46c27e6b179 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-007.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Full-width (F)/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-007-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008-ref.html
index fdb0abe18be..a5e36f8d70e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ﾃｽﾄＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008.html
index 48a9b5bccd1..756422f7fbc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-008.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-008-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009-ref.html
index 225a033ea36..94c5f29f890 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ﾃｽﾄﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009.html
index c8c6a96131a..8d41c8477db 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-009.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-009-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010-ref.html
index ff1f441f83e..1e8296b3198 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>ﾃｽﾄ測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010.html
index 1aa9253df31..24504d3b034 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-010.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-010-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011-ref.html
index 5df8d43d2e4..394acf0b5f5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ﾃｽﾄ&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011.html
index 923a0f57b39..017801fd0bb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-011.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-011-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012-ref.html
index dfec0f4646a..ef2030a5cf9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ﾃｽﾄ&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012.html
index 2e0a6eef1f6..22b012f3f64 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-012.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-012-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013-ref.html
index b0b9ad58b9e..4b71f6f1f05 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ﾃｽﾄ&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013.html
index 4346d7af0e9..74f5f4dd4e9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-013.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-013-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014-ref.html
index 040b4410b34..6a92922f487 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>ﾃｽﾄ&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014.html
index 9e9d80d6057..693763a9c2e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-014.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Half-width (H)/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-014-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015-ref.html
index 2a281589329..53d4d367656 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>測試ＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015.html
index f6a379479f9..c063d9f2314 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-015.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-015-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016-ref.html
index 339aaa4ab9c..705ceddcc85 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>測試ﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016.html
index a2b60d0893b..f3cc8f6bf65 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-016.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-016-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017-ref.html
index ede6f889dad..fd04992ac53 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>測試測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017.html
index 1ee94d9f753..fe85a65e4b5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-017.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-017-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is NO white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018-ref.html
index a4ac3be9762..d42603b9a89 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>測試&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018.html
index 6884e7e0649..fa4d5515b2a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-018.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-018-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019-ref.html
index a4106d7bd3e..9e499adb01d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>測試&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019.html
index b02af78878e..a442ca7cc81 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-019.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-019-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020-ref.html
index 95224a24a84..4ed13984fc0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>測試&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020.html
index b946a38443e..6e25a4523db 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-020.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-020-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021-ref.html
index 55c414a206f..13a8d12c655 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>測試&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021.html
index 947edc6af0b..db373d6b3d4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-021.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Wide (W) except Hangul/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-021-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022-ref.html
index 1dc537bc341..58c224e3f3e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;ＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022.html
index bae2f82c6ec..f13b581f652 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-022.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-022-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023-ref.html
index 0fe815bbebb..12f4df127b7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;ﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023.html
index e95cb479ada..423a4ec2102 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-023.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-023-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024-ref.html
index 096aab333da..18e2af4f5e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024.html
index eb3e102d718..d49a1701601 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-024.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-024-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025-ref.html
index 1e797d5194e..384bcaf1ecc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025.html
index b08bd0025c2..36be6391c68 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-025.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-025-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026-ref.html
index 269ef7a4f19..56ae5a0a536 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026.html
index 99fff6a4bad..56dddce4918 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-026.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-026-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027-ref.html
index bf678c7c20f..b5fb675abec 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027.html
index 1643198d323..c0d24e11a9d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-027.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-027-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028-ref.html
index 642e21f334d..dbcca9389a7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>narrow&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028.html
index 33a2af2bdd3..4b9857b01e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-028.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Narrow (Na)/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-028-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029-ref.html
index 69b43f61e70..1803b4e1648 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;ＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029.html
index 3cab89d1886..4950374456c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-029.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-029-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030-ref.html
index 3c3cc2658a4..6fdfff16a3b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;ﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030.html
index b0a06881958..398117d22e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-030.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-030-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031-ref.html
index 4902bf1e784..3d14600e432 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031.html
index df1bf143045..2ca442e6e86 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-031.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-031-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032-ref.html
index a2bd3b472b9..c2b8451c964 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032.html
index 2d1a91015b8..62fe0f26c14 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-032.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-032-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033-ref.html
index 0b3ab3e9286..bbeeeabd5cc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033.html
index 3b83a47579d..4663e4aa008 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-033.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-033-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034-ref.html
index 3c55aa257b1..4949f59db27 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034.html
index 89b12125f5e..3378077c53d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-034.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-034-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035-ref.html
index 5160d4a7c9f..0e64bb2c9f1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>■&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035.html
index a7d01eb751a..08b310bacbb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-035.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with East Asian Ambiguous (A)/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-035-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036-ref.html
index f15f8c68530..1b9242d08fa 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;ＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036.html
index 9ce839cf442..5eef20dec6c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-036.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-036-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037-ref.html
index 9716239f3de..d3205b4c3db 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;ﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037.html
index a4e97d56b4c..2bd4ca1fee0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-037.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-037-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038-ref.html
index a24b5d42969..0873382eff0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038.html
index d2069e10c2d..57f78fecdc3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-038.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-038-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039-ref.html
index b20aa3ba938..2a62fa149c9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039.html
index d8d3d77cdc8..55e7cc208f1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-039.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-039-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040-ref.html
index 1efeb681328..9505af9af7d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040.html
index 3786d843413..cb26c669bd9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-040.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-040-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041-ref.html
index 21fe9aa3051..f3d0918a41a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041.html
index 5d7d4fea621..62d29356cf0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-041.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-041-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042-ref.html
index f164d1bd3b7..979ca514a86 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>آزمون&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042.html
index 25e4e161e87..a067773171f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-042.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Not East Asian (Neutral)/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-042-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043-ref.html
index 657ea9dd04f..2d467b0dfbb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;ＦＵＬＬＷＩＤＴＨ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043.html
index ef44694b75a..de3f1941d61 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-043.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/East Asian Full-width (F) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-043-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044-ref.html
index 93cb2234e73..89dcd61291a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;ﾃｽﾄ</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044.html
index 22488c8b673..9dafd2e7571 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-044.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/East Asian Half-width (H) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-044-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045-ref.html
index 7839b74dad4..d788c276b54 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;測試</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045.html
index 988b89b90e8..719dc917c6b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-045.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/East Asian Wide (W) except Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-045-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046-ref.html
index 5a457be71b3..50b7733edc9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;narrow</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046.html
index 5d39f46604a..8e04c8e00d5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-046.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/East Asian Narrow (Na) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-046-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047-ref.html
index c3e890c66b1..a63575d11e4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;■</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047.html
index c67c95a0f3a..81b95a1a59d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-047.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/East Asian Ambiguous (A) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-047-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048-ref.html
index e27b09d3fad..55bb19bbbff 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;آزمون</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048.html
index a39a0ff57ba..f578fa0145b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-048.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/Not East Asian (Neutral) in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-048-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049-ref.html
index f1cce478a10..77b1348f653 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>테스트&#x0020;테스트</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049.html
index b96db3bbb71..a55af42b45a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-rules-049.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with Hangul/Hangul in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-049-ref.html">
 <style> p { font-family: ahem; } </style>
 <div>Pass if there is ONE white space between the two strings below.
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-1.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-1.html
index cf703157172..4882f06c931 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-1.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-1.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-unremovable-ref.html">
 <meta name="assert" content="Test checks that a collapsible segment break should be converted to a white space (U+0020),
 if both the character before/after the segment break is Hangul.">
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-2.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-2.html
index 2779a642046..6627e0708ea 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-2.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-2.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-unremovable-ref.html">
 <meta name="assert" content="Test checks that multiple segment breaks should be converted to a white space (U+0020),
 if both the character before/after the segment breaks is Hangul.">
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-3.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-3.html
index 5b47806799d..e4b3ab9b734 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-3.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-3.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-unremovable-ref.html">
 <meta name="assert" content="Test checks that a sequence which consists of a collapsible segment break
 surrounded by multiple white spaces should be converted to a white space (U+0020),
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-4.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-4.html
index 194eea2528b..e266f592fc7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-4.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-4.html
@@ -6,7 +6,7 @@
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel="stylesheet" type="text/css" href="support/ahem.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-unremovable-ref.html">
 <meta name="assert" content="Test checks that a sequence which consists of multiple collapsible
 segment breaks mixed with multiple white spaces should be converted to a white space (U+0020),
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-ref.html
index 589da00bbb4..a0112290098 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/segment-break-transformation-unremovable-ref.html
@@ -5,7 +5,7 @@
 <title>CSS Text 4.1.2. Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p { font-family: ahem; } </style>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/ahem.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/ahem.css
deleted file mode 100644
index 82ee466791e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/ahem.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(./Ahem.ttf);
-}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/generate-segment-break-transformation-rules-tests.py b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/generate-segment-break-transformation-rules-tests.py
index 6e13861374a..fc894161bda 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/generate-segment-break-transformation-rules-tests.py
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/support/generate-segment-break-transformation-rules-tests.py
@@ -28,7 +28,7 @@ TEST_TEMPLATE = '''<!DOCTYPE html>
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
 <meta name="assert" content="'segment-break-transformation-rules: with {prev}/{next} in front/back of the semgment break.">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="segment-break-transformation-rules-{index:03}-ref.html">
 <style> p {{ font-family: ahem; }} </style>
 <div>Pass if there is {expect} white space between the two strings below.
@@ -42,7 +42,7 @@ REF_TEMPLATE_REMOVE = '''<!DOCTYPE html>
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p {{ font-family: ahem; }} </style>
 <div>Pass if there is NO white space between the two strings below.
 <p>{0}{1}</p>
@@ -53,7 +53,7 @@ REF_TEMPLATE_KEEP = '''<!DOCTYPE html>
 <title>CSS Reftest Reference: Segment Break Transformation Rules</title>
 <link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style> p {{ font-family: ahem; }} </style>
 <div>Pass if there is ONE white space between the two strings below.
 <p>{0}{2}{1}</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-001.html
index a9bcfd93be7..31bf1b3282c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-001.html
@@ -2,14 +2,14 @@
 <title>CSS Text Test: Word Spacing</title>
 <link rel="author" title="Nicholas Nethercote" href="mailto:nnethercote@mozilla.com">
 <link rel="help" href="http://www.w3.org/TR/css-text-3/#word-spacing">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <link rel="match" href="text-word-spacing-ref.html">
 <meta name="flags" content="ahem">
 <meta name="assert" content="Test checks that word-spacing works with percentages.">
 <style>
 @font-face {
   font-family: Ahem;
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 /* We use Ahem to avoid very minor differences between the test and the
    reference that occur with certain font+platform combinations. */
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-ref.html
index 5cbd7a550c7..f48a0178d5a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/text3/text-word-spacing-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <title>CSS Text Test: Word Spacing</title>
 <link rel="author" title="Nicholas Nethercote" href="mailto:nnethercote@mozilla.com">
-<link rel="stylesheet" type="text/css" href="support/ahem.css" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <meta name="flags" content="ahem">
 <style>
 @font-face {
   font-family: Ahem;
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 /* We use Ahem to avoid very minor differences between the test and the
    reference that occur with certain font+platform combinations. */
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/ahem.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/ahem.css
deleted file mode 100644
index 82ee466791e..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/ahem.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(./Ahem.ttf);
-}
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/external-variable-font-face.css b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/external-variable-font-face.css
index 87f0609ba3d..e3ad1eddb42 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/external-variable-font-face.css
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/support/external-variable-font-face.css
@@ -1,11 +1,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(./Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(./Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName, serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15-ref.html
index f8e3d913720..6679d0de955 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15-ref.html
@@ -5,9 +5,8 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 p {
   font-family: Ahem, sans-serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15.html
index 1b3ca7a9db8..9b0fcffc731 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-15.html
@@ -8,7 +8,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#syntax">
 <link rel="match" href="variable-declaration-15-ref.html">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <style>
 body {
   font-family: serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16-ref.html
index f8e3d913720..6679d0de955 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16-ref.html
@@ -5,9 +5,8 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 p {
   font-family: Ahem, sans-serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16.html
index 41f2b77e294..bb047bb53d6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-16.html
@@ -8,7 +8,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#syntax">
 <link rel="match" href="variable-declaration-16-ref.html">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <style>
 body {
   font-family: serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17-ref.html
index ce24112a6a0..b0075fc38f7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17-ref.html
@@ -5,9 +5,8 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 p {
   font-family: SomeUnknownFont, Ahem;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17.html
index 2e0f0049ec3..f0e3c9c79b3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-17.html
@@ -8,7 +8,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#syntax">
 <link rel="match" href="variable-declaration-17-ref.html">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <style>
 body {
   font-family: serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18-ref.html
index f8e3d913720..6679d0de955 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18-ref.html
@@ -5,9 +5,8 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 p {
   font-family: Ahem, sans-serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18.html
index 8b2880f0944..7262e375e61 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-declaration-18.html
@@ -8,7 +8,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#syntax">
 <link rel="match" href="variable-declaration-18-ref.html">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <style>
 body {
   font-family: serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-external-font-face-01-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-external-font-face-01-ref.html
index b84d1ff44c4..3e7fd9a2636 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-external-font-face-01-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-external-font-face-01-ref.html
@@ -5,7 +5,7 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
 <p style="font-family: serif">This text must not be in Ahem.</p>
 <p style="font-family: Ahem">But this text must be in Ahem.</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01-ref.html
index b84d1ff44c4..3e7fd9a2636 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01-ref.html
@@ -5,7 +5,7 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
 <p style="font-family: serif">This text must not be in Ahem.</p>
 <p style="font-family: Ahem">But this text must be in Ahem.</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html
index cbb7a4f4e6d..168d970075d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-01.html
@@ -12,11 +12,11 @@
 @font-face {
   --a: MyTestFontName;
   font-family: var(--a);
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName, serif;
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02-ref.html
index b84d1ff44c4..3e7fd9a2636 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02-ref.html
@@ -5,7 +5,7 @@
 <!DOCTYPE html>
 <title>CSS Reftest Reference</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
-<link rel="stylesheet" href="support/ahem.css" type="text/css">
+<link rel="stylesheet" href="/fonts/ahem.css" type="text/css">
 <meta name="flags" content="ahem">
 <p style="font-family: serif">This text must not be in Ahem.</p>
 <p style="font-family: Ahem">But this text must be in Ahem.</p>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02.html
index 6cb5a1eb1d3..8b29d8d63a0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/variables/variable-font-face-02.html
@@ -14,11 +14,11 @@
 }
 @font-face {
   font-family: var(--a);
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 @font-face {
   font-family: MyTestFontName2;
-  src: url(support/Ahem.ttf);
+  src: url(/fonts/Ahem.ttf);
 }
 #a {
   font-family: MyTestFontName, serif;
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
index c53c9fbfe3d..136c494d5ad 100644
--- a/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/resources/document-open.html
@@ -1,6 +1,5 @@
 <script>
   onload = () => {
-    document.open();
     document.write(`
       <script>
         try {
@@ -11,6 +10,5 @@
         }
       </sc`+`ript>
     `);
-    document.close();
   }
 </script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
index 8c6c220291c..3f754374ba1 100644
--- a/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
+++ b/tests/wpt/web-platform-tests/html/browsers/sandboxing/sandbox-document-open.html
@@ -24,7 +24,7 @@ promise_test(async test => {
   let iframe = document.createElement("iframe");
   iframe.setAttribute("sandbox", "allow-scripts allow-same-origin");
   iframe.setAttribute("src", "/common/blank.html");
-  let loaded = new Promise(resolve => {iframe.onload = resolve; });
+  let loaded = new Promise(resolve => iframe.onload = resolve);
   document.body.appendChild(iframe);
   await loaded;
 
@@ -32,7 +32,6 @@ promise_test(async test => {
     window.addEventListener("message", event => resolve(event.data))
   );
 
-  iframe.contentDocument.open();
   iframe.contentDocument.write(`
     <script>
       try {
@@ -43,7 +42,6 @@ promise_test(async test => {
       }
     </sc`+`ript>
   `);
-  iframe.contentDocument.close();
 
   assert_equals(await message, "document-domain-is-disallowed");
 }, "other_document.open()");
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html
new file mode 100644
index 00000000000..a1d8badb069
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.drawImage.nonexistent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.drawImage.nonexistent</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('not-found-at-all.png');
+assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(img, 0, 0); });
+
+
+});
+</script>
+<img src="/images/not-found-at-all.png" id="not-found-at-all.png" class="resource">
+
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
index b58d78ffafc..c2d0294f9fd 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
@@ -6,16 +6,11 @@
 
 var xWidth = xHeight = 10;
 
-function checkImageData(canvasColorSettings, imageData) {
+function checkImageData(expectedColorSettings, imageData) {
   var imageDataColorSettings = imageData.getColorSettings();
-  assert_equals(canvasColorSettings.colorSpace, imageDataColorSettings.colorSpace);
-  if (canvasColorSettings.pixelFormat == "uint8") {
-    assert_equals("uint8", imageDataColorSettings.storageFormat);
-    assert_equals(imageData.data.length, 4 * xWidth * xHeight);
-  } else {
-    assert_equals("float32", imageDataColorSettings.storageFormat);
-    assert_equals(imageData.data.length, 4 * xWidth * xHeight);
-  }
+  assert_equals(expectedColorSettings.colorSpace, imageDataColorSettings.colorSpace);
+  assert_equals(expectedColorSettings.storageFormat, imageDataColorSettings.storageFormat);
+  assert_equals(imageData.data.length, 4 * xWidth * xHeight);
 }
 
 // Test createImageData when the canvas is color managed
@@ -26,10 +21,10 @@ function runTestCreateImageData(canvasColorSettings, imageSetting) {
   aCanvas.height = xHeight;
   var ctx = aCanvas.getContext('2d', canvasColorSettings);
   var imageData = ctx.createImageData(xWidth, xHeight, imageSetting);
-  checkImageData(canvasColorSettings, imageData);
+  checkImageData(imageSetting, imageData);
 
   imageData = ctx.createImageData(helperImageData);
-  checkImageData(canvasColorSettings, imageData);
+  checkImageData(imageData.getColorSettings(), imageData);
 }
 
 var testScenariosCreateImageData = [
@@ -58,7 +53,7 @@ function runTestGetImageData(canvasColorSettings, imageSetting) {
   aCanvas.height = xHeight;
   var ctx = aCanvas.getContext('2d', canvasColorSettings);
   var imageData = ctx.getImageData(0, 0, xWidth, xHeight, imageSetting);
-  checkImageData(canvasColorSettings, imageData);
+  checkImageData(imageSetting, imageData);
 }
 
 var testScenariosGetImageData = [
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
index c82bf4cc74b..ff7c1437b50 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
@@ -39,14 +39,12 @@ function testPixels(actualData, expectedPixels, tolerance)
   }
 }
 
-function checkImageDataColorSettings(canvasColorSettings, imageData) {
+function checkImageDataColorSettings(expectColorSetting, imageData) {
   var imageDataColorSettings = imageData.getColorSettings();
-  assert_equals(canvasColorSettings.colorSpace,
+  assert_equals(expectColorSetting.colorSpace,
                 imageDataColorSettings.colorSpace);
-  if (canvasColorSettings.pixelFormat == "uint8")
-    assert_equals("uint8", imageDataColorSettings.storageFormat);
-  else
-    assert_equals("float32", imageDataColorSettings.storageFormat);
+  assert_equals(expectColorSetting.storageFormat,
+                imageDataColorSettings.storageFormat);
 }
 
 function checkImageDataColorValues(canvasColorSettings, imageData, isBlank = '',
@@ -133,7 +131,7 @@ function runTestCreateImageDataWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   var imageData = ctx.createImageData(xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(canvasColorSettings, imageData);
+  checkImageDataColorSettings(imageSetting, imageData);
 }
 
 var testScenariosCreateImageDataWH = [];
@@ -164,7 +162,7 @@ function runTestGetImageDataXYWH(canvasColorSettings, imageSetting) {
   var canvas = initializeColorManagedCanvas(canvasColorSettings);
   var ctx = canvas.getContext('2d');
   var imageData = ctx.getImageData(0, 0, xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(canvasColorSettings, imageData);
+  checkImageDataColorSettings(imageSetting, imageData);
   checkImageDataColorValues(canvasColorSettings, imageData);
 }
 
@@ -201,7 +199,7 @@ function runTestPutImageDataDxDy(canvasColorSettings, imageData, imageSetting) {
        pixelFormat: canvasColorSettings.pixelFormat});
   ctx.putImageData(imageData, xWidth/2, xHeight/2);
   var ctxImageData = ctx.getImageData(xWidth/2, xHeight/2, xWidth, xHeight, imageSetting);
-  checkImageDataColorSettings(canvasColorSettings, ctxImageData);
+  checkImageDataColorSettings(imageSetting, ctxImageData);
   checkImageDataColorValues(canvasColorSettings, ctxImageData, 'noBlank',
                             xWidth, xHeight, 'isWCG_U8toSRGB_U8');
 }
@@ -244,7 +242,7 @@ function runTestCreateImageDataFromImageData(canvasColorSettings, imageData) {
       {colorSpace: canvasColorSettings.colorSpace,
        pixelFormat: canvasColorSettings.pixelFormat});
   var ctxImageData = ctx.createImageData(imageData);
-  checkImageDataColorSettings(canvasColorSettings, ctxImageData);
+  checkImageDataColorSettings(imageData.getColorSettings(), ctxImageData);
   checkImageDataColorValues(canvasColorSettings, ctxImageData, 'isBlank');
 }
 
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml
index e71f46f61e2..133807fb285 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml
@@ -439,6 +439,15 @@
     @assert pixel 50,25 ==~ 0,255,0,255; @moz-todo
   expected: green
 
+- name: 2d.drawImage.nonexistent
+  testing:
+  - 2d.drawImage.incomplete.image
+  images:
+  - not-found-at-all.png
+  code: |
+    var img = document.getElementById('not-found-at-all.png');
+    @assert throws INVALID_STATE_ERR ctx.drawImage(img, 0, 0);
+
 - name: 2d.drawImage.zerocanvas
   desc: drawImage with zero-sized canvas as the source shoud throw exception
   testing:
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini
deleted file mode 100644
index 8cb7d29239b..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/crossOrigin.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[crossOrigin.sub.html]
-  [Actions in cross-origin iframe]
-    expected:
-      if product == "safari": FAIL
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index e63b152d7ec..814007b02ee 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -71,9 +71,6 @@ AHEM COPY: fonts/Ahem.ttf
 # None of these are actually Ahem
 AHEM COPY: fonts/ahem-extra/AHEM_*.TTF
 
-# https://github.com/web-platform-tests/wpt/issues/7437
-AHEM COPY: css/vendor-imports/mozilla/mozilla-central-reftests/*/Ahem.ttf
-
 ## Test exclusions ##
 
 # Intentional use of CRLF
@@ -426,7 +423,6 @@ TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/p
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-ref.html
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9.html
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-ref.html
-TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-mbp-horiz-001-rtl-reverse.xhtml
 
 SET TIMEOUT: css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html
 SET TIMEOUT: css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html
@@ -498,7 +494,6 @@ CSS-COLLIDING-SUPPORT-NAME: css/css-page/support/pattern-rgr-grg-rgr.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-transitions/support/pattern-rgr-grg-rgr.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/backgrounds/support/pattern-rgr-grg-rgr.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/solidblue.png
-CSS-COLLIDING-SUPPORT-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/solidblue.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-writing-modes/support/swatch-fuchsia.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/support/swatch-fuchsia.png
 
diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html b/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html
new file mode 100644
index 00000000000..4df317a537e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/mediasource-webcodecs-appendencodedchunks-play.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+  <title>Test basic encoded chunk buffering and playback with MediaSource</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+setup(() => {
+  assert_implements(
+      SourceBuffer.prototype.hasOwnProperty('appendEncodedChunks'),
+      'SourceBuffer prototype hasOwnProperty "appendEncodedChunks", used ' +
+          'here to feature detect MSE-for-WebCodecs implementation.');
+});
+
+// TODO(crbug.com/1144908): Consider extracting metadata into helper library
+// shared with webcodecs tests. This metadata is adapted from webcodecs/video-decoder-any.js.
+let vp9 = {
+  async buffer() { return (await fetch('vp9.mp4')).arrayBuffer(); },
+  // Note, file might not actually be level 1. See original metadata in webcodecs test suite.
+  codec: "vp09.00.10.08",
+  frames: [{offset: 44, size: 3315, type: 'key'},
+           {offset: 3359, size: 203, type: 'delta'},
+           {offset: 3562, size: 245, type: 'delta'},
+           {offset: 3807, size: 172, type: 'delta'},
+           {offset: 3979, size: 312, type: 'delta'},
+           {offset: 4291, size: 170, type: 'delta'},
+           {offset: 4461, size: 195, type: 'delta'},
+           {offset: 4656, size: 181, type: 'delta'},
+           {offset: 4837, size: 356, type: 'delta'},
+           {offset: 5193, size: 159, type: 'delta'}]
+};
+
+async function getOpenMediaSource(t) {
+  return new Promise(async resolve => {
+    const v = document.createElement('video');
+    document.body.appendChild(v);
+    const mediaSource = new MediaSource();
+    const url = URL.createObjectURL(mediaSource);
+    mediaSource.addEventListener('sourceopen', t.step_func(() => {
+      URL.revokeObjectURL(url);
+      assert_equals(mediaSource.readyState, 'open', 'MediaSource is open');
+      resolve([ v, mediaSource ]);
+    }), { once: true });
+    v.src = url;
+  });
+}
+
+promise_test(async t => {
+  let buffer = await vp9.buffer();
+  let [ videoElement, mediaSource ] = await getOpenMediaSource(t);
+  videoElement.controls = true;  // Makes early prototype demo playback easier to control manually.
+  let sourceBuffer = mediaSource.addSourceBuffer({ videoConfig: { codec: vp9.codec } });
+  let next_timestamp = 0;
+  let frame_duration = 100 * 1000;  // 100 milliseconds
+  // forEach with async callbacks makes it too easy to have uncaught rejections
+  // that don't fail this promise_test or even emit harness error.
+  // Iterating explicitly instead.
+  for (i = 0; i < vp9.frames.length; i++, next_timestamp += frame_duration) {
+    let frame_metadata = vp9.frames[i];
+    await sourceBuffer.appendEncodedChunks(new EncodedVideoChunk( {
+      type: frame_metadata.type,
+      timestamp: next_timestamp,
+      duration: frame_duration,
+      data: new Uint8Array(buffer, frame_metadata.offset, frame_metadata.size)
+    }));
+  }
+
+  mediaSource.endOfStream();
+
+  return new Promise( (resolve, reject) => {
+    videoElement.onended = resolve;
+    videoElement.onerror = reject;
+    videoElement.play();
+  });
+
+}, "Buffer EncodedVideoChunks (VP9) one-by-one and play them with MSE");
+
+// TODO(crbug.com/1144908): More exhaustive tests (multiple sourcebuffers,
+// varying append patterns, invalid append patterns; eventually more codecs,
+// out-of-order DTS, durations, etc.)
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/vp9.mp4 b/tests/wpt/web-platform-tests/media-source/mse-for-webcodecs/tentative/vp9.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..7553e5cae9202c0f144126910e9471658038b455
GIT binary patch
literal 6159
zcmZvA1z42d^8eDUl;i?Shm>@POLqu}(uj2K$}X`ION)ro-Q6Ocx(G^_qzDMoh)8$r
zZ^3*2_xr!kooDBrIiHz#&YYQZ-hG|}004mYa0Ju|25|!bumRT+!y;}_v3mdjfY9E<
z&JF;e{_JLJ4G-1`Q3O!!+&UtZ;sDZV0tjP}6Q>`e*PdU^NADrGklduZ%*l&>;3K5u
z`lY$#xR0LNK1#3W0?oMpLO1yg>|L_ULbV4Up4&sJ4WfPb0;1J5`}h2(E~CqkaGM`k
z?V=ApK*}}}K6d{&oVRH?YimEY!qKn0Rf_WdxCae6e$n4@QUI9&_M>wQB3IekVMa#C
zpUUNEOrB02XSVsre@IFNSKjEQc7!_O$NQMEQT!12mE1M9V!L^-mPcxGsw4M3%_^k3
zMy@zl9Fb7;Y)<wA<iYr47CV}1s3OqxAz{C{DMMp5@to9{-1)EAjhL>A&xu|oUq*i5
zt9?gww}g;NuTZbR-z+Z$^Yw1_3JeA(G<IpDL^K0>H=W16<`kVi=2{|wIE?8tZmBkK
zwQNutGF~E_qfi~b8X^o<RU0eM6E$zwJxU4w#(Olb*n7V_b9yO1uQtr;%1c)#Q%6jn
z*2Hj!lOjBjjId#C0XG$0vD-j8cd&$W(8e`zmQj^Ft6_XDM$Q~{K&XD0waV0-eVo<b
zqw`*RfAB<~XL7d4S!V3)30MI}OGgzu9DMd_XO@UkK&<=W3k?q5m5c}#6FG#@LCH`s
z!$G;~6BAsskcBMn%dB93=-XM-IzCo^P6d0Bn&O@_EP9vMN{^3N&5A*&)5L07CK|6t
zS*Zj(DmD-I>6UrE4>+a$d?74zx1&pS^clNc0;Mb{w~LpUn`A!skezqcgEGYu{p=8g
z5Pa^cXW=}x@NgoD78bw4t1Sxk>K<-B&Wf@dNp|Y6soaV*h<&s++4jx@E*JNbuS5Ho
zLquPv&PSiD|B606C$$nfE#R;EYdoTmvdJRE%2|eSS6}FgIX}s<wYt4j><G!wBbdr>
z28_`+gM3Di70-^gQ5>t4r~0VGl?0Y$r0k5o|5+Z>P*jWyCA9aYZWySlTXZWCfcJB+
zdS}=&=^b!V>RX!piHKbDxtxNtaA}gBNzL|lD+}K90%6zEG6{$8)}a}Et1ka&ecC2I
znzE{0>Y#gSXmEDmmROL{9pOmtdau)1F`i(Ia@C=eH;HCqSD^QO=(CsM-n-gMaGS46
zHqfV^k@uF3a7UG~0!bjj{N&+1EK9LW_5&viu5*s1iVQ0>o6l|emGVtHz>!AoX_j=G
z<W+ZBfmC}1Sbig#e<<4h%}iVR-d-}l$=HE(w7-|zz@7>V^xWZjIrhgmn@UG+G*OoF
zzF^dgQ|_4KQ8RPI3Eu?K1fx6U0XK^Q{!U!F{_W(lyZFlO>?>}oeywKo$CqUGrZQg=
znNe3x_%Aw%8Uuz``gCI{o(YW~7m#?KXW_9bi(Cc|Iph{sYIj|+zus@SNYgzT;P^1J
z@0XFNPH(<eCMZOaeW8M0(u@PwU0lsAB8KKpzkR>~da1uV*?~CuwztOgRjL@3HE692
zMD?J=8aX_DR*yodN$x?d9o!goG!`VsCPZI>9tX64FGYr|TcM#I!89@f)(PM1T)Ds5
zv~%C$X@}?uyjwJ>BD1r$?fl?QbyOV#aLRm<e=7=W_`Bp$jlqi@1G1(KEh|A_?5e)(
z%67FE+S8BYHAJ+#b-fbzxUhan^%<TfU7ApM7P7uoLvgzE9%svQH3L1RIuiRq&v`DS
zZi^!#NfnftX~{-TFe(N<ylvI^r;#Dn9Q>tzhH-xH)t1-=biG#WRy_KU_m+Edh*rsN
zaYP`_w|?Qpcljrry(%qcj*<1nRjpRVnbaQUz1eHTCv5y(O`87I?8bUo<X?)6_HJ!M
z+`p|F5la`w+M`cxijdrY?EQkMU>oR{%!U@cc^z!9UfNi~@4XT2(8%{{;;xoMae{+X
zBPl{oR_CeNAm!QdRdwdSQ2Zu1+}tT^F8R>(kFhAXE_^Fm!Q{#0)r3H_!|A)%%p@n3
z`twPG+S%DKx@r0j>jCuTvV#ibWY5ToI_DANC%etOcl?tU2xX|Y>fM4$ApL1*1)p}V
z(EHg|xP2uDIxB(8yCPBZlev;@q<05Ab2g<(TkTtQc$N-@!_G3%TaD0mr&PK1Phk+L
zvE|6NNYC0i+t(ray#k-Aj)V(@`hA%xOJop|>6c7s)!T2iTExIu8CZ?cFRa%27Sk<W
z6!nBNclA_`2OeiUZAQ&s#f@XdW}1TF(=Mfd-~!&uChVj2uul3P-GPfpZ)8<*Zn+h_
z)Tro@JL0@qG?tLmt67&lMDQhVLgu)Kv@G$Sg!E(sOs31SIfL8ljb}m4_5xnj%VIHa
zL$$L0irFSw;18M@?ZkvjdYyia&J7?%v~lY2hIyew3gAs~+t&*m@bMGRqi5px12Y$1
zhY{}g)*#4(?-M~I=pN1Dg&i^EY1a)r_;D8;P)Uxmqn9szwaSR~n_)o-FSG1%W#h#u
zty^IKA=Wu{-iH36cagxNe!N-7G&x=K<I5ZXy42B6<Q`U^c08#?xq)bIo;VL})OPKG
zz~<WfWkI(<_C|%5M03MN4E&8<!byw6ar0)mzxbvYdJ)CHv&1?S*E%MqBy0?2%DN41
zz5cl#ZolTC*95%i`W<Pttg3i9rfbCGnV%(kKQ;4oThi#(I~SR{D?<>?M6j&cbj1Th
z_r=}OUFu0Z)LB9Cto$b582Zz|6VLb<{ve`ZSvzfwucCrcnq!g=d!A+5);g;I)-%(p
zj=U-9uzv)->ppvLB73etfKTZv{>HXbGQ)B?%6@sm<3)l^ZK7_WoTM33+i?J@R3qMr
z`!~@^czigC_1Y}Hys{4u0l=nL`#2qMw1TOml8P{7aIG~y8W-A{EZLpuY!Es5)!2K#
z_!&Q#RyYS5cD9}eF9{<gmh8SLX?w7(d$;by!ShSp3>Gl|EoZ^{i&wg&Tj(|AH}O3+
z`F-U~F`enIW;FN7^QDg7`<2o*xqC8xf4aj<WD`ZPp`<8AO?M$3s$;uCa9H}}IFX?E
zs<qp~d6QRECT<D@#;ZXGRnr>nq&2t|o_|D1C{a^y_TM|D^RoK{TJG{`-giCt)0Z!E
zrCYbzvmx4n8#V%o!1L1G+xk*IwK6+;Tr?6!L=>T4_3OxOcTKkXYE-IzbDwwk5@<9&
zU^_B+81=qzzt3N7$HfPyb!}gddFcv#)T-p*H4>-|l!=W(Zc!HcT?V*);NPn2K+pRV
zzcka;*V_l9W?d&K5%}IN(#T4e#@02++<_n~tapX-t0o)$#hP_|GRRsV_~HlHzWY)q
z9qZ{am#us;_-A@FANjgy%d5())Ub9gvDY{|8b9=a1pxu(+68@T%u(XY%+VZ_PWfR*
zu|6)l36>IP0sPJrT{Yh5R0?4`D_mAzEvP_bP!#yW$$8y|JzRF!RrQ-OvPoig-~#EM
z3`zAf<)q79E>r|Te3}rdkA}^=`_gq%u%yviLt0~_dm0+!{(G*EvGI(R`HX{P0T!+!
z=e4j{UnN;#^zI>ee7fdn;x?k9x2V>Sq`v8J%6}8rApgGpN`vDG_UrW;*D}4*fVHWu
zUj9DLXmAhLM*hM9h<Kf)a25ZQfpYB&rHK8exh3OB2*YD|E=Oqnhbsb2afNw*6PuCQ
z!+|l0ZKPDp7G>8}8dKYqyvWr3Y1+={HIsNXJjfE=L*l5Z!QqBXu~Z>bk>&L_t^QxJ
zcVmo?(th3bo{+}Xk&s0+g0GSV#?M<U?uYS|yHkQEkn<ktsK%blJV?;d)BBk~;V=0i
z=aqvNvAp)}I9u(+gk8JpIRs{lHVN&YD!BI|`-><fNHSr)@Z^aoe}f#qgY7CuK!@Qx
z*&7e<j8;DiPah;vRzvXJ(zF3}Wb1hc;nQs}*udm7Ix?ST8DvR?<&q)SWi0P-9^|!$
z{gjE2+l%V$EPC%SDGdn?v8SaU57YV48dw<fGjfMu>&g3Z!ad-q60u^H20w@UM-5oz
zPdV)Ku_&7(V?s9xt_urA5eGhHS_(R21>z2lCg0}<IxGuu0m35$U6Wm&1O;)5StdQ9
zM)6Zk3>DyP>ne0OZzyF-S!PoXk597b;+6>K>8X^w#&!tDn$Ywb`6FenTm8ZHDWp4w
zIl^eQ?VeBgQKrB5YV-CpcIOcvCRb|fZJQMRk@)w2&4&(tr%q$pkTpz7mWf;NU&s5D
zQ!@PXP9Vu^s&`iLi*a`XxJK_t#((;lU1k(9%GDy=sBau~TLCe(S-k|3w7N6qbm7tK
z`BMB9*9@war_tTF$5RG{CNta6%0PGMKtVF^60$~ZAdHFLyTZD`)t!IBHAaTCMSp{X
z%Qtu%t|oG`kI`rz>dD6!p;KR!4}J<QQ#PLU(5JDP2;pv|moWgNB_1q99_+5ioJ!i5
zpBkEf3)^MH34De4K20-~vOIy`+5$M1A2fg}2D;_#%8|Ua*U0Q+z|U7O?E1Ljr2_~D
z$j4=X9s&R~Ug2g#6kDiw4kuk$d_D6z_L)Zt0Kk(6Xmec0IB8<WZ_kFaW6H3K!1{_q
zXZ7xqN3C`tk%BHWcks+6XMBWYe0i!a>)l-!uN=w-DjzV06M|E0oaJ@=T!}Kw{W5#q
zx&4}>X|3<z2_*I1Z*uI~-Vp33>MO|?5<=%}8uO9)-s;=b5PJ?k7i^+hBBrq$ctlBB
zqNhjh_Je9}{jz*#kEeZvP}9(XDT#QgGA~v?Yo$)ej|1H$r79a|{%eVK{O?lKbr%5m
zQ0`1M5GM6qEwz(hSau^DMnLYM)q`w*wX3A(2LRNY=GHNCl$Ap^Auj*E(hk{g!>nmJ
z8Ft#z4%_!9ff7YIcH(mD$H%Kh#W0xt8TR3KmxsM!p`YXf1E8KkrDcvrQe!imGiUQN
zlogzo%y09LQR^q@9Ty?0mn${l^9TW2*5noLM(@=$jjF0(3&Epv#8bAyu>h&s*yZ=*
zJdn?~WhEoU!Vb8!REouh3TIqqco$9DTFOo-{uBpS#AKn(9D7KbDP&>Zq?S}!>cy!U
zE^?oRZ_n~Qq-bQ3SloWNRUXEd031FNp$NR`pFF02L@*_x3uy6EOv_|cV=YmS1y`nP
zEi)v7P6)tBt=_LxRan$*FCa+s`s`{_ESv}QkmuP38nTnciYZTWSMd_HlKQM^&@419
zYvRV$cep<q2Lga-vJF-VLfPLuslNj|Oj>Jt<J6Ab7U~~FJHFD6(rEpy;i!VAq8W?7
z;;wAQ9F*r!sE??I+ec0!Yce~8ML**eU&(IvWq6$lh$q!+w%;@;3Zx?spz!v-Y85*>
zlX*~*C?uexex36xGU5E!Cg8;^+NegB%K7Qjr=qXKt*r2$bCsi27YMh@pHp!?p>+mw
zn_~~4v_g_Ol_JZw-Vc2b5x-TIZhKm7(>GLxGJf1JCMX4)V5Vl3B;b<u_l(8Kx3`<j
zDogT{NR#ep^98A?aAq_cvFA@t>kDU9gG!)WiKwvOe!mbcnO?c!5u}T#g*cqc0HZTi
zYr2}PeAoG~aO%DeN};#U)bqJ!_ChGyBlGM8sy_=ok~LIlc0atx^8BE{LMN+qry{3V
z1mzA{^GyR8%~&KkrI5OIdWFV7f`M@obho2Cf3h`P^`l~C16Wej<_<I>^s$^xdhCXb
z9_l7BwCvB93cLjCv}t#3^|cKQ=P1kE3ahm(`tBdC^2+hL$5Gd36c0*f6^N-7oQmY|
zE<>Q6`kA`%PCy{bCduv!Q`~e)%n`cO^vS&|e)g_d+m8w{#ILlxC=j)73KU9TJ1xJ?
z?A>v{n)c6kxMW+}BIyIQ^PDX=f&&0`cX8&WBHLVDWgza~`;W@psd#3Mipk&(qr%6b
zAmhtlA?3gN$`&#G%?6OA24neP&rmt0;~e-6K2=}Mi%PhNFppZ7%a%X9*^N;^%n`(a
z{(B!9edCrH^d$e{-(qDX%vvJ%X!J+Bt^%VFOid=HsOc9jp$KayQGqYfo5Ga=d|$#h
zvK0*F_h3;HvV8r4d3ip|C?@DqzaXGeqp)p&DMawB9oyl>#65&P^mScuT7TDB%qsWU
zvaSRYE4-m_SJ$D<7)|K^csZYiv2LY@A55+NRF{fvA!X%dv<6N?4sEuNjN0^coyBTE
zarC#_y+S7uj5WJ@ruRrgfGZA_Rup&SZ;GvrDfZtbs3R{+T6J#KFuBPy=*QFG9M1^3
zMP<o7@%>1sw)XSl+<J+Sl?#cE^)KvS(k|m)kTuA$-K0cor9TVO@DSgsysHx$k?z;9
z6^@@-7Okuqh^6kkcGVU(Jhd;2`Xq?8dzNM|L#Hns@duYso}HR5xRhfd2O?xv8h^&2
zsgO=R>|-o!ITU;w@1PgBklcwq!g(7TB1)bW$j|mgkQ~~}%Kzwy6!tf1pe6`F=T*uJ
zL&tY`Sp7asRXQIOl{k>jp>n=%hFX@cORDqQwy?VN_L{X-G&UOzfwKH@u-?`ue5XHB
z=>DOk;j|;1PVDmRKOxYDbo%v}T8S9Zf<@Ce!{fw$oq)~#HYTfuM=%#wwr}jt2fFAm
zLM~o#oXQ2Wy6<#8eY)mJQUkGMqYksR_@PDnFAs+>fk572>^^czkEzeb`Pnus?J124
zoAd3rU-`P_>e3#22qNy#^S$dGHXd$1`&dnBSVD7Ymk?wbGAPROdhXNDqOirVCkDxq
z(f8j16xv3GM5MM;+AoK0e||h)K<ZSw^dJWQrL8b7rw6k=8W#aJmnSGFHQ9Xvirm0>
zesy*q-`heZBq!AkG>qaxvP047hn}a2bG1p;q(uE7^x(`1gN6#Zi8V2foU|mf2bUAa
zI2)V1PICd9$OD>Yl4G+=x=F82z922>VG`qaaeu#F>Nls5)AaA|j^0X-KatI=YCIhH
zAt*W;JI8nrCGKItz1m{XEe?3>h?p>vrWbfZ7w<GBE(5M9G^|*2kOIA}ZHoSl-k@c1
zeE54`(ce9y)!k*2Hr_D*=_t$CuStRrM!(Z}#7<tq$GXtiHqOtNYKzD1(Zxs^kXw*J
z6O5tD`;_Mq+YCowwuHpPhno9{<c#PR%oQOHw;KfFg;8AHyc}&Y@*jk=j<K%;umIP;
z|Iq(8z`*}Cmj93E|I)BA_o@1D4{H~U(H!n_GbheJ9RC&VdhY+C|C;B2&5I?Ed1vS5
zJq|ltI1Hl!?Ob8-8{{U_f5p9th1Kh3>tv0wf!u8Wd+j_Jm<M3=`Q}XlM_X5qf5iZJ
zIoV?Fe*Z&{F=L3jwY#mW-L(%E+|9||9-~lux!nZ)XWAULe{Dcp54&rhYr3|RdV08m
z{_0p_F!(c9jGh34!~WfnYoAarsIW9fUeiBg{srVQ%f|dA-thnQxN-aEgARRtMNI7l
zwNbhWM;(lfjcE>si0z&1TyHRPs5K1pQNEe)8lZ#0Z;E>Dbv-5q0C2B$YD})z#lEI%
z{F;Fn%;p-v(7!Q^|BZehV|#I9`TM}&r281PAH#<juE4lSVPqMGJ27038DG~T8^f5n
zY#<nUP1kYxG5pNa7H*A^rfzmO5~BiG|JgK5qdlyl(CfPXKN4{IyE8aT;gIWqOqk33
X>mb)b0ovAH_To~4V&a1LgoXbPhndVT

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
index 7545cedaffd..fb53e3d4ca6 100644
--- a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
@@ -1,27 +1,9 @@
 // META: title=NativeIO API: close().
 // META: global=window,worker
+// META: script=resources/support.js
 
 'use strict';
 
-// Returns a handle to a newly created file that holds some data.
-//
-// The file will be closed and deleted when the test ends.
-async function createFile(testCase, fileName) {
-  const file = await nativeIO.open(fileName);
-  testCase.add_cleanup(async () => {
-    await file.close();
-    await nativeIO.delete(fileName);
-  });
-
-  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
-  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
-  writtenBytes.set([64, 65, 66, 67]);
-  const writeCount = await file.write(writtenBytes, 0);
-  assert_equals(writeCount, 4);
-
-  return file;
-}
-
 promise_test(async testCase => {
   const file = await createFile(testCase, 'file_name');
   assert_equals(await file.close(), undefined);
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
index 7436b86b704..518527821e7 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_flush_async.tentative.https.any.js
@@ -15,7 +15,7 @@ for (let op of kOperations) {
     const res = op.prepare();
 
     const flushPromise = file.flush();
-    op.assertRejection(testCase, file, res);
+    await op.assertRejection(testCase, file, res);
 
     await flushPromise;
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
index cb7d6642c84..abff5d89dd0 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
@@ -14,7 +14,7 @@ for (let op of kOperations) {
     const res = op.prepare();
 
     const setLengthPromise = file.setLength(5);
-    op.assertRejection(testCase, file, res);
+    await op.assertRejection(testCase, file, res);
 
     await setLengthPromise;
 
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
index d85a153bab1..769d283bd24 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
@@ -11,7 +11,7 @@
 //              and assertUnchanged. May be empty.
 //   assertRejection: A promise_rejects_dom(...) statement that calls
 //                      operation B. Takes the object returned by prepare as
-//                      third parameter.
+//                      third parameter. Returns a promise.
 //   assertUnchanged: An assertion that rejecting the promise did not change
 //                      the buffers in unexpected ways. The assertion does not
 //                      check if the file itself was not changed. This will be
@@ -30,8 +30,8 @@ const kOperations = [];
       const readBytes = new Uint8Array(readSharedArrayBuffer);
       return readBytes;
     },
-    assertRejection: (testCase, file, readBytes) => {
-      return promise_rejects_dom(testCase, 'InvalidStateError',
+    assertRejection: async (testCase, file, readBytes) => {
+      await promise_rejects_dom(testCase, 'InvalidStateError',
                                  file.read(readBytes, 4));
     },
     assertUnchanged: (readBytes) => {
@@ -48,8 +48,8 @@ const kOperations = [];
       writtenBytes.set([96, 97, 98, 99]);
       return writtenBytes;
     },
-    assertRejection: (testCase, file, writtenBytes) => {
-      return promise_rejects_dom(testCase, 'InvalidStateError',
+    assertRejection: async (testCase, file, writtenBytes) => {
+      await promise_rejects_dom(testCase, 'InvalidStateError',
                                  file.write(writtenBytes, 4));
     },
     assertUnchanged: () => {},
@@ -59,8 +59,8 @@ const kOperations = [];
   const kOpGetLength = {
     name: 'getLength',
     prepare: () => {},
-    assertRejection: (testCase, file) => {
-      return promise_rejects_dom(testCase, 'InvalidStateError',
+    assertRejection: async (testCase, file) => {
+      await promise_rejects_dom(testCase, 'InvalidStateError',
                                  file.getLength());
     },
     assertUnchanged: () => {},
@@ -82,7 +82,7 @@ const kOperations = [];
     name: 'setLength',
     prepare: () => {},
     assertRejection: async (testCase, file, readBytes) => {
-      return promise_rejects_dom(testCase, 'InvalidStateError',
+      await promise_rejects_dom(testCase, 'InvalidStateError',
                                 file.setLength(2));
     },
     assertUnchanged: () => {},
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/README.md b/tests/wpt/web-platform-tests/origin-isolation/README.md
index 693ab4048c0..7446ff2495d 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/README.md
+++ b/tests/wpt/web-platform-tests/origin-isolation/README.md
@@ -5,6 +5,13 @@ These tests are for the proposal at
 eventually move into a subdirectory of `html/` if/when that proposal merges into
 the HTML Standard.
 
+TODO: in [whatwg/html#6214](https://github.com/whatwg/html/pull/6214), the
+header was renamed from `Origin-Isolation` to `Origin-Agent-Cluster`, and the
+getter was renamed from `window.originIsolated` to `window.originAgentCluster`.
+The tests reflect this in their expectations, but all their messaging, names,
+and even the name of this folder, do not yet reflect it. That work is being
+tracked in <https://crbug.com/1157917>.
+
 ## Test filenames
 
 The tests in `2-iframes` follow the file naming pattern
diff --git a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers b/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/document-domain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
index 3fd1539d4ae..a52bf509006 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
@@ -1,2 +1,2 @@
 Content-Security-Policy: sandbox allow-scripts;
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
index d7ad4903ab9..8a29076e561 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
@@ -20,8 +20,8 @@ promise_test(async () => {
 
   const frameWindow = iframe.contentWindow;
 
-  assert_equals(frameWindow.originIsolated, true, "before");
+  assert_equals(frameWindow.originAgentCluster, true, "before");
   iframe.remove();
-  assert_equals(frameWindow.originIsolated, true, "after");
+  assert_equals(frameWindow.originAgentCluster, true, "after");
 }, "Removing the iframe does not change originIsolated");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
index d1e3cc17a13..6cc2ed6b697 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
@@ -23,7 +23,7 @@ export async function insertCustomIframe(src) {
 export const testSupportScript = `
   <script>
   window.onmessage = () => {
-    parent.postMessage(self.originIsolated, "*");
+    parent.postMessage(self.originAgentCluster, "*");
   };
   </script>
 `;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers b/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers b/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers b/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers
index ea3f6b335c7..79a20f30fc0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers
@@ -1 +1 @@
-Origin-Isolation: ?1
+Origin-Agent-Cluster: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs b/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
index 43cfffd5f26..02ba405c601 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
@@ -272,7 +272,7 @@ export function testGetter(testFrame, expected, testLabelPrefix) {
 
   promise_test(async () => {
     if (testFrame === self) {
-      assert_equals(self.originIsolated, expected);
+      assert_equals(self.originAgentCluster, expected);
     } else if (typeof testFrame === "number") {
       const frameWindow = frames[testFrame];
       const result = await accessOriginIsolated(frameWindow);
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs b/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
index fe3dc6a8e09..515987f3f20 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
@@ -18,7 +18,7 @@ window.onmessage = async (e) => {
     document.domain = e.data.newDocumentDomain;
     e.source.postMessage("document.domain is set", "*");
   } else if (e.data.command === "get originIsolated") {
-    e.source.postMessage(self.originIsolated, "*");
+    e.source.postMessage(self.originAgentCluster, "*");
   }
 
   // These only come from the parent.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py b/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
index fe3234b6501..8acf989f964 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
@@ -1,5 +1,5 @@
 def main(request, response):
-    """Send a response with the Origin-Isolation header given in the "header"
+    """Send a response with the Origin-Agent-Cluster header given in the "header"
     query parameter, or no header if that is not provided. Other query
     parameters (only their presence/absence matters) are "send-loaded-message"
     and "redirect-first", which modify the behavior a bit.
@@ -29,7 +29,7 @@ def main(request, response):
 
     if b"header" in request.GET:
       header = request.GET.first(b"header")
-      response.headers.set(b"Origin-Isolation", header)
+      response.headers.set(b"Origin-Agent-Cluster", header)
 
     response.headers.set(b"Content-Type", b"text/html")
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index f6ecd884df3..fd1857e0ddb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -1,49 +1,93 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Referrer Policy: Sandboxed iframes with opaque origins don't send referrers</title>
-    <link rel="author" title="Jochen Eisinger" href="mailto:jochen@chromium.org">
-    <link rel="help" href="https://www.w3.org/TR/referrer-policy/#determine-requests-referrer">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.sub.js"></script>
-  </head>
-  <body>
-    <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
-    <script>
-      function testSandboxedIframe(description, sandboxAttributes, expectedReferrer) {
-        async_test(function(test) {
-          window.addEventListener("message", test.step_func((msg) => {
-            if (msg.data.description === description) {
-              assert_equals(msg.data.referrer, expectedReferrer);
-              test.done();
-            }
-          }));
+<head>
+  <title>Referrer Policy: Sandboxed iframes with opaque origins don't send referrers</title>
+  <link rel="author" title="Jochen Eisinger" href="mailto:jochen@chromium.org">
+  <link rel="author" title="Arthur Sonzogni" href="mailto:arthursonzogni@chromium.org">
+  <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#determine-requests-referrer">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <!-- Common global functions for referrer-policy tests. -->
+  <script src="/common/security-features/resources/common.sub.js"></script>
+  <script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+<h1>
+  Referrer Policy: A document with an opaque origin doesn't send referrers
+</h1>
+<script>
 
-          var iframe = document.createElement("iframe");
-          iframe.sandbox = sandboxAttributes;
-          iframe.srcdoc = `
-              <meta name = "referrer" content = "always">
-              <script src = "/common/security-features/resources/common.sub.js"></` + `script>
-              <script>
-                var urlPath = "/common/security-features/subresource/xhr.py";
-                var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
-                requestViaXhr(url).then((msg) => {
-                    parent.postMessage({referrer: msg.referrer, description: "${description}"}, "*")
-                  })
-                  .catch((e) => {
-                    parent.postMessage({referrer: "FAILURE", description: "${description}"}, "*")
-                  });
-              </` + "script>";
-          document.body.appendChild(iframe);
-        }, description);
-      }
+let futureMessage = function() {
+  return new Promise(resolve => {
+    window.addEventListener("message", event => resolve(event.data));
+  });
+}
 
-      testSandboxedIframe("Sandboxed iframe with opaque origin doesn't send referrers.", "allow-scripts", undefined);
-      testSandboxedIframe("Sandboxed iframe with tuple origin sends referrers.", "allow-same-origin allow-scripts", document.location.href);
-    </script>
+function testSandboxedIframeSubresource(description,
+                                        sandboxAttributes,
+                                        expectedReferrer) {
+  promise_test(async test => {
+    let resource_url = get_host_info().HTTP_NOTSAMESITE_ORIGIN +
+      "/common/security-features/subresource/xhr.py";
+    const iframe = document.createElement("iframe");
+    iframe.sandbox = sandboxAttributes;
+    iframe.srcdoc = `
+      <meta name="referrer" content="always">
+      <script src="/common/security-features/resources/common.sub.js">
+      </scr`+`ipt>
+      <script>
+        requestViaFetch("${resource_url}").then((msg) => {
+          parent.postMessage(msg.referrer, '*');
+        }).catch((e) => {
+          parent.postMessage("FAILURE", '*');
+        });
+      </scr`+`ipt>
+    `;
 
-    <div id="log"></div>
-  </body>
+    const future_message = futureMessage();
+    document.body.appendChild(iframe);
+    assert_equals(await future_message, expectedReferrer);
+
+  }, description);
+}
+
+function testSandboxedIframeMainResource(description,
+                                         sandboxAttributes,
+                                         expectedReferrer) {
+  promise_test(async test => {
+    let document_url = get_host_info().HTTP_NOTSAMESITE_ORIGIN +
+      "/referrer-policy/generic/resources/referrer.py";
+    const iframe = document.createElement("iframe");
+    iframe.sandbox = sandboxAttributes;
+    iframe.srcdoc = `
+      <meta name="referrer" content="always">
+      <script>
+        onload = () => {
+          location.href = "${document_url}";
+        }
+      </scr`+`ipt>
+    `;
+
+    const future_message = futureMessage();
+    document.body.appendChild(iframe);
+    assert_equals(await future_message, expectedReferrer);
+
+  }, description);
+}
+
+testSandboxedIframeSubresource(
+  "Sandboxed iframe with opaque origin doesn't send referrers to subresources",
+  "allow-scripts", undefined);
+testSandboxedIframeSubresource(
+  "Sandboxed iframe with tuple origin sends referrers to subresources",
+  "allow-same-origin allow-scripts", document.location.href);
+testSandboxedIframeMainResource(
+  "Sandboxed iframe with opaque origin doesn't send referrers on navigation",
+  "allow-scripts", "");
+testSandboxedIframeMainResource(
+  "Sandboxed iframe with tuple origin sends referrers on navigation",
+  "allow-same-origin allow-scripts", document.location.href);
+
+</script>
+</body>
 </html>
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
index 3f9a3679080..c78bcef5c45 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
@@ -1,10 +1,10 @@
 cask "safari-technology-preview" do
   if MacOS.version <= :catalina
-    version "116,001-82546-20201119-d46bca22-a3dc-43c3-9fcf-29f7343956ac"
-    sha256 "37a631632e2d449ce5dfb117d0eb7fd14574f00ca306c27667ffbbe6b1c0bc68"
+    version "117,001-86197-20201209-2fd0fe89-0c37-412d-99e2-4e288519e886"
+    sha256 "739630b43a8f021cc246b2c8f610b759e82a6336830d34dac1f388763e7cceea"
   else
-    version "116,001-69966-20201119-d87990cd-c094-40a8-a616-a4497506caed"
-    sha256 "64b82eb45729ee366272da25849039762c5382373ebedbad30168d80a06ec6b7"
+    version "117,001-86222-20201209-8021be92-32b3-403f-b9a7-630ab8e91afb"
+    sha256 "2dc42342e1e3fdd95086dfbd3a8588f1e2d181fbd4f8bb279994be0c2e57ff6f"
   end
 
   url "https://secure-appldnld.apple.com/STP/#{version.after_comma}/SafariTechnologyPreview.dmg"
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index 73fec5a8925..fc4222a9ce9 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -504,7 +504,7 @@ class Session(object):
 
         try:
             self.send_command("DELETE", "session/%s" % self.session_id)
-        except error.InvalidSessionIdException:
+        except (OSError, error.InvalidSessionIdException):
             pass
         finally:
             self.session_id = None
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
index e836b19a158..33142d30fce 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
@@ -145,7 +145,12 @@ class HTTPWireProtocol(object):
     def close(self):
         """Closes the current HTTP connection, if there is one."""
         if self._conn:
-            self._conn.close()
+            try:
+                self._conn.close()
+            except OSError:
+                # The remote closed the connection
+                pass
+        self._conn = None
 
     @property
     def connection(self):