From 454002ec4eb576c588612650fcc6ac210acc2a7b Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Tue, 6 Oct 2020 08:21:53 +0000
Subject: [PATCH] Update web-platform-tests to revision
 16c99fc3f05855a7d7d19397a19f49d2dbf429b9

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 +
 .../css/CSS2/text/letter-spacing-079.xht.ini  |    2 -
 .../css/CSS2/text/text-indent-100.xht.ini     |    2 -
 .../css/CSS2/text/text-indent-101.xht.ini     |    2 -
 .../css/CSS2/text/text-indent-102.xht.ini     |    2 -
 .../text/text-indent-overflow-002.xht.ini     |    2 +
 .../text/text-indent-overflow-003.xht.ini     |    2 +
 .../text/text-transform-bicameral-001.xht.ini |    2 +
 .../text/text-transform-bicameral-002.xht.ini |    2 +
 .../text/text-transform-bicameral-003.xht.ini |    2 +
 .../text/text-transform-bicameral-004.xht.ini |    2 +
 .../text/text-transform-bicameral-005.xht.ini |    2 +
 .../text/text-transform-bicameral-006.xht.ini |    2 +
 .../text/text-transform-bicameral-007.xht.ini |    2 +
 .../text/text-transform-bicameral-008.xht.ini |    2 +
 .../text/text-transform-bicameral-011.xht.ini |    2 +
 .../text/text-transform-bicameral-012.xht.ini |    2 +
 .../text/text-transform-bicameral-013.xht.ini |    2 +
 .../text/text-transform-bicameral-014.xht.ini |    2 +
 .../text/text-transform-bicameral-015.xht.ini |    2 +
 .../text/text-transform-bicameral-016.xht.ini |    2 +
 .../CSS2/text/text-transform-cap-001.xht.ini  |    2 +
 .../CSS2/text/text-transform-cap-002.xht.ini  |    2 +
 .../CSS2/text/text-transform-cap-003.xht.ini  |    2 +
 .../text/white-space-processing-048.xht.ini   |    2 +
 .../text/word-spacing-applies-to-003.xht.ini  |    2 +
 .../text/word-spacing-justify-001.xht.ini     |    2 +
 .../transform-interpolation-matrix.html.ini   |    2 +
 .../transform-interpolation-rotate.html.ini   |    2 +
 .../transform-interpolation-scale.html.ini    |    2 +
 .../transform-interpolation-skew.html.ini     |    2 +
 ...nsform-interpolation-translate-em.html.ini |    2 +
 ...transform-interpolation-translate.html.ini |    2 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-iframes.html.ini        |    3 +
 .../offsetTopLeft-border-box.html.ini         |    7 -
 .../streams/decode-non-utf8.any.js.ini        |   87 +
 .../fetch/content-type/response.window.js.ini |   18 +-
 ...irect-https-downgrade-upgrade.sub.html.ini |   47 +
 .../nosniff/parsing-nosniff.window.js.ini     |    3 +
 .../traverse_the_history_1.html.ini           |    4 -
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 .../html/dom/idlharness.https.html.ini        |    9 +-
 .../supported-elements.html.ini               |    3 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    3 +-
 .../form-double-submit-3.html.ini             |    4 -
 .../form-double-submit.html.ini               |    4 -
 .../htmlanchorelement_noopener.html.ini       |    7 +-
 .../promise-job-entry.html.ini                |    5 +-
 .../url/a-element-xhtml.xhtml.ini             |    6 +
 .../url/a-element.html.ini                    |    6 +
 .../url/url-constructor.html.ini              |    6 +
 .../audiocontext-not-fully-active.html.ini    |    1 -
 .../tests/element_click/shadow_dom.py.ini     |   16 +
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../webxr/render_state_update.https.html.ini  |    2 -
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              | 2618 ++++++++++++-----
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 +
 .../css/CSS2/text/letter-spacing-079.xht.ini  |    2 -
 .../css/CSS2/text/text-indent-100.xht.ini     |    2 -
 .../css/CSS2/text/text-indent-101.xht.ini     |    2 -
 .../css/CSS2/text/text-indent-102.xht.ini     |    2 -
 .../text/text-transform-bicameral-001.xht.ini |    2 +
 .../text/text-transform-bicameral-003.xht.ini |    2 +
 .../text/text-transform-bicameral-005.xht.ini |    2 +
 .../text/text-transform-bicameral-006.xht.ini |    2 +
 .../text/text-transform-bicameral-007.xht.ini |    2 +
 .../text/text-transform-bicameral-009.xht.ini |    2 +
 .../text/text-transform-bicameral-011.xht.ini |    2 +
 .../text/text-transform-bicameral-013.xht.ini |    2 +
 .../text/text-transform-bicameral-015.xht.ini |    2 +
 .../text/text-transform-bicameral-017.xht.ini |    3 +
 .../text/text-transform-bicameral-019.xht.ini |    3 +
 .../text/text-transform-bicameral-021.xht.ini |    3 +
 .../CSS2/text/text-transform-cap-002.xht.ini  |    2 +
 .../CSS2/text/text-transform-cap-003.xht.ini  |    2 +
 .../text-transform-capitalize-001.xht.ini     |    3 -
 .../text-transform-capitalize-002.xht.ini     |    3 -
 .../text-transform-capitalize-003.xht.ini     |    3 -
 .../text/text-transform-unicase-001.xht.ini   |    2 +
 .../text/white-space-processing-006.xht.ini   |    2 +
 .../text/white-space-processing-048.xht.ini   |    2 +
 .../text/white-space-processing-049.xht.ini   |    2 +
 .../text/word-spacing-applies-to-003.xht.ini  |    2 +
 .../text/word-spacing-characters-001.xht.ini  |    2 +
 .../hittest-anonymous-box.html.ini            |    4 -
 .../text-transform-lowercase-001.xht.ini      |    3 -
 .../text-transform-uppercase-001.xht.ini      |    3 -
 .../transform-interpolation-matrix.html.ini   |    2 +
 .../transform-interpolation-rotate.html.ini   |    2 +
 .../transform-interpolation-scale.html.ini    |    2 +
 .../transform-interpolation-skew.html.ini     |    2 +
 ...nsform-interpolation-translate-em.html.ini |    2 +
 ...transform-interpolation-translate.html.ini |    2 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-iframes.html.ini        |    3 +
 .../offsetTopLeft-border-box.html.ini         |    7 -
 .../streams/decode-non-utf8.any.js.ini        |   18 +
 .../fetch/content-type/response.window.js.ini |   18 +-
 ...irect-https-downgrade-upgrade.sub.html.ini |    9 +
 .../nosniff/parsing-nosniff.window.js.ini     |    3 +
 .../traverse_the_history_1.html.ini           |    4 -
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 .../html/dom/idlharness.https.html.ini        |    3 +
 .../supported-elements.html.ini               |    3 +-
 .../iframe_sandbox_popups_escaping-1.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    3 +-
 .../form-double-submit-3.html.ini             |    4 -
 .../form-double-submit.html.ini               |    4 -
 .../htmlanchorelement_noopener.html.ini       |    7 +-
 .../promise-job-entry.html.ini                |    5 +-
 .../metadata/url/a-element-xhtml.xhtml.ini    |    6 +
 tests/wpt/metadata/url/a-element.html.ini     |    6 +
 .../wpt/metadata/url/url-constructor.html.ini |    6 +
 .../audiocontext-not-fully-active.html.ini    |    1 -
 .../tests/element_click/shadow_dom.py.ini     |   16 +
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../webxr/render_state_update.https.html.ini  |    2 -
 .../CSS2/text/combining-characters-002.xht    |    7 +-
 .../css/CSS2/text/letter-spacing-079-ref.xht  |   30 +
 .../css/CSS2/text/letter-spacing-079.xht      |    2 +-
 .../css/CSS2/text/text-indent-016.xht         |    4 +-
 .../css/CSS2/text/text-indent-100.xht         |    2 +-
 .../css/CSS2/text/text-indent-101.xht         |    2 +-
 .../css/CSS2/text/text-indent-102.xht         |    2 +-
 .../text/text-indent-overflow-002-ref.xht     |   34 +
 .../CSS2/text/text-indent-overflow-002.xht    |    1 +
 .../text/text-indent-overflow-003-ref.xht     |   35 +
 .../CSS2/text/text-indent-overflow-003.xht    |    1 +
 .../text/text-transform-bicameral-001-ref.xht |   85 +
 .../text/text-transform-bicameral-001.xht     |    2 +
 .../text/text-transform-bicameral-002-ref.xht |   84 +
 .../text/text-transform-bicameral-002.xht     |    2 +
 .../text/text-transform-bicameral-003-ref.xht |  306 ++
 .../text/text-transform-bicameral-003.xht     |    6 +-
 .../text/text-transform-bicameral-004-ref.xht |  306 ++
 .../text/text-transform-bicameral-004.xht     |    6 +-
 .../text/text-transform-bicameral-005-ref.xht |   26 +
 .../text/text-transform-bicameral-005.xht     |    2 +
 .../text/text-transform-bicameral-006-ref.xht |   25 +
 .../text/text-transform-bicameral-006.xht     |    2 +
 .../text/text-transform-bicameral-007-ref.xht |  172 ++
 .../text/text-transform-bicameral-007.xht     |    6 +-
 .../text/text-transform-bicameral-008-ref.xht |  172 ++
 .../text/text-transform-bicameral-008.xht     |    6 +-
 .../text/text-transform-bicameral-009-ref.xht |   33 +
 .../text/text-transform-bicameral-009.xht     |    2 +
 .../text/text-transform-bicameral-010-ref.xht |   33 +
 .../text/text-transform-bicameral-010.xht     |    2 +
 .../text/text-transform-bicameral-011-ref.xht |  153 +
 .../text/text-transform-bicameral-011.xht     |    6 +-
 .../text/text-transform-bicameral-012-ref.xht |  153 +
 .../text/text-transform-bicameral-012.xht     |    6 +-
 .../text/text-transform-bicameral-013-ref.xht |   64 +
 .../text/text-transform-bicameral-013.xht     |    2 +
 .../text/text-transform-bicameral-014-ref.xht |   64 +
 .../text/text-transform-bicameral-014.xht     |    2 +
 .../text/text-transform-bicameral-015-ref.xht |   42 +
 .../text/text-transform-bicameral-015.xht     |    2 +
 .../text/text-transform-bicameral-016-ref.xht |   42 +
 .../text/text-transform-bicameral-016.xht     |    2 +
 .../text/text-transform-bicameral-017-ref.xht |   52 +
 .../text/text-transform-bicameral-017.xht     |    2 +
 .../text/text-transform-bicameral-018-ref.xht |   52 +
 .../text/text-transform-bicameral-018.xht     |    2 +
 .../text/text-transform-bicameral-019-ref.xht |   52 +
 .../text/text-transform-bicameral-019.xht     |    2 +
 .../text/text-transform-bicameral-020-ref.xht |   52 +
 .../text/text-transform-bicameral-020.xht     |    2 +
 .../text/text-transform-bicameral-021-ref.xht |   66 +
 .../text/text-transform-bicameral-021.xht     |    2 +
 .../text/text-transform-bicameral-022-ref.xht |   66 +
 .../text/text-transform-bicameral-022.xht     |    2 +
 ...ref.xht => text-transform-cap-001-ref.xht} |    0
 ...ize-001.xht => text-transform-cap-001.xht} |    3 +-
 ...ize-002.xht => text-transform-cap-002.xht} |    3 +-
 ...ref.xht => text-transform-cap-003-ref.xht} |    0
 ...ize-003.xht => text-transform-cap-003.xht} |    5 +-
 .../text/text-transform-lowercase-001.xht     |    1 +
 .../text/text-transform-unicase-001-ref.xht   |   13 +
 .../CSS2/text/text-transform-unicase-001.xht  |    4 +-
 .../text/text-transform-uppercase-001.xht     |    1 +
 .../text/text-transform-uppercase-002.xht     |    1 +
 .../CSS2/text/white-space-applies-to-002.xht  |    1 +
 .../CSS2/text/white-space-applies-to-003.xht  |    1 +
 .../CSS2/text/white-space-applies-to-005.xht  |    1 +
 .../CSS2/text/white-space-applies-to-006.xht  |    1 +
 .../CSS2/text/white-space-applies-to-007.xht  |    1 +
 .../CSS2/text/white-space-applies-to-008.xht  |    1 +
 .../CSS2/text/white-space-applies-to-009.xht  |    1 +
 .../CSS2/text/white-space-applies-to-010.xht  |    1 +
 .../CSS2/text/white-space-applies-to-011.xht  |    3 +-
 .../CSS2/text/white-space-applies-to-012.xht  |    1 +
 .../CSS2/text/white-space-applies-to-013.xht  |    1 +
 .../CSS2/text/white-space-applies-to-014.xht  |    1 +
 .../CSS2/text/white-space-applies-to-015.xht  |    1 +
 .../white-space-control-characters-001.xht    |    3 +-
 .../text/white-space-nowrap-attribute-001.xht |    1 +
 .../CSS2/text/white-space-p-element-001.xht   |    3 +-
 .../CSS2/text/white-space-pre-element-001.xht |    1 +
 .../text/white-space-processing-005-ref.xht   |   25 +
 .../CSS2/text/white-space-processing-005.xht  |    6 +-
 .../text/white-space-processing-006-ref.xht   |   30 +
 .../CSS2/text/white-space-processing-006.xht  |    6 +-
 .../CSS2/text/white-space-processing-007.xht  |    8 +-
 .../text/white-space-processing-014-ref.xht   |   38 +
 .../CSS2/text/white-space-processing-014.xht  |    6 +-
 .../text/white-space-processing-015-ref.xht   |   29 +
 .../CSS2/text/white-space-processing-015.xht  |    4 +-
 .../text/white-space-processing-048-ref.xht   |   27 +
 .../CSS2/text/white-space-processing-048.xht  |    7 +-
 .../CSS2/text/white-space-processing-049.xht  |    8 +-
 .../CSS2/text/white-space-processing-057.xht  |   28 -
 .../CSS2/text/white-space-processing-058.xht  |   28 -
 .../css/CSS2/text/word-spacing-004-ref.xht    |   23 +
 .../css/CSS2/text/word-spacing-004.xht        |    6 +-
 .../css/CSS2/text/word-spacing-005.xht        |    6 +-
 .../css/CSS2/text/word-spacing-006.xht        |    6 +-
 .../css/CSS2/text/word-spacing-007-ref.xht    |   30 +
 .../css/CSS2/text/word-spacing-007.xht        |   10 +-
 .../css/CSS2/text/word-spacing-008.xht        |   10 +-
 .../css/CSS2/text/word-spacing-016.xht        |    6 +-
 .../css/CSS2/text/word-spacing-017.xht        |    6 +-
 .../css/CSS2/text/word-spacing-018.xht        |    6 +-
 .../css/CSS2/text/word-spacing-019.xht        |   10 +-
 .../css/CSS2/text/word-spacing-020.xht        |   10 +-
 .../css/CSS2/text/word-spacing-028.xht        |    6 +-
 .../css/CSS2/text/word-spacing-029.xht        |    6 +-
 .../css/CSS2/text/word-spacing-030.xht        |    6 +-
 .../css/CSS2/text/word-spacing-031.xht        |   10 +-
 .../css/CSS2/text/word-spacing-032.xht        |   10 +-
 .../css/CSS2/text/word-spacing-040.xht        |    6 +-
 .../css/CSS2/text/word-spacing-041.xht        |    6 +-
 .../css/CSS2/text/word-spacing-042.xht        |    6 +-
 .../css/CSS2/text/word-spacing-043.xht        |    6 +-
 .../css/CSS2/text/word-spacing-044.xht        |    6 +-
 .../css/CSS2/text/word-spacing-052.xht        |    6 +-
 .../css/CSS2/text/word-spacing-053.xht        |    6 +-
 .../css/CSS2/text/word-spacing-054.xht        |    6 +-
 .../css/CSS2/text/word-spacing-055.xht        |   10 +-
 .../css/CSS2/text/word-spacing-056.xht        |   10 +-
 .../css/CSS2/text/word-spacing-064.xht        |    6 +-
 .../css/CSS2/text/word-spacing-065.xht        |    6 +-
 .../css/CSS2/text/word-spacing-066.xht        |    6 +-
 .../css/CSS2/text/word-spacing-067.xht        |   10 +-
 .../css/CSS2/text/word-spacing-068.xht        |   10 +-
 .../css/CSS2/text/word-spacing-076.xht        |    6 +-
 .../css/CSS2/text/word-spacing-077.xht        |    6 +-
 .../css/CSS2/text/word-spacing-078.xht        |    6 +-
 .../css/CSS2/text/word-spacing-079.xht        |    8 +-
 .../css/CSS2/text/word-spacing-080.xht        |    8 +-
 .../css/CSS2/text/word-spacing-088.xht        |    6 +-
 .../css/CSS2/text/word-spacing-089.xht        |    6 +-
 .../css/CSS2/text/word-spacing-090.xht        |    6 +-
 .../css/CSS2/text/word-spacing-091-ref.xht    |   30 +
 .../css/CSS2/text/word-spacing-091.xht        |   10 +-
 .../css/CSS2/text/word-spacing-092.xht        |   10 +-
 .../css/CSS2/text/word-spacing-097.xht        |    6 +-
 .../css/CSS2/text/word-spacing-098.xht        |    6 +-
 .../css/CSS2/text/word-spacing-099.xht        |    6 +-
 .../css/CSS2/text/word-spacing-100.xht        |    6 +-
 .../css/CSS2/text/word-spacing-101.xht        |   10 +-
 .../text/word-spacing-applies-to-001-ref.xht  |   31 +
 .../CSS2/text/word-spacing-applies-to-001.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-002.xht |    4 +-
 .../text/word-spacing-applies-to-003-ref.xht  |   35 +
 .../CSS2/text/word-spacing-applies-to-003.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-005.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-006.xht |    4 +-
 .../text/word-spacing-applies-to-007-ref.xht  |   41 +
 .../CSS2/text/word-spacing-applies-to-007.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-008.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-009.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-010.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-011.xht |    4 +-
 .../text/word-spacing-applies-to-012-ref.xht  |   46 +
 .../CSS2/text/word-spacing-applies-to-012.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-013.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-014.xht |    4 +-
 .../CSS2/text/word-spacing-applies-to-015.xht |    4 +-
 .../text/word-spacing-characters-001-ref.xht  |   80 +
 .../CSS2/text/word-spacing-characters-001.xht |    2 +
 .../text/word-spacing-characters-002-ref.xht  |  175 ++
 .../CSS2/text/word-spacing-characters-002.xht |    3 +
 .../text/word-spacing-characters-003-ref.xht  |   73 +
 .../CSS2/text/word-spacing-characters-003.xht |    2 +
 .../text/word-spacing-justify-001-ref.xht     |   22 +
 .../CSS2/text/word-spacing-justify-001.xht    |    6 +-
 .../word-spacing-remove-space-001-ref.xht     |   30 +
 .../text/word-spacing-remove-space-001.xht    |    4 +-
 .../word-spacing-remove-space-002-ref.xht     |   30 +
 .../text/word-spacing-remove-space-002.xht    |    4 +-
 .../word-spacing-remove-space-003-ref.xht     |   30 +
 .../text/word-spacing-remove-space-003.xht    |    4 +-
 .../word-spacing-remove-space-004-ref.xht     |   34 +
 .../text/word-spacing-remove-space-004.xht    |    4 +-
 .../word-spacing-remove-space-005-ref.xht     |   34 +
 .../text/word-spacing-remove-space-005.xht    |    4 +-
 .../word-spacing-remove-space-006-ref.xht     |   34 +
 .../text/word-spacing-remove-space-006.xht    |    4 +-
 .../multicol-fill-balance-004.html            |   10 +
 .../css-multicol/multicol-span-all-015.html   |   16 +
 .../scroll-width-height.tentative.html        |   39 +
 .../css/css-overflow/clip-006.html            |    9 +
 .../css/css-overflow/clip-007.html            |    9 +
 ...t => text-transform-lowercase-101-ref.xht} |    0
 ...t => text-transform-uppercase-101-ref.xht} |    0
 ...1.xht => text-transform-lowercase-101.xht} |    2 +-
 ...t => text-transform-lowercase-102-ref.xht} |    0
 ...2.xht => text-transform-lowercase-102.xht} |    2 +-
 ...1.xht => text-transform-uppercase-101.xht} |    2 +-
 .../transform-interpolation-reftests.js       |  126 +
 .../transform-interpolation-animated-ref.html |   11 +
 .../transform-interpolation-matrix.html       |   12 +
 .../transform-interpolation-ref.html          |   11 +
 .../transform-interpolation-rotate.html       |   12 +
 .../transform-interpolation-scale.html        |   12 +
 .../transform-interpolation-skew.html         |   12 +
 .../transform-interpolation-translate-em.html |   12 +
 .../transform-interpolation-translate.html    |   12 +
 .../events/scrolling/overscroll-deltas.html   |   16 +-
 .../caret-navigation-around-line-break.html   |  137 +
 .../encoding/streams/decode-non-utf8.any.js   |    6 +
 ...-attribute-redirect-on-load.https.sub.html |   11 -
 ...t-allowed-by-feature-policy.https.sub.html |   11 -
 ...ment-default-feature-policy.https.sub.html |   11 -
 ...-disabled-by-feature-policy.https.sub.html |   11 -
 .../feature-policy/resources/featurepolicy.js |    8 +-
 .../html/dom/elements-embedded.js             |    1 -
 ...s-during-and-after-dispatch.tentative.html |   63 +
 .../input-events-get-target-ranges.js         |  140 +-
 .../web-platform-tests/interfaces/html.idl    |    2 +
 .../interfaces/payment-request.idl            |    2 -
 .../interfaces/sanitizer-api.tentative.idl    |    1 +
 .../same-origin-grand-child-iframe.html       |    6 +-
 tests/wpt/web-platform-tests/lint.ignore      |    1 -
 .../resources/send-origin-isolation-header.py |    2 +-
 ...ibute-same-origin-bc-containers.https.html |   11 -
 .../allowpayment/basic.https.html             |   14 -
 ...-allowpaymentrequest-timing.https.sub.html |   42 -
 .../payment-is-showing.https.html             |    2 +-
 .../rejects_if_not_active-manual.https.html   |    4 +-
 .../rejects_if_not_active-manual.https.html   |    6 +-
 .../rejects_if_not_active.https.html          |    2 +-
 ...tpointercapture_inactive_button_mouse.html |    3 +-
 .../svg/animations/animateMotion-circle.html  |   56 +
 .../animateMotion-display-none.html           |   53 +
 .../svg/animations/animateMotion-ellipse.html |   56 +
 .../svg/animations/animateMotion-line.html    |   53 +
 .../svg/animations/animateMotion-rect.html    |   53 +
 .../svg/struct/use-getComputedStyle.html      |   14 +
 .../tools/ci/taskcluster-run.py               |    9 +-
 .../url/resources/urltestdata.json            |   59 +-
 .../tests/element_click/shadow_dom.py         |  100 +
 359 files changed, 6838 insertions(+), 1401 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/letter-spacing-079.xht.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-100.xht.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-101.xht.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-102.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-002.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-003.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-001.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-002.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-003.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-004.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-005.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-006.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-007.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-008.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-011.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-012.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-013.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-014.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-015.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-016.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-001.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-002.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-003.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-applies-to-003.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-justify-001.xht.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-matrix.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-rotate.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-scale.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-skew.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/encoding/streams/decode-non-utf8.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/element_click/shadow_dom.py.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/letter-spacing-079.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-indent-100.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-indent-101.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-indent-102.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-001.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-003.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-005.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-006.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-007.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-009.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-011.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-013.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-015.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-017.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-019.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-021.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-cap-002.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-cap-003.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-001.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-002.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-003.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/text-transform-unicase-001.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/white-space-processing-006.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/white-space-processing-048.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/white-space-processing-049.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/word-spacing-applies-to-003.xht.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/text/word-spacing-characters-001.xht.ini
 delete mode 100644 tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-lowercase-001.xht.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-uppercase-001.xht.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-matrix.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-rotate.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-scale.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-skew.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
 create mode 100644 tests/wpt/metadata/webdriver/tests/element_click/shadow_dom.py.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webxr/render_state_update.https.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht
 rename tests/wpt/web-platform-tests/css/CSS2/text/{text-transform-capitalize-001-ref.xht => text-transform-cap-001-ref.xht} (100%)
 rename tests/wpt/web-platform-tests/css/CSS2/text/{text-transform-capitalize-001.xht => text-transform-cap-001.xht} (80%)
 rename tests/wpt/web-platform-tests/css/CSS2/text/{text-transform-capitalize-002.xht => text-transform-cap-002.xht} (80%)
 rename tests/wpt/web-platform-tests/css/CSS2/text/{text-transform-capitalize-003-ref.xht => text-transform-cap-003-ref.xht} (100%)
 rename tests/wpt/web-platform-tests/css/CSS2/text/{text-transform-capitalize-003.xht => text-transform-cap-003.xht} (85%)
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-057.xht
 delete mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-058.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-007.html
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/reference/{text-transform-lowercase-001-ref.xht => text-transform-lowercase-101-ref.xht} (100%)
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/reference/{text-transform-uppercase-001-ref.xht => text-transform-uppercase-101-ref.xht} (100%)
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/{text-transform-lowercase-001.xht => text-transform-lowercase-101.xht} (94%)
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/{text-transform-lowercase-002-ref.xht => text-transform-lowercase-102-ref.xht} (100%)
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/{text-transform-lowercase-002.xht => text-transform-lowercase-102.xht} (91%)
 rename tests/wpt/web-platform-tests/css/css-text/text-transform/{text-transform-uppercase-001.xht => text-transform-uppercase-101.xht} (94%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html
 create mode 100644 tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html
 create mode 100644 tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-same-origin-bc-containers.https.html
 delete mode 100644 tests/wpt/web-platform-tests/payment-request/allowpayment/basic.https.html
 delete mode 100644 tests/wpt/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest-timing.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html
 create mode 100644 tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b44d9e9cf..3605e8f3fc9 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/letter-spacing-079.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/letter-spacing-079.xht.ini
deleted file mode 100644
index b7948a213b9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/text/letter-spacing-079.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[letter-spacing-079.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-100.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-100.xht.ini
deleted file mode 100644
index f07c0d17188..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-100.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-100.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-101.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-101.xht.ini
deleted file mode 100644
index 07229cdbe24..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-101.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-101.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-102.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-102.xht.ini
deleted file mode 100644
index 4b4ff6dd519..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-102.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-102.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-002.xht.ini
new file mode 100644
index 00000000000..bef61d3cc6f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-002.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-overflow-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-003.xht.ini
new file mode 100644
index 00000000000..034951b53d4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-overflow-003.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-overflow-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-001.xht.ini
new file mode 100644
index 00000000000..af967170188
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-001.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-002.xht.ini
new file mode 100644
index 00000000000..33d789c2e1d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-002.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-003.xht.ini
new file mode 100644
index 00000000000..618bd0fcaa1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-004.xht.ini
new file mode 100644
index 00000000000..0582741ebc2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-004.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-004.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-005.xht.ini
new file mode 100644
index 00000000000..fe36b58068e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-005.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-006.xht.ini
new file mode 100644
index 00000000000..74edadd19c9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-006.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-007.xht.ini
new file mode 100644
index 00000000000..5610ec93ff4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-007.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-008.xht.ini
new file mode 100644
index 00000000000..7fb791b843e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-008.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-011.xht.ini
new file mode 100644
index 00000000000..f8f08ceaceb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-011.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-012.xht.ini
new file mode 100644
index 00000000000..af9850aa43d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-012.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-012.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-013.xht.ini
new file mode 100644
index 00000000000..830a8efbe52
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-013.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-014.xht.ini
new file mode 100644
index 00000000000..d516ae87da9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-014.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-015.xht.ini
new file mode 100644
index 00000000000..f2588138110
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-015.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-016.xht.ini
new file mode 100644
index 00000000000..22d217b438b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-bicameral-016.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-016.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-001.xht.ini
new file mode 100644
index 00000000000..29a310b99bc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-001.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-cap-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-002.xht.ini
new file mode 100644
index 00000000000..c27a19d526f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-002.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-cap-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-003.xht.ini
new file mode 100644
index 00000000000..cdfb6a56455
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-cap-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-cap-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini
new file mode 100644
index 00000000000..d6fae45ecb0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/white-space-processing-048.xht.ini
@@ -0,0 +1,2 @@
+[white-space-processing-048.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-applies-to-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-applies-to-003.xht.ini
new file mode 100644
index 00000000000..e584ece04f0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-applies-to-003.xht.ini
@@ -0,0 +1,2 @@
+[word-spacing-applies-to-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-justify-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-justify-001.xht.ini
new file mode 100644
index 00000000000..373c9869d6b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/word-spacing-justify-001.xht.ini
@@ -0,0 +1,2 @@
+[word-spacing-justify-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-matrix.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-matrix.html.ini
new file mode 100644
index 00000000000..3afac979c9a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-matrix.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-matrix.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-rotate.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-rotate.html.ini
new file mode 100644
index 00000000000..c59e8850f11
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-rotate.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-rotate.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-scale.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-scale.html.ini
new file mode 100644
index 00000000000..1c2737480bc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-scale.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-scale.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-skew.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-skew.html.ini
new file mode 100644
index 00000000000..4b4e61d5e63
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-skew.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-skew.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate-em.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
new file mode 100644
index 00000000000..b867fce476d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-translate-em.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate.html.ini
new file mode 100644
index 00000000000..67e080ac812
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/animation/transform-interpolation-translate.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-translate.html]
+  expected: TIMEOUT
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/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/encoding/streams/decode-non-utf8.any.js.ini b/tests/wpt/metadata-layout-2020/encoding/streams/decode-non-utf8.any.js.ini
new file mode 100644
index 00000000000..ec7a3e8334c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/encoding/streams/decode-non-utf8.any.js.ini
@@ -0,0 +1,87 @@
+[decode-non-utf8.any.sharedworker.html]
+  expected: ERROR
+
+[decode-non-utf8.any.worker.html]
+  [TextDecoderStream should be able to reject invalid sequences in Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-8859-14]
+    expected: FAIL
+
+
+[decode-non-utf8.any.html]
+  [TextDecoderStream should be able to reject invalid sequences in Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode Shift_JIS]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode invalid sequences in UTF-16BE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode UTF-16LE]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-8859-14]
+    expected: FAIL
+
+
+[decode-non-utf8.any.serviceworker.html]
+  expected: ERROR
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 2020f9c6aec..43c5b99d112 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -312,21 +312,21 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
new file mode 100644
index 00000000000..4ed63f6f6dd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
@@ -0,0 +1,47 @@
+[multiple-redirect-https-downgrade-upgrade.sub.html]
+  expected: ERROR
+  [Https downgrade-upgrade script => No headers: sec-fetch-dest]
+    expected: FAIL
+
+  [Https downgrade-upgrade iframe: sec-fetch-dest]
+    expected: FAIL
+
+  [Https downgrade-upgrade script => No headers: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade object]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade track]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade fetch() api]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade script => No headers: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade stylesheet]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade iframe: sec-fetch-site]
+    expected: FAIL
+
+  [Https downgrade-upgrade embed]
+    expected: TIMEOUT
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-dest]
+    expected: FAIL
+
+  [Https downgrade-upgrade preload]
+    expected: TIMEOUT
+
+  [Https downgrade-upgrade iframe: sec-fetch-mode]
+    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 30e1b851fd4..aa6eb8f6085 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,3 +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%20'NosniFF']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/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
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
index 23b7e5619f5..0208c7d1560 100644
--- a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
@@ -1220,6 +1220,9 @@
   [ElementInternals interface: operation setValidity(optional ValidityStateFlags, optional DOMString, optional HTMLElement)]
     expected: FAIL
 
+  [ElementInternals interface: attribute shadowRoot]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
@@ -2340,9 +2343,6 @@
   [HTMLMeterElement interface: attribute optimum]
     expected: FAIL
 
-  [HTMLAreaElement interface: document.createElement("area") must inherit property "rel" with the proper type]
-    expected: FAIL
-
   [HTMLInputElement interface: createInput("password") must inherit property "useMap" with the proper type]
     expected: FAIL
 
@@ -2442,9 +2442,6 @@
   [HTMLFrameElement interface: attribute frameBorder]
     expected: FAIL
 
-  [HTMLAreaElement interface: attribute rel]
-    expected: FAIL
-
   [HTMLImageElement interface: new Image() must inherit property "decode()" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 3538891dae8..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
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_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..4df5d7a35de 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..1b74d6e073d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 23fb39e544c..b1aa0f1f1c4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,14 +1,13 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..c3c3cd26dff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,12 +1,13 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Rejection handler on pending-then-rejected promise]
     expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Thenable resolution]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
index 27206c6a0ea..241f7ef3a41 100644
--- a/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
@@ -170,3 +170,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/a-element.html.ini b/tests/wpt/metadata-layout-2020/url/a-element.html.ini
index 07b2df27ed9..1ceb3c024e8 100644
--- a/tests/wpt/metadata-layout-2020/url/a-element.html.ini
+++ b/tests/wpt/metadata-layout-2020/url/a-element.html.ini
@@ -170,3 +170,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini b/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
index 8ef667c011b..878823d27f3 100644
--- a/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
+++ b/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
@@ -170,3 +170,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/element_click/shadow_dom.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/element_click/shadow_dom.py.ini
new file mode 100644
index 00000000000..733556b7a10
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/element_click/shadow_dom.py.ini
@@ -0,0 +1,16 @@
+[shadow_dom.py]
+  [test_nested_shadow_element_click[checkbox_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[outer_element\]]
+    expected: FAIL
+
+  [test_shadow_element_click[checkbox_element\]]
+    expected: FAIL
+
+  [test_shadow_element_click[custom_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[inner_element\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
deleted file mode 100644
index 0e57356683e..00000000000
--- a/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[render_state_update.https.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index d4f62ed7113..faa00f45ecf 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0bf3725b1ce..a4363b0bbb9 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -18217,7 +18217,7 @@
       ]
      ],
      "rejects_if_not_active-manual.https.html": [
-      "28bb53313dce9266453b89f3bd98d7c01cb9ea68",
+      "6f2e9e95d41d9fcdd3640e7cb43892b53c1f832a",
       [
        null,
        {}
@@ -18260,7 +18260,7 @@
      ]
     },
     "rejects_if_not_active-manual.https.html": [
-     "8e214cb6094a25436374da984deaade660ccc191",
+     "bab6a8c54c63a2fc06b3c286f8adb7ba8b84938e",
      [
       null,
       {}
@@ -108081,12 +108081,12 @@
        ]
       ],
       "letter-spacing-079.xht": [
-       "f771afe302a2036a5ee860b4f9923900a480915f",
+       "31d5612b62a9d292663f9880150adb45356ed54f",
        [
         null,
         [
          [
-          "/css/CSS2/text/letter-spacing-007-ref.xht",
+          "/css/CSS2/text/letter-spacing-079-ref.xht",
           "=="
          ]
         ],
@@ -108886,6 +108886,19 @@
         {}
        ]
       ],
+      "text-indent-016.xht": [
+       "51abc502d641763f157a8da61d826041117fa219",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-017.xht": [
        "1a68e9f75f80f5625f23468bacb2b7034f7b371d",
        [
@@ -109329,7 +109342,7 @@
        ]
       ],
       "text-indent-100.xht": [
-       "7c498d2b5f9da57f9ad77bcb65405fce2bebe7b2",
+       "977d32170e77c60f6ef9c9c8bcd0f43c8c98da67",
        [
         null,
         [
@@ -109342,7 +109355,7 @@
        ]
       ],
       "text-indent-101.xht": [
-       "5007ff643d87a8db5473752730a08c327ccc160e",
+       "35e155aea8d2435403e0f09aec7dd06942aa1b3d",
        [
         null,
         [
@@ -109355,7 +109368,7 @@
        ]
       ],
       "text-indent-102.xht": [
-       "b187c79f524b755a7f7ae7491832df90f863fb36",
+       "a0352dea21a114007c432cf65a7dab8e775abc4c",
        [
         null,
         [
@@ -109809,6 +109822,32 @@
         {}
        ]
       ],
+      "text-indent-overflow-002.xht": [
+       "7c2f54a15a4222439d293a14bc8934fde92a080d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-overflow-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-overflow-003.xht": [
+       "fe6ac1bb5c995b7895e3b832f24c5cbb9a11dd77",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-overflow-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-overflow-004.xht": [
        "e53728af700b52cb42671edd8ed0401d69e60aea",
        [
@@ -110160,39 +110199,325 @@
         {}
        ]
       ],
-      "text-transform-capitalize-001.xht": [
-       "5dd1683545785c303204b73236a9be7377eee539",
+      "text-transform-bicameral-001.xht": [
+       "1db12c286d72487b0e0b1bc0f267e0223368d6e3",
        [
         null,
         [
          [
-          "/css/CSS2/text/text-transform-capitalize-001-ref.xht",
+          "/css/CSS2/text/text-transform-bicameral-001-ref.xht",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "text-transform-capitalize-002.xht": [
-       "ebc1f50afde20de08dee3a7201910c026c11d700",
+      "text-transform-bicameral-002.xht": [
+       "8233d51aa7a1373d974c23d6dbc491f149a1583a",
        [
         null,
         [
          [
-          "/css/CSS2/text/text-transform-capitalize-001-ref.xht",
+          "/css/CSS2/text/text-transform-bicameral-002-ref.xht",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "text-transform-capitalize-003.xht": [
-       "e2869d18a4eb57eafeda8517672962b0776e9228",
+      "text-transform-bicameral-003.xht": [
+       "53314d839eb0b3f6a3215e6e8cded41b8029b24b",
        [
         null,
         [
          [
-          "/css/CSS2/text/text-transform-capitalize-003-ref.xht",
+          "/css/CSS2/text/text-transform-bicameral-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-004.xht": [
+       "83b0de6568bc783724a8ea9ae62bee27b034ad7d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-005.xht": [
+       "5467156a8d8d7a34d626235d309b545e4286c2c6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-005-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-006.xht": [
+       "d86c8f5a2c42c41089b4a9a0c3b513ad76d787d6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-006-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-007.xht": [
+       "43fa4c332221d5e4f239949774f27b1ab9411531",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-008.xht": [
+       "31ed3373c778b7c69f1243855bad460b4dbfb0d8",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-008-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-009.xht": [
+       "2253509872d7d024304aec19ac3b98c141f8fedd",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-009-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-010.xht": [
+       "33c8116c90da25d839837e665d8f77f93fb02bf2",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-010-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-011.xht": [
+       "c4bc984c2f722f5027e5cb514b6693ac5efb7f26",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-011-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-012.xht": [
+       "9d051a58f1cf9ef408ed65ac699fcc492cdb862c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-012-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-013.xht": [
+       "513febe42dcef0c579ec9d9b79ce39d649dad36c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-013-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-014.xht": [
+       "62409ea9bdcd08a9dc52913409c13709bb4373e2",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-014-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-015.xht": [
+       "b3e44534fbe89ba22ad59ed726a4b24a270b021e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-015-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-016.xht": [
+       "7d834572e7f27ad2b5cd6ed9d205507a2f76402d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-016-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-017.xht": [
+       "a6152f452ee0f3ee3a8fdaf2bfcb8776734947b7",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-017-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-018.xht": [
+       "e4fe1eea47f899daa8e5958c003f51aa01b52152",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-018-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-019.xht": [
+       "0fe0d8c7abdb8cc96b37ad87b283280ebb18cf2f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-019-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-020.xht": [
+       "113f8e38d63efdb3461246f6566ebf4a10fc7dcf",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-020-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-021.xht": [
+       "a74965464851be82e001e027ec044daa5452aa3d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-021-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-bicameral-022.xht": [
+       "7f8c65c67ed3aff99ec9ea1ac609334ab7eeb1a3",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-bicameral-022-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-cap-001.xht": [
+       "329f5f7ff02a8c0198f0b59c8b2e81f5ac597f97",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-cap-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-cap-002.xht": [
+       "bf4632b1d5980627f226dd3ba15375441d5c453b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-cap-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-cap-003.xht": [
+       "d3290c2a328fdb419095b457830f3c3219afdb6a",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-cap-003-ref.xht",
           "=="
          ]
         ],
@@ -110200,7 +110525,7 @@
        ]
       ],
       "text-transform-lowercase-001.xht": [
-       "59d9b245a1da7adbb1beecb10138767b94e8b8fb",
+       "58d8eb703750349c710dbbba0803dd2a117a66f6",
        [
         null,
         [
@@ -110212,8 +110537,21 @@
         {}
        ]
       ],
+      "text-transform-unicase-001.xht": [
+       "3979cbbd9cba26d338704431ae1c3d064de5afa3",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-unicase-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-transform-uppercase-001.xht": [
-       "8b0d28e18e092e6849bfac64bbc84860d224d334",
+       "4ef06f3e6640eaa99810dcefcd20fdbb28993d46",
        [
         null,
         [
@@ -110226,7 +110564,7 @@
        ]
       ],
       "text-transform-uppercase-002.xht": [
-       "9e268c80cadc4ed15091e05c31990baecf7136f8",
+       "0aff0f0aa1379ca26d38ae0c93823f7158a23e97",
        [
         null,
         [
@@ -110356,7 +110694,7 @@
        ]
       ],
       "white-space-applies-to-002.xht": [
-       "eaf86aad80c3a417b2dd41e7589d46fb68cc5b42",
+       "04e90d7f950b03e0f072a6cdb64621390ec8ebd6",
        [
         null,
         [
@@ -110369,7 +110707,7 @@
        ]
       ],
       "white-space-applies-to-003.xht": [
-       "031e3a8d56272c55932970e16aa8dce7baf6f475",
+       "67ad1e5d103c04aad755c2287289221cede5a14a",
        [
         null,
         [
@@ -110382,7 +110720,7 @@
        ]
       ],
       "white-space-applies-to-005.xht": [
-       "db6a06282dcc4d5046565c0d0dfde4f378e2b80b",
+       "8508a884be405320378c4376385a906345c9ea98",
        [
         null,
         [
@@ -110395,7 +110733,7 @@
        ]
       ],
       "white-space-applies-to-006.xht": [
-       "d750da518be78fafcd8d10c36bf8b55fb3c1a1e4",
+       "b60f51ff757c59d615400036e3b9ab19293a62a8",
        [
         null,
         [
@@ -110408,7 +110746,7 @@
        ]
       ],
       "white-space-applies-to-007.xht": [
-       "c99cdf93346e20a5b933498dbfb05d29a5d3c8ab",
+       "2521a6d8b446b9de8ad398327f044bf5ec734308",
        [
         null,
         [
@@ -110421,7 +110759,7 @@
        ]
       ],
       "white-space-applies-to-008.xht": [
-       "d3fd1fab0a98e9f7d2fd898c67da3ec9651bae0a",
+       "214d844f1a015f66458da61e875e206978f2ddba",
        [
         null,
         [
@@ -110434,7 +110772,7 @@
        ]
       ],
       "white-space-applies-to-009.xht": [
-       "2fef90d7c513607324d97dfde29b0b0f4594e88a",
+       "5328956af61550a684dcaf1cf378764e84790adb",
        [
         null,
         [
@@ -110447,7 +110785,7 @@
        ]
       ],
       "white-space-applies-to-010.xht": [
-       "4c6367859560afbb2474c42b7fe280d42c436603",
+       "affee6ab1a8490ca6f26c9005071ad6acefa1c8d",
        [
         null,
         [
@@ -110460,7 +110798,7 @@
        ]
       ],
       "white-space-applies-to-011.xht": [
-       "31370f896a6b0df13712ce798c74dfb0a907efe7",
+       "f4dcfbe9b0314e73008489abb055efdeca26d7ab",
        [
         null,
         [
@@ -110473,7 +110811,7 @@
        ]
       ],
       "white-space-applies-to-012.xht": [
-       "8819f33f129ec34663683975e76c7ff3cfcd600f",
+       "f4d9ecfe4e07487f2dcf4e01d3033143d0242e3e",
        [
         null,
         [
@@ -110486,7 +110824,7 @@
        ]
       ],
       "white-space-applies-to-013.xht": [
-       "32171998cfdd0caebe8299f0de571f7bbe021561",
+       "4e01932c837e98f2df3bde56db6fcc6929459cbb",
        [
         null,
         [
@@ -110499,7 +110837,7 @@
        ]
       ],
       "white-space-applies-to-014.xht": [
-       "9911721e8dcbfda27a5909a3d4622e46923b8129",
+       "fc9b64125262f0f20f02f91fe044572b76495e5f",
        [
         null,
         [
@@ -110512,7 +110850,7 @@
        ]
       ],
       "white-space-applies-to-015.xht": [
-       "bb11f26d2cf773dc5243c661cebbbe4c78afca0c",
+       "1b8acd7b050039b606718a1ee646a126696fda4a",
        [
         null,
         [
@@ -110863,7 +111201,7 @@
        ]
       ],
       "white-space-nowrap-attribute-001.xht": [
-       "228b4f8c19f0ae07564c8161b898f24f7eb78f8d",
+       "995cf637dd191986eca1061938a19f872ab58e1f",
        [
         null,
         [
@@ -110876,7 +111214,7 @@
        ]
       ],
       "white-space-p-element-001.xht": [
-       "ac7376b134dff0f45e7000de847a205eae0f71c6",
+       "7074b87df9d425b3ffce66549c7d660d7440dc60",
        [
         null,
         [
@@ -110941,7 +111279,7 @@
        ]
       ],
       "white-space-pre-element-001.xht": [
-       "7ec2ba896d44d285ebd49649236bb2dddc534bf4",
+       "a40988144d7e877b6e6295fc813cc20c77ab1977",
        [
         null,
         [
@@ -111005,6 +111343,45 @@
         {}
        ]
       ],
+      "white-space-processing-005.xht": [
+       "1237c6830d3823fa0de0a5e49a568493cfb8473b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-005-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-processing-006.xht": [
+       "886e6bdc0595cf5ee9ce21f0e375d97830554c6e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-006-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-processing-007.xht": [
+       "d05501d169df24cfd467b5dc761c549259754595",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-005-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-processing-008.xht": [
        "1e9fb19486606326ff7331fefd8f8521da773509",
        [
@@ -111083,6 +111460,32 @@
         {}
        ]
       ],
+      "white-space-processing-014.xht": [
+       "8f4c10f6e024b0837c2a094faca96faee58a4511",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-014-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-processing-015.xht": [
+       "329753677b5241ec30c20a135e0a081a9b871130",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-015-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-processing-016.xht": [
        "f284ec407d1bef71cc89d5f90f7d53db441e0bef",
        [
@@ -111499,8 +111902,21 @@
         {}
        ]
       ],
+      "white-space-processing-048.xht": [
+       "13a639ab75613ee3fd554dfa50a58b92bbaff7da",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/white-space-processing-048-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-processing-049.xht": [
-       "5d5602de342ca27fe22e9c689b429b75da2eb70a",
+       "4492d4b64b53df59543bcf3a810e6f9a1e548c3e",
        [
         null,
         [
@@ -111602,6 +112018,903 @@
         ],
         {}
        ]
+      ],
+      "word-spacing-004.xht": [
+       "f7e449efc2518bd7b686b73481b4f0ee1fc25f57",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-005.xht": [
+       "16db0a26f65c6d76f45de7e5b86d01337d0a41fa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-006.xht": [
+       "8eb27fd6b5daed0984f37dde753c426908906c0d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-007.xht": [
+       "98a55006ad154142092846ba89d502f5ae22f3aa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-008.xht": [
+       "a69ac2cc726bc70d596704235ce4ef4b45b67736",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-016.xht": [
+       "d35020bb85800567536c39129eefa53436c0ed62",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-017.xht": [
+       "53752f7624737260b18ea3a1cbcbbf8e533af2f7",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-018.xht": [
+       "ce7ed139741dbd705d78c571e25fccf3dac94766",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-019.xht": [
+       "5c047edfa61218911cd73d8f0421f8f2bf94b63c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-020.xht": [
+       "c4ee51998f7f11a06630e3957d1ae145b31f2a9b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-028.xht": [
+       "bc4ad9ff2bb97ee4fac51368e364cc2621793d08",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-029.xht": [
+       "c33d73e3502efc0574a20d199f11767e112a5660",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-030.xht": [
+       "74575f93ad24de88d2678075123e0be93d4d39f4",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-031.xht": [
+       "f28c3c123cfbf6f15c0167dca33af6f2b003f7d9",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-032.xht": [
+       "bf7cea9b1c5af8e93b635f372c4cf65eef2b17da",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-040.xht": [
+       "7d9995882e3711c0515fc501ee6b17036934da72",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-041.xht": [
+       "9daf333f8e2647ec9f0367bd3252aabb8185ac1e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-042.xht": [
+       "f07bd616b438a40151496d83eab98c5061a65e2d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-043.xht": [
+       "6d56c4ae080b408b9921e2e63899119b0ec4b746",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-044.xht": [
+       "ba5650373f44cb420f929859e2a855bcd14fc6f3",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-052.xht": [
+       "97a017bf2051ed1efb28ef65e6a6d779368cc2ae",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-053.xht": [
+       "2224326c9bef21e8b5b9ad58c91925ec416b50ed",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-054.xht": [
+       "e8d217e1567a3ffde7ec00060494c901b649c6da",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-055.xht": [
+       "895882fa7fcf740fe4c38483ac5a0bab04b1c4ea",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-056.xht": [
+       "8d393bc97c55c7bccaa0513fced671e30faf4cbc",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-064.xht": [
+       "5f60fd661811cc36af062150bda1e59318c9fab5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-065.xht": [
+       "3f9a20f0301699f1d695f47c91dbe6ed259d8c3d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-066.xht": [
+       "0f4a7bb00cb5ce4a381a9e232a8b939ff84b6f62",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-067.xht": [
+       "f2f2eda7bf8469ab0b68379b6e9d996b8baec5ba",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-068.xht": [
+       "d8aa6b7b60ca7dde7275d6c2ad03e1dd520461aa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-076.xht": [
+       "01cfc7d5ed24786166ff35a19b13a58dcf22df35",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-077.xht": [
+       "b27a110554897e78a18259e8a179d339ffbc909e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-078.xht": [
+       "6d53a9b4322e20bf5c74cd06e17f5f963af3f2c2",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-079.xht": [
+       "aa26d4e6a149e796c510b14e8c3aaff54c1ef095",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-080.xht": [
+       "9c9cedb4bc1f42c573edff99310435e7df508bcf",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-088.xht": [
+       "324ebbe1b5d81ea93eeb2c2993d76ba0af1cc08f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-089.xht": [
+       "cd4e4370c8f978983f7f2a270b30bba073d0391f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-090.xht": [
+       "d77ef61e0b0e059ca85626152934dc40dfc5944d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-091.xht": [
+       "534e3018a4646f0d81d9d53afb15056fd42fe275",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-091-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-092.xht": [
+       "11b5e581690a06e278790019fb80e03122f0f7be",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-091-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-097.xht": [
+       "e6807d77aa25373e6877bcb7d03dcdd82ed5854b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-098.xht": [
+       "23b22a2406527c1c00bf2d0940296d420e7f74eb",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-099.xht": [
+       "160d1671d2b6c97b919d3132f683f4d3f4a4dc96",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-100.xht": [
+       "41208d7153d33214e476738bb7dbb7e24b949660",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-101.xht": [
+       "cc09cd2c45af9cdbed90eee9c5c8252b91d937d8",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-091-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-001.xht": [
+       "1b8935ba3ec3ceadb4d70517ba12514c6d0af11a",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-002.xht": [
+       "905623e6cbb6ebe3b547fd2fafa026e97de0dcfe",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-003.xht": [
+       "df82c523dae1d5bf66bbfee0acebc01c76ac0b34",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-005.xht": [
+       "3d3980335a58ee4d2fd0d9a7da1dfb0f4fb8751d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-006.xht": [
+       "2391060920d111dbbb77eca6620a7feebebc0b33",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-007.xht": [
+       "a8780bf5de708a7494661ccb6fa2f8cf5ed7f222",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-008.xht": [
+       "f5b1f983577b34d9fa3bbf145e1a2f36bac9ee32",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-009.xht": [
+       "aecc99e2a3cc9a99c3b7028e3f62c085fa278668",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-010.xht": [
+       "f726522e73b4a84c0947e7d1337fee1e2cd8ae1f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-011.xht": [
+       "ad9d843c75b551f41b73c4d7544caa5eb75e1482",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-012.xht": [
+       "2bc77c239dd07781ac69e429d06d4031e1673677",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-012-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-013.xht": [
+       "628c51633539f33fe56dc98208a31f5544adba6a",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-012-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-014.xht": [
+       "0fe3c6217fc178ffee9868a56bc7027d55df4618",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-applies-to-015.xht": [
+       "c81aa5a99a77190d9762c926a65a68f896546c86",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-characters-001.xht": [
+       "73cd132ef401dba322ed9a3020135ba2cf872168",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-characters-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-characters-002.xht": [
+       "e35c513369318f7367354539576d8a4d4e016fb1",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-characters-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-characters-003.xht": [
+       "97527191885ca030014bcf3e3dacaa051d138236",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-characters-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-justify-001.xht": [
+       "17d811de98fe191295a3fd3fd103b4e0e575fcf2",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-justify-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-001.xht": [
+       "0f28e33f6486d11ce6dec2fbcc51259342c61889",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-002.xht": [
+       "990b98eca8b1298309ecbb50b9e89e321fb29a80",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-003.xht": [
+       "9655c134ebd6438f1ac16e1f546586a679382f1d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-004.xht": [
+       "5aa54a681016f430efdc11db8dc51ce68da9687c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-005.xht": [
+       "daaa40fb2c639089b673f4092f81778fde4afe86",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-005-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-spacing-remove-space-006.xht": [
+       "d3b2936770f7d014b66a9f5c7ddb06bf84e4e0ba",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/word-spacing-remove-space-006-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "ui": {
@@ -159010,6 +160323,19 @@
        {}
       ]
      ],
+     "multicol-fill-balance-004.html": [
+      "1d90cc45f61fb3512eeca3a1905f5d75bf2b640f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "multicol-gap-000.xht": [
       "88aa17e8b488565dc40398e6e8f1d2e3bf3a97a1",
       [
@@ -160076,6 +161402,19 @@
        {}
       ]
      ],
+     "multicol-span-all-015.html": [
+      "041c211b855e50ad70e65c98af73567848e3534e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "multicol-span-all-block-sibling-003.xht": [
       "abaa45f0a85023f3f07a9db483629b74d2b09d71",
       [
@@ -161601,6 +162940,32 @@
        {}
       ]
      ],
+     "clip-006.html": [
+      "08f755ad75c452fade0381b8ba8f44dffbf0e797",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "clip-007.html": [
+      "642ea9c3e6f38942ae7d754ca80581f2432107ae",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "dynamic-visible-to-clip-001.html": [
       "e2011324dda6e00309bf70c2e364fdb2dd1f23ae",
       [
@@ -182194,26 +183559,26 @@
         {}
        ]
       ],
-      "text-transform-lowercase-001.xht": [
-       "dc3fadf64caf5786123250da2cc50187ec693d2b",
+      "text-transform-lowercase-101.xht": [
+       "2016cf072007feae6674d16cfdf33430ea360dd8",
        [
         null,
         [
          [
-          "/css/css-text/text-transform/reference/text-transform-lowercase-001-ref.xht",
+          "/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht",
           "=="
          ]
         ],
         {}
        ]
       ],
-      "text-transform-lowercase-002.xht": [
-       "42deb58b1bb08474f754adf8f8b492d04e9b6613",
+      "text-transform-lowercase-102.xht": [
+       "ebbd5bf2d2bbb32a2339ee6e50dd0bd3d3fc8873",
        [
         null,
         [
          [
-          "/css/css-text/text-transform/text-transform-lowercase-002-ref.xht",
+          "/css/css-text/text-transform/text-transform-lowercase-102-ref.xht",
           "=="
          ]
         ],
@@ -182363,13 +183728,13 @@
         {}
        ]
       ],
-      "text-transform-uppercase-001.xht": [
-       "e0d1f9a195557004455cd70fba33b8e1da26da93",
+      "text-transform-uppercase-101.xht": [
+       "559992e76ee66222f75069a75858234cca6e6f7e",
        [
         null,
         [
          [
-          "/css/css-text/text-transform/reference/text-transform-uppercase-001-ref.xht",
+          "/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht",
           "=="
          ]
         ],
@@ -189202,6 +190567,86 @@
        {}
       ]
      ],
+     "animation": {
+      "transform-interpolation-matrix.html": [
+       "b5f9c3cd3084024756ef95e46e85d0110273cab5",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?matrix",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "transform-interpolation-rotate.html": [
+       "9d94d83424d5732a9bdac7be252dccb1cb421aab",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?rotate",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "transform-interpolation-scale.html": [
+       "ef0da0d1f431d85c7896c47d0785abf93c95785f",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?scale",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "transform-interpolation-skew.html": [
+       "4f8aa52fd10d662d15582b48e7ad1b2a1f1a05d9",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?skew",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "transform-interpolation-translate-em.html": [
+       "aff613ab09c3c66241047886e000c441c8215adc",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?translateEm",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "transform-interpolation-translate.html": [
+       "5abeb240932957f775b88b073ff6596d63681d71",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/animation/transform-interpolation-ref.html?translate",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "backface-visibility-001.html": [
       "c5ee9cc0f12f6012c105758cc14afbc6f2feb9dc",
       [
@@ -291732,6 +293177,10 @@
        "b61d9defb67d89611b8d9f8547d452bc66d68002",
        []
       ],
+      "letter-spacing-079-ref.xht": [
+       "ec24b9871d7e43542f65ff037cce55fda4bd8148",
+       []
+      ],
       "letter-spacing-091-ref.xht": [
        "7d485ac65c1fa11e56c9c53967a18cdf64b53f60",
        []
@@ -292026,6 +293475,14 @@
        "15a15b36090a4a327bfb0507cc19e0667ff8a78f",
        []
       ],
+      "text-indent-overflow-002-ref.xht": [
+       "4fffdaf4130d7abd190ea89570f7ea2482c39c53",
+       []
+      ],
+      "text-indent-overflow-003-ref.xht": [
+       "ba7d905ae5292ca531140517de23f420ce96591f",
+       []
+      ],
       "text-indent-percent-001-ref.xht": [
        "335ed62bbbbc32f846c97f8bcb2d5ae8512c4a7c",
        []
@@ -292058,11 +293515,99 @@
        "1a172ca66d5019dbc89c072e3b77ee633af0113a",
        []
       ],
-      "text-transform-capitalize-001-ref.xht": [
+      "text-transform-bicameral-001-ref.xht": [
+       "048bb0483309edb3c68f6e9df78455dd98731447",
+       []
+      ],
+      "text-transform-bicameral-002-ref.xht": [
+       "a8e51fd7dad306d46af9490e490416217c8f6d9c",
+       []
+      ],
+      "text-transform-bicameral-003-ref.xht": [
+       "b2c7cfec36833ce3db04c8442c78b1c38dad9840",
+       []
+      ],
+      "text-transform-bicameral-004-ref.xht": [
+       "d6f19211599983198a23295c4af66f0b759e5766",
+       []
+      ],
+      "text-transform-bicameral-005-ref.xht": [
+       "6f993f3a3a01d33ca795351d75627209ffb42736",
+       []
+      ],
+      "text-transform-bicameral-006-ref.xht": [
+       "ddf3b8b3ec8d4ab9a947557331c2f9811935be20",
+       []
+      ],
+      "text-transform-bicameral-007-ref.xht": [
+       "56e640913d0537b5045e0474389af17e254a8f7b",
+       []
+      ],
+      "text-transform-bicameral-008-ref.xht": [
+       "7fdd0d0140fd94dc7e6e353e5c1d190634c67f75",
+       []
+      ],
+      "text-transform-bicameral-009-ref.xht": [
+       "1a8727ddec16c850227376fbac85b0fa61e2ec12",
+       []
+      ],
+      "text-transform-bicameral-010-ref.xht": [
+       "c5d842cb9c7e7044f5427be1caf7fb6d2b20a2b5",
+       []
+      ],
+      "text-transform-bicameral-011-ref.xht": [
+       "54945b7d61cb66701c1cd9fdd3d05bb0018eb684",
+       []
+      ],
+      "text-transform-bicameral-012-ref.xht": [
+       "745b7c7326d5b4773bbf6cb1e25e9165ab23d2e7",
+       []
+      ],
+      "text-transform-bicameral-013-ref.xht": [
+       "48a8b43b4b2e2de2fee04466304461f7747d9e6d",
+       []
+      ],
+      "text-transform-bicameral-014-ref.xht": [
+       "27249cce979f9aef05f3e330e72068ef3b34891a",
+       []
+      ],
+      "text-transform-bicameral-015-ref.xht": [
+       "2f5c8877cfea2c42291cb5d434ec3f5ad9cc0ade",
+       []
+      ],
+      "text-transform-bicameral-016-ref.xht": [
+       "c4b2e8e031dd43c20de6cc46bbd9e96e8ee5d3f3",
+       []
+      ],
+      "text-transform-bicameral-017-ref.xht": [
+       "4262ac0478f8c59d2845138e52eb9dabcdc59c18",
+       []
+      ],
+      "text-transform-bicameral-018-ref.xht": [
+       "1665eba3c4f8e7800c03cdba66244e5f77e7bac9",
+       []
+      ],
+      "text-transform-bicameral-019-ref.xht": [
+       "97b3be4a1d260cd510ccef0180183a02f7e9d179",
+       []
+      ],
+      "text-transform-bicameral-020-ref.xht": [
+       "51d41c4cd7e8f2e666736d94dc4ab9c36522ae1b",
+       []
+      ],
+      "text-transform-bicameral-021-ref.xht": [
+       "17567c6b8c82b8b5eeb3f9b34c8cd83be67dd718",
+       []
+      ],
+      "text-transform-bicameral-022-ref.xht": [
+       "f2ca31d3e6bdb841273064467c35c3ae08debc54",
+       []
+      ],
+      "text-transform-cap-001-ref.xht": [
        "2408b13443ffeb58c8f7dbfd0eb620f0632d0a76",
        []
       ],
-      "text-transform-capitalize-003-ref.xht": [
+      "text-transform-cap-003-ref.xht": [
        "f1ea0ece0820f04950eb9012837552b87f1d179a",
        []
       ],
@@ -292070,6 +293615,10 @@
        "d9cff6d61876ad6481594069c1317aab810b4f2c",
        []
       ],
+      "text-transform-unicase-001-ref.xht": [
+       "3dffb50868886b93ceede24634c78caa2ce91fc3",
+       []
+      ],
       "text-transform-uppercase-001-ref.xht": [
        "7751d8d4d85219e257938f3573b0f72c43737816",
        []
@@ -292190,10 +293739,26 @@
        "30320ebde2e01f43c6198cb9c590d31b7bd7566c",
        []
       ],
+      "white-space-processing-005-ref.xht": [
+       "e42ddd808579a50c25de8ae9b41e40298964f1f1",
+       []
+      ],
+      "white-space-processing-006-ref.xht": [
+       "76e313a593b504fc5f81e57ece8d39631f63b058",
+       []
+      ],
       "white-space-processing-013-ref.xht": [
        "937cb87d1497d7298c010f8be6b0c5fd476afb9f",
        []
       ],
+      "white-space-processing-014-ref.xht": [
+       "9b1bc070d21f0ab81252871fdf08658ca84d4709",
+       []
+      ],
+      "white-space-processing-015-ref.xht": [
+       "d31a52d448e8fcea8da476a8f9e1b8d84cec9ab0",
+       []
+      ],
       "white-space-processing-016-ref.xht": [
        "78feea96188376d91eda06b3117459a12c879c15",
        []
@@ -292218,6 +293783,10 @@
        "9c7e0950ba143bfc71fbfece569988d9ff4e940d",
        []
       ],
+      "white-space-processing-048-ref.xht": [
+       "ab837b027688853645e16a8a9e97fa98293e0550",
+       []
+      ],
       "white-space-processing-049-ref.xht": [
        "0903a615cf65d60fa5f4b90706779f038ca76a2c",
        []
@@ -292237,6 +293806,74 @@
       "white-space-processing-056-ref.xht": [
        "2a9e425fd749fb8a9fae4727eacb945750c5a47f",
        []
+      ],
+      "word-spacing-004-ref.xht": [
+       "2dab814ef0d54bec087a0705cbf1fa72ff8f744e",
+       []
+      ],
+      "word-spacing-007-ref.xht": [
+       "dddf4d31ea82999b694182f887cd8c2f4e252bcc",
+       []
+      ],
+      "word-spacing-091-ref.xht": [
+       "5f80730fb086aa11d915d9d859cdf0286ff01d9e",
+       []
+      ],
+      "word-spacing-applies-to-001-ref.xht": [
+       "adec02560e2a57b313878bba472c9c48e03e5f57",
+       []
+      ],
+      "word-spacing-applies-to-003-ref.xht": [
+       "620db3dc4007f866533fec3932454dd696e7519d",
+       []
+      ],
+      "word-spacing-applies-to-007-ref.xht": [
+       "3763d7e86b310881046fa2b410a39f78a330f498",
+       []
+      ],
+      "word-spacing-applies-to-012-ref.xht": [
+       "59fcf0312ae10c5d3a5e687ee0f65cff7d514765",
+       []
+      ],
+      "word-spacing-characters-001-ref.xht": [
+       "4a6004eb6fa7730be18b05028360f0aa9d9f2a69",
+       []
+      ],
+      "word-spacing-characters-002-ref.xht": [
+       "4b7928d9762f2373e0e814a7201d4c338166a868",
+       []
+      ],
+      "word-spacing-characters-003-ref.xht": [
+       "b8d64adee1d9b7f0be66688d654d430b317e375a",
+       []
+      ],
+      "word-spacing-justify-001-ref.xht": [
+       "90268c2994a3c6517ae60ae6840661e1e044ffc9",
+       []
+      ],
+      "word-spacing-remove-space-001-ref.xht": [
+       "8f331d3dbcc32ebded46ca5c905682e9a80f71e4",
+       []
+      ],
+      "word-spacing-remove-space-002-ref.xht": [
+       "36e219475187fafc4f689d1e619962f20d08e5b6",
+       []
+      ],
+      "word-spacing-remove-space-003-ref.xht": [
+       "596ee02c97566298453dbb75ef6e95e3a71f73cd",
+       []
+      ],
+      "word-spacing-remove-space-004-ref.xht": [
+       "8c55f28f72574148aaa175d5662f9ec0e70ca494",
+       []
+      ],
+      "word-spacing-remove-space-005-ref.xht": [
+       "de884afbba0877273cf1377c8e4719057a2dcbc7",
+       []
+      ],
+      "word-spacing-remove-space-006-ref.xht": [
+       "1a809e523b6ce1ee0d9bf2b75cb181b4df9cd482",
+       []
       ]
      },
      "ui": {
@@ -315415,7 +317052,7 @@
         "915e8444f1335e920073e2c8091281241370f830",
         []
        ],
-       "text-transform-lowercase-001-ref.xht": [
+       "text-transform-lowercase-101-ref.xht": [
         "3d6eb4af8ac5aeb7fd54e1b2e2aec325886ddca0",
         []
        ],
@@ -315455,7 +317092,7 @@
         "66ce847e30a10fe09f014d24eb8ad1d429ef1d92",
         []
        ],
-       "text-transform-uppercase-001-ref.xht": [
+       "text-transform-uppercase-101-ref.xht": [
         "e80ca4ed7bae07256ba664850a59e21a7f55dfeb",
         []
        ],
@@ -315656,7 +317293,7 @@
        "a1e1c12270146490f983fa02c1b21b923434e844",
        []
       ],
-      "text-transform-lowercase-002-ref.xht": [
+      "text-transform-lowercase-102-ref.xht": [
        "f6da9069cde7d68d6b3ba4f5051d1bf4e43b9fbf",
        []
       ]
@@ -316661,6 +318298,22 @@
       "a6d5672c9dfe95c990c538f5596094eb2a9615bc",
       []
      ],
+     "animation": {
+      "support": {
+       "transform-interpolation-reftests.js": [
+        "0094b8a2c7590151e551aa1fde5be67e82779b6a",
+        []
+       ]
+      },
+      "transform-interpolation-animated-ref.html": [
+       "0930a7469a87fc8f6515e9f6ff442b6f7988ed4c",
+       []
+      ],
+      "transform-interpolation-ref.html": [
+       "2fee6f7c1fc46593f450fac606a651a12403ff72",
+       []
+      ]
+     },
      "backface-visibility-hidden-002-ref.html": [
       "eab3c4e38b1e832502db2607795caff395caaaed",
       []
@@ -330616,7 +332269,7 @@
       []
      ],
      "featurepolicy.js": [
-      "e2feee96e3d7333488f36cc16e5d206807ab592a",
+      "347cba1deea11171ecbc380d1528142434ececb7",
       []
      ],
      "nested-sandbox.html": [
@@ -336062,7 +337715,7 @@
       }
      },
      "elements-embedded.js": [
-      "27b5b61845d46b462ae9ccb5fd61cfdca9c804f6",
+      "c4b572cf309d17542746f3fcd98cf94baeb23817",
       []
      ],
      "elements-forms.js": [
@@ -345325,7 +346978,7 @@
      []
     ],
     "input-events-get-target-ranges.js": [
-     "4d09c4da521fb57817ab70af9f67ef181dcb56cf",
+     "a957678c50fd98f414f41c8d46987d72b3c96f57",
      []
     ]
    },
@@ -345627,7 +347280,7 @@
      []
     ],
     "html.idl": [
-     "3bf41f95893847038a22582cbde7a4ec7d70475f",
+     "8bf6d0f52df5e3daac47c4e9a8bd2567b3017d32",
      []
     ],
     "idle-detection.tentative.idl": [
@@ -345771,7 +347424,7 @@
      []
     ],
     "payment-request.idl": [
-     "9b6537c97ec6f476bd941ff929582bb90e04bb9b",
+     "dc0511b0c4b091066a9dcbc94ece9cac28088bde",
      []
     ],
     "performance-timeline.idl": [
@@ -345847,7 +347500,7 @@
      []
     ],
     "sanitizer-api.tentative.idl": [
-     "600ae0514a3094e19813476cd065162b9e0dfb4c",
+     "6778c51bdfd70d13d9e8bdb05a7b87797ec07aa5",
      []
     ],
     "savedata.idl": [
@@ -346110,7 +347763,7 @@
       []
      ],
      "same-origin-grand-child-iframe.html": [
-      "f5645bf3e3f5c05107347495f153ed61137ce131",
+      "0a1426ef0211f9109162a5a6f04fa9b3e260fed0",
       []
      ],
      "scaled-target-subframe.html": [
@@ -346280,7 +347933,7 @@
     ]
    },
    "lint.ignore": [
-    "38ec5e19221cb7a6c919be8084e81699a6343418",
+    "8431077e6a677d6f0eeb2c05ab024fd073a5f490",
     []
    ],
    "loading": {
@@ -348526,7 +350179,7 @@
       []
      ],
      "send-origin-isolation-header.py": [
-      "cb37d430114693c829196c0c95fdd04dcdda4c28",
+      "fe3234b6501ed0aa6c74458f0c53d765d0cd85f3",
       []
      ]
     }
@@ -356302,7 +357955,7 @@
       []
      ],
      "taskcluster-run.py": [
-      "a4bd72a8c21d4e84b4ebd44fcff3680fd1291017",
+      "49a7d163385628320be85d6e61c27c41314d7f89",
       []
      ],
      "tc": {
@@ -364454,7 +366107,7 @@
       []
      ],
      "urltestdata.json": [
-      "dba7237d88a682e7ce2920cccd412f3f7fe7c83c",
+      "c7a906c82e5acc9473db6a97e7c3fbdd2a853550",
       []
      ]
     }
@@ -404921,6 +406574,13 @@
        ]
       ]
      },
+     "scroll-width-height.tentative.html": [
+      "9efaf1bff881264e2da85e28aa911c479d7739cf",
+      [
+       null,
+       {}
+      ]
+     ],
      "zero-column-width-computed-style.html": [
       "46d876f1a150c257be9c37d25a4a4c34d2f1d73d",
       [
@@ -421924,7 +423584,7 @@
        ]
       ],
       "overscroll-deltas.html": [
-       "091cfd0631b454babaeb8c32dd289468b6d509d3",
+       "6f0b77f22eda2ab497859ce8b0bcafc261b66c5a",
        [
         null,
         {
@@ -424793,6 +426453,16 @@
        }
       ]
      ],
+     "caret-navigation-around-line-break.html": [
+      "eb1499936eb2bc20d0f1a37094ec815fb1177f61",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
      "caretnavigation.html": [
       "defe7fecfc2850355fe21da8a6d14ed6c5265885",
       [
@@ -434312,7 +435982,7 @@
       ]
      ],
      "decode-non-utf8.any.js": [
-      "a7f8ec11c96fc73f9b9ddd0d69e8a947d0234c6e",
+      "2950a9e58edcbd41a150b74d864c1400a07d69e4",
       [
        "encoding/streams/decode-non-utf8.any.html",
        {
@@ -438496,7 +440166,7 @@
      ]
     ],
     "payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html": [
-     "daa2aa182daed73bd51bf32cf7981a805e3956c8",
+     "df53af2236425cd4168d7a9ff58109dd86c861d8",
      [
       null,
       {}
@@ -438510,21 +440180,21 @@
      ]
     ],
     "payment-allowed-by-feature-policy.https.sub.html": [
-     "ae77daa81517be8b79ad420ba0fb0416c6a501d3",
+     "ccb6740d6a2d96825e44c33aaaa90db71df30206",
      [
       null,
       {}
      ]
     ],
     "payment-default-feature-policy.https.sub.html": [
-     "ad4bbdcee606d1085754f5f1679c909e060b2706",
+     "f73ac82ab753062dad3c632bc7723c77da76fcad",
      [
       null,
       {}
      ]
     ],
     "payment-disabled-by-feature-policy.https.sub.html": [
-     "b82eb4f1ef541fb494b9061edf014f957c8117f1",
+     "0e479fd2a3de235f552d963f9973b46dbb390b41",
      [
       null,
       {}
@@ -483087,6 +484757,15 @@
       }
      ]
     ],
+    "input-events-get-target-ranges-during-and-after-dispatch.tentative.html": [
+     "be4656d04a84fada7f8b318a1df97ea062c39a95",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "input-events-get-target-ranges-forwarddelete.tentative.html": [
      "62a33c094000680bd5981f0e2e1cddb1a3c6c1f5",
      [
@@ -494091,20 +495770,6 @@
        {}
       ]
      ],
-     "allowpaymentrequest-attribute-same-origin-bc-containers.https.html": [
-      "e6675428b6457bf8ae71e550e683ba718f9fc474",
-      [
-       null,
-       {}
-      ]
-     ],
-     "basic.https.html": [
-      "af2c8e16b4af68b9d4d847a74f0021ebc8d14e89",
-      [
-       null,
-       {}
-      ]
-     ],
      "no-attribute-cross-origin-bc-containers.https.html": [
       "86edd6c9cc8eb21c27db0a38fecc8bb2ccde4942",
       [
@@ -494126,15 +495791,6 @@
        {}
       ]
      ],
-     "setting-allowpaymentrequest-timing.https.sub.html": [
-      "f9962e4ffa4fa69576fb31a7865bb0e3cb85d7cf",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
      "setting-allowpaymentrequest.https.sub.html": [
       "22881cd8933f224fe3f452868c68ac6b7f36a8ab",
       [
@@ -494190,7 +495846,7 @@
      ]
     ],
     "payment-is-showing.https.html": [
-     "d5e04a83d0d34b5fa408287ef8f8ff1e1722e7e3",
+     "fed6eaf6d9fada11446b32caaba07b5de2d88b0e",
      [
       null,
       {
@@ -494349,7 +496005,7 @@
      ]
     },
     "rejects_if_not_active.https.html": [
-     "1c666aea435758cd7f79172aaa691f43f7907a47",
+     "89c3407e3d0bc5ebafc3c7c0d00150991251a132",
      [
       null,
       {
@@ -495723,7 +497379,7 @@
      ]
     ],
     "pointerevent_setpointercapture_inactive_button_mouse.html": [
-     "b9172dddb4c576eedeeec696af9576cb9a47e6a0",
+     "f24661aadb87292b2f88d47350bafaec8a77be6b",
      [
       null,
       {
@@ -518813,6 +520469,27 @@
        {}
       ]
      ],
+     "animateMotion-circle.html": [
+      "3cf713f904849108efda2c1f2423a701c9fd4fa7",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animateMotion-display-none.html": [
+      "104744c17f8359ce3d50a95a0e8999ffa78e43a3",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animateMotion-ellipse.html": [
+      "109ae4f58698a4b47a1e1f1adfd39a24773db0a7",
+      [
+       null,
+       {}
+      ]
+     ],
      "animateMotion-fill-freeze.html": [
       "4e768efb0046972fdb62f9af6545134d97a9495c",
       [
@@ -518827,6 +520504,13 @@
        {}
       ]
      ],
+     "animateMotion-line.html": [
+      "f304de62dcfa8f6762220a1d4e099af304b1da15",
+      [
+       null,
+       {}
+      ]
+     ],
      "animateMotion-multiple.html": [
       "494d75a78550b40b7618f951b3cb81ec8c92fe55",
       [
@@ -518834,6 +520518,13 @@
        {}
       ]
      ],
+     "animateMotion-rect.html": [
+      "8853b047c3609026a90b72dbd4414e09a791a082",
+      [
+       null,
+       {}
+      ]
+     ],
      "animateMotion-still.html": [
       "bf9007ac2f38fe9dbe85a9f56de28358ecb82b91",
       [
@@ -520911,7 +522602,14 @@
         {}
        ]
       ]
-     }
+     },
+     "use-getComputedStyle.html": [
+      "1e5d5af57cbc042a851bee180a402a05fd177fe3",
+      [
+       null,
+       {}
+      ]
+     ]
     },
     "styling": {
      "presentation-attributes-irrelevant.html": [
@@ -561291,7 +562989,7 @@
        ]
       ],
       "combining-characters-002.xht": [
-       "4200e1542ba87adcce866f61a05bdb2648b206cf",
+       "3036378968655f073e76ed6ea72369678624d95c",
        [
         null,
         {}
@@ -562032,190 +563730,8 @@
         {}
        ]
       ],
-      "text-indent-016.xht": [
-       "12434f53f1b61a082162ad213fa2ab1b4639f122",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-overflow-002.xht": [
-       "ef4ac42d2a8b271de1153636a33525da1cb793a2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-overflow-003.xht": [
-       "79b3cb4bc330b9ab8dcfc3e60ccdee4a0a8787b3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-001.xht": [
-       "48a7bc86e3dfefe0dadc2e3975c7e8cf08817853",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-002.xht": [
-       "4cce6d8a3b6527d72525588162ec78a7f2cede99",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-003.xht": [
-       "a6e9cc321db46cd2f6a5cb74c10e830e3bf9567a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-004.xht": [
-       "dc55e4c5b7d3752df23802e35ad187dc87117e50",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-005.xht": [
-       "7e7f79143bbc1e28e4db474ba557d575eca2be79",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-006.xht": [
-       "dec1852ec3a66e8f28db1fb7222dd00b75a11037",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-007.xht": [
-       "6691aa2db0062e57d276c945b8c80564e35bbfe2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-008.xht": [
-       "03ffaf15b7c574871b2c17ae25fe2254e63d8a8f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-009.xht": [
-       "366b7fa54bbe64cf442410128f4545621b631803",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-010.xht": [
-       "768c66ebace583f5f5aa793c6651ea8885f8bc86",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-011.xht": [
-       "c4e812336705e2762541cbd2c0c11122d4eea6b8",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-012.xht": [
-       "7036841721b7830a3fac0fbee9c8ef216329087f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-013.xht": [
-       "c259b9accf075d2ce0a709389086ca8433c7c909",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-014.xht": [
-       "a830f3465004897534351ccf494061db3b19650d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-015.xht": [
-       "8ecc385a0151a1114e6398f5b4e8485530e2a5f3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-016.xht": [
-       "d84fc7d1779d6278d480652f9d95890ae2bbe8e6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-017.xht": [
-       "678d37c649ecc019e580356c90784c27ef22ff44",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-018.xht": [
-       "31a8dc0bd9fd19fc415842b360942a673a8ca172",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-019.xht": [
-       "259b95852e4f58f02df660aca8c8bb879f888f9b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-020.xht": [
-       "087d4709eeda25e1639dcf84072297fab2b5296b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-021.xht": [
-       "2de260ef97f3b4f6ddac7e79a286d04b1859a259",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-bicameral-022.xht": [
-       "9e195af6e142ee52b5cc78776f9bd0ec27419a15",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-unicase-001.xht": [
-       "c899e90046bf01a34744f9bfa4df78942090686f",
-       [
-        null,
-        {}
-       ]
-      ],
       "white-space-control-characters-001.xht": [
-       "40c4727704c961b7e2d147ed8ed4c7b50cfa99c1",
+       "09d66cd49beaad3627f03007185ec3ffb5c89400",
        [
         null,
         {}
@@ -562227,545 +563743,6 @@
         null,
         {}
        ]
-      ],
-      "white-space-processing-005.xht": [
-       "0cc09c00d45f9d2816531ed884cd18d07b9293cb",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-006.xht": [
-       "c67cf83535133b03ce4af0ade1ce47e602b64e4e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-007.xht": [
-       "4c0a83258102738bee2af29390b569e6576db2b7",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-014.xht": [
-       "75fb87be126ca493aa7747145200993721ef8c94",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-015.xht": [
-       "b123db459ce712ed56182e44b173234684061a61",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-048.xht": [
-       "d4c64697310254290d12012e69902dd03e6cc06c",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-057.xht": [
-       "b54e9b5419bd74c2ef726184812dae399a475309",
-       [
-        null,
-        {}
-       ]
-      ],
-      "white-space-processing-058.xht": [
-       "40007dbbd1015f6454e33e0ccb23253e1ba967e3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-004.xht": [
-       "823197cc8037ed48a44e7cac02e31d5584bfd974",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-005.xht": [
-       "c28f3cb375a5ff15bc59bd04cf51129bcbce3c2b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-006.xht": [
-       "9b3d54d7f213b1b9bcbf146df49a73c6798381b1",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-007.xht": [
-       "8c18aa337e46267aedb2fe57dcfc50ad6417d0c2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-008.xht": [
-       "a58eff478f6a3510a0215b9d8f3e56501833a8d2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-016.xht": [
-       "7114e7f6eccc6bc9123e4e8e3745edf24eeeda6a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-017.xht": [
-       "9cd07ece404e8e97f74725db734607f89ea26ab3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-018.xht": [
-       "810d45bd6dd2fd694a4a5aac25a2e010c831cbbf",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-019.xht": [
-       "5e3cd60f478ddfb174bdf0264ab5ec32bb88ce98",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-020.xht": [
-       "f49a79e3b795b49cb4fe4934c07616f124ab7a74",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-028.xht": [
-       "75019e2eb25237eb8db65e97b88a33e09d13d4b4",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-029.xht": [
-       "67aa05e12168f25d3315f008e0ac0bb0c72aa9a0",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-030.xht": [
-       "da8ff8df0e792659a1057c412cfb30a7427f33fd",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-031.xht": [
-       "89cac8dde5b40e8736b5d7d93e8c36082c165123",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-032.xht": [
-       "5e78d8f7debde7b2c5ec8e7abf93f7fb192dfb3d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-040.xht": [
-       "2669c344ed77d2a98e5a86700ae4fff673a96202",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-041.xht": [
-       "0b1e293f6ae7186ea4d4591d2ece69b804fe1dea",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-042.xht": [
-       "48166f8df4be1b09e7099de482f5e7467cc9d393",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-043.xht": [
-       "58b40e98dd5e82acdd5a4d6f3c97b3c0a7cfabbc",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-044.xht": [
-       "9c54efe206517b9965b026851a33d73cce413423",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-052.xht": [
-       "330829c266da5dfbd9c7ee8f94bbe3329e20ae94",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-053.xht": [
-       "b17d188797dd4686847d76027d878ee4d2bfbfde",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-054.xht": [
-       "9ec2d3fb93a53b407734ffb1a1e5caec897b88f4",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-055.xht": [
-       "f76ba7a7b7a88461de7ef9e7171cb6a1aa1c0e31",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-056.xht": [
-       "1cbc5ab13774f3b8548b56b427d739a637b0278a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-064.xht": [
-       "354265d6209be0c69a90459c119da05757bf1784",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-065.xht": [
-       "5a99dd0209aa9eafd66bbf2361240e7023dbb97b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-066.xht": [
-       "8ecad8b2c048ac24f44f80732e7dbf50b0ec1406",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-067.xht": [
-       "1e100bfbd1997f51c6edaf353d59e9dcb599c559",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-068.xht": [
-       "299326934e29b793cad1946a55ab465354ae7e16",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-076.xht": [
-       "bcc867e9dd72133ab2daba6bc978f99976d288ca",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-077.xht": [
-       "ebeca116dea60ffd723e33616f679b638f40301f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-078.xht": [
-       "bf86663d505e3b4b832466304fc0f3073fcae529",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-079.xht": [
-       "005946794a87bd3d46374a1e564282c1b5c4b726",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-080.xht": [
-       "b9593cb26461fbc4d6a36692767d498f09a1af4f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-088.xht": [
-       "d9d764cc5ffc0d7909eae798cbf06d7fd86805fc",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-089.xht": [
-       "244463958e87c4240c8eb845d388747c7d508caa",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-090.xht": [
-       "dbb29b82c5232981133137fa56a36b54ab558849",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-091.xht": [
-       "42dfe990ab127b7c603cd01e52192b01776ead65",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-092.xht": [
-       "b1362668cd36125b8b569f69c220716550004310",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-097.xht": [
-       "f6a9d05d94f659f3b6e440009ae4cff654db60a5",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-098.xht": [
-       "9d03c315d4268e462b43d96542bf6c461c2cf48b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-099.xht": [
-       "ecf88acbf02c6c3f2bc124e76ecbfc688ba7b0b2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-100.xht": [
-       "f520c66cfc24373d446ea76161b3113b6c658ede",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-101.xht": [
-       "1dacf22738d66a1084156527bcbe578eb124d73a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-001.xht": [
-       "abc440829379287020b212afbfacf37502e56bd2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-002.xht": [
-       "2168839e3b54a82c67c24b76abcb624241c96735",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-003.xht": [
-       "062b26b02bacc7ea12c8f86f223b001ee40fb356",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-005.xht": [
-       "121629fe120ba27c6a5a2ee310b759fe36ac30ee",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-006.xht": [
-       "3916c6ddbbcd4a995ef7bf8e585949274e9df161",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-007.xht": [
-       "f126cd1a9866db68a6387442caee98470f262ae6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-008.xht": [
-       "811172ca5060356e5d60aa7e41b0fe1f05bdab1b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-009.xht": [
-       "53bd343da4db9c8bc8c5e23a38b52e5d021e9491",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-010.xht": [
-       "3ccf704fcd7fe05562026233e5cbfc84383679e6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-011.xht": [
-       "53a846da43869ca0ba87a7a91488a47f05a340af",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-012.xht": [
-       "930e0d64bdc4d50c8ce86b7b6192b724fd4dabc3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-013.xht": [
-       "b6033bcf38310d647b282c51119642e8910c852b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-014.xht": [
-       "2d46ce4a923208c77b78c230735ca3e2c4f4736f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-applies-to-015.xht": [
-       "a57e9d7da9e913bb69a41a53390710dec771812a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-characters-001.xht": [
-       "c0cc3d7e888dbbf736a73874c9a2fc241aed43cc",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-characters-002.xht": [
-       "6cc25712b0303a1e631ff9484288185fffe7ad49",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-characters-003.xht": [
-       "203aa133173e8f9d212fe1c069e1367d29e2c816",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-justify-001.xht": [
-       "beae011e92013b9fdd1a49165df3c0bfac5aebec",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-001.xht": [
-       "5f9a77b5f8cfcb9679fbe1c44d7ccf032c5f6d14",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-002.xht": [
-       "57f7f1599376767d1f8d5c6b19c034420ac0d376",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-003.xht": [
-       "41b6cb6531b946d125386b8edd1640954eb1cf9d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-004.xht": [
-       "96c94a3a80ac5455ed70ca0a672515ac77c6f1cd",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-005.xht": [
-       "7cb53c84f57acb591b4d976b545b72eff33f62c1",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-spacing-remove-space-006.xht": [
-       "bd660ca269368e62b2b1c585d3078852f57bcb61",
-       [
-        null,
-        {}
-       ]
       ]
      },
      "ui": {
@@ -569383,6 +570360,13 @@
         {}
        ]
       ],
+      "shadow_dom.py": [
+       "b52f27429c1965804cbcbb691a74a53a9c10bfdb",
+       [
+        null,
+        {}
+       ]
+      ],
       "stale.py": [
        "cd24dd70603dc913d198fcb9a0535acb5e95c1c5",
        [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/text/letter-spacing-079.xht.ini b/tests/wpt/metadata/css/CSS2/text/letter-spacing-079.xht.ini
deleted file mode 100644
index b7948a213b9..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/letter-spacing-079.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[letter-spacing-079.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-100.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-100.xht.ini
deleted file mode 100644
index f07c0d17188..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-indent-100.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-100.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-101.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-101.xht.ini
deleted file mode 100644
index 07229cdbe24..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-indent-101.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-101.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-102.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-102.xht.ini
deleted file mode 100644
index 4b4ff6dd519..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-indent-102.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-indent-102.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-001.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-001.xht.ini
new file mode 100644
index 00000000000..af967170188
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-001.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-003.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-003.xht.ini
new file mode 100644
index 00000000000..618bd0fcaa1
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-005.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-005.xht.ini
new file mode 100644
index 00000000000..fe36b58068e
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-005.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-006.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-006.xht.ini
new file mode 100644
index 00000000000..74edadd19c9
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-006.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-007.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-007.xht.ini
new file mode 100644
index 00000000000..5610ec93ff4
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-007.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-009.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-009.xht.ini
new file mode 100644
index 00000000000..c7edfd9f2d1
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-009.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-009.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-011.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-011.xht.ini
new file mode 100644
index 00000000000..f8f08ceaceb
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-011.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-013.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-013.xht.ini
new file mode 100644
index 00000000000..830a8efbe52
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-013.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-015.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-015.xht.ini
new file mode 100644
index 00000000000..f2588138110
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-015.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-bicameral-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-017.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-017.xht.ini
new file mode 100644
index 00000000000..5f49204b378
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-017.xht.ini
@@ -0,0 +1,3 @@
+[text-transform-bicameral-017.xht]
+  expected:
+    if os == "mac": FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-019.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-019.xht.ini
new file mode 100644
index 00000000000..678a9a88283
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-019.xht.ini
@@ -0,0 +1,3 @@
+[text-transform-bicameral-019.xht]
+  expected:
+    if os == "mac": FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-021.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-021.xht.ini
new file mode 100644
index 00000000000..fa782bedb81
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-bicameral-021.xht.ini
@@ -0,0 +1,3 @@
+[text-transform-bicameral-021.xht]
+  expected:
+    if os == "mac": FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-cap-002.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-cap-002.xht.ini
new file mode 100644
index 00000000000..c27a19d526f
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-cap-002.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-cap-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-cap-003.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-cap-003.xht.ini
new file mode 100644
index 00000000000..cdfb6a56455
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-cap-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-cap-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-001.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-001.xht.ini
deleted file mode 100644
index fe20bbeedec..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-capitalize-001.xht]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/9821
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-002.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-002.xht.ini
deleted file mode 100644
index 35af3feb8a2..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-capitalize-002.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-003.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-003.xht.ini
deleted file mode 100644
index b3b1fb26b22..00000000000
--- a/tests/wpt/metadata/css/CSS2/text/text-transform-capitalize-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-capitalize-003.xht]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/9821
diff --git a/tests/wpt/metadata/css/CSS2/text/text-transform-unicase-001.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-transform-unicase-001.xht.ini
new file mode 100644
index 00000000000..f6e15e04ce0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-transform-unicase-001.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-unicase-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/white-space-processing-006.xht.ini b/tests/wpt/metadata/css/CSS2/text/white-space-processing-006.xht.ini
new file mode 100644
index 00000000000..30d24f49573
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/white-space-processing-006.xht.ini
@@ -0,0 +1,2 @@
+[white-space-processing-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/white-space-processing-048.xht.ini b/tests/wpt/metadata/css/CSS2/text/white-space-processing-048.xht.ini
new file mode 100644
index 00000000000..d6fae45ecb0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/white-space-processing-048.xht.ini
@@ -0,0 +1,2 @@
+[white-space-processing-048.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/white-space-processing-049.xht.ini b/tests/wpt/metadata/css/CSS2/text/white-space-processing-049.xht.ini
new file mode 100644
index 00000000000..8f4f9404c0a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/white-space-processing-049.xht.ini
@@ -0,0 +1,2 @@
+[white-space-processing-049.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/word-spacing-applies-to-003.xht.ini b/tests/wpt/metadata/css/CSS2/text/word-spacing-applies-to-003.xht.ini
new file mode 100644
index 00000000000..e584ece04f0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/word-spacing-applies-to-003.xht.ini
@@ -0,0 +1,2 @@
+[word-spacing-applies-to-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/word-spacing-characters-001.xht.ini b/tests/wpt/metadata/css/CSS2/text/word-spacing-characters-001.xht.ini
new file mode 100644
index 00000000000..76de0df39b6
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/word-spacing-characters-001.xht.ini
@@ -0,0 +1,2 @@
+[word-spacing-characters-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini b/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
deleted file mode 100644
index 42e2a57acc3..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hittest-anonymous-box.html]
-  [Hit-testing within an anonymous flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-lowercase-001.xht.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-lowercase-001.xht.ini
deleted file mode 100644
index 9cb00e12c7c..00000000000
--- a/tests/wpt/metadata/css/css-text/text-transform/text-transform-lowercase-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-lowercase-001.xht]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/9821
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-uppercase-001.xht.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-uppercase-001.xht.ini
deleted file mode 100644
index a277ee272fa..00000000000
--- a/tests/wpt/metadata/css/css-text/text-transform/text-transform-uppercase-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[text-transform-uppercase-001.xht]
-  type: reftest
-  disabled: https://github.com/servo/servo/issues/9821
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-matrix.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-matrix.html.ini
new file mode 100644
index 00000000000..3afac979c9a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-matrix.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-matrix.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-rotate.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-rotate.html.ini
new file mode 100644
index 00000000000..c59e8850f11
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-rotate.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-rotate.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-scale.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-scale.html.ini
new file mode 100644
index 00000000000..1c2737480bc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-scale.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-scale.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-skew.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-skew.html.ini
new file mode 100644
index 00000000000..4b4e61d5e63
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-skew.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-skew.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate-em.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
new file mode 100644
index 00000000000..b867fce476d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate-em.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-translate-em.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate.html.ini b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate.html.ini
new file mode 100644
index 00000000000..67e080ac812
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/animation/transform-interpolation-translate.html.ini
@@ -0,0 +1,2 @@
+[transform-interpolation-translate.html]
+  expected: TIMEOUT
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/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4..00000000000
--- a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/encoding/streams/decode-non-utf8.any.js.ini b/tests/wpt/metadata/encoding/streams/decode-non-utf8.any.js.ini
index 0ba9f98e771..752d9a392ad 100644
--- a/tests/wpt/metadata/encoding/streams/decode-non-utf8.any.js.ini
+++ b/tests/wpt/metadata/encoding/streams/decode-non-utf8.any.js.ini
@@ -35,6 +35,15 @@
   [TextDecoderStream should be able to decode ISO-8859-14]
     expected: FAIL
 
+  [TextDecoderStream should be able to decode invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
 
 [decode-non-utf8.any.html]
   [TextDecoderStream should be able to reject invalid sequences in Shift_JIS]
@@ -67,6 +76,15 @@
   [TextDecoderStream should be able to decode ISO-8859-14]
     expected: FAIL
 
+  [TextDecoderStream should be able to decode invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to decode ISO-2022-JP]
+    expected: FAIL
+
+  [TextDecoderStream should be able to reject invalid sequences in ISO-2022-JP]
+    expected: FAIL
+
 
 [decode-non-utf8.any.serviceworker.html]
   expected: ERROR
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 2a9c7d293f3..cbe907c5beb 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,21 +312,21 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
index 676c2c9ba18..67b16244dbe 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.sub.html.ini
@@ -36,3 +36,12 @@
   [Https downgrade-upgrade embed]
     expected: TIMEOUT
 
+  [Https downgrade-upgrade track]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade stylesheet]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade preload]
+    expected: TIMEOUT
+
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 30e1b851fd4..aa6eb8f6085 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +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%20'NosniFF']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/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
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 7cd29f953f7..72ac2418645 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -1358,6 +1358,9 @@
   [ElementInternals interface: operation setValidity(optional ValidityStateFlags, optional DOMString, optional HTMLElement)]
     expected: FAIL
 
+  [ElementInternals interface: attribute shadowRoot]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d1ca01ebc5f..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
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_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..4df5d7a35de 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..3f7e3e9544f 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/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
deleted file mode 100644
index 9f416703229..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[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/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
deleted file mode 100644
index b193c33c2b6..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit.html]
-  [default submit action should supersede onclick submit()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 510ea619a7d..a057142bbc5 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -8,11 +7,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index a1effd5f801..c3c3cd26dff 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,12 +1,13 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Rejection handler on pending-then-rejected promise]
     expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Thenable resolution]
     expected: FAIL
diff --git a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
index 7dd61bf43f8..62fa789e6cb 100644
--- a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
@@ -180,3 +180,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/a-element.html.ini b/tests/wpt/metadata/url/a-element.html.ini
index 3660cfdd65d..dfd902f71d1 100644
--- a/tests/wpt/metadata/url/a-element.html.ini
+++ b/tests/wpt/metadata/url/a-element.html.ini
@@ -180,3 +180,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini
index a0fdabf4e7b..15f3887ad6d 100644
--- a/tests/wpt/metadata/url/url-constructor.html.ini
+++ b/tests/wpt/metadata/url/url-constructor.html.ini
@@ -171,3 +171,9 @@
   [Parsing: <C|#> against <file://host/dir/file>]
     expected: FAIL
 
+  [Parsing: <C|> against <file://host/D:/dir1/dir2/file>]
+    expected: FAIL
+
+  [Parsing: </> against <file://h/C:/a/b>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webdriver/tests/element_click/shadow_dom.py.ini b/tests/wpt/metadata/webdriver/tests/element_click/shadow_dom.py.ini
new file mode 100644
index 00000000000..733556b7a10
--- /dev/null
+++ b/tests/wpt/metadata/webdriver/tests/element_click/shadow_dom.py.ini
@@ -0,0 +1,16 @@
+[shadow_dom.py]
+  [test_nested_shadow_element_click[checkbox_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[outer_element\]]
+    expected: FAIL
+
+  [test_shadow_element_click[checkbox_element\]]
+    expected: FAIL
+
+  [test_shadow_element_click[custom_element\]]
+    expected: FAIL
+
+  [test_nested_shadow_element_click[inner_element\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webxr/render_state_update.https.html.ini b/tests/wpt/metadata/webxr/render_state_update.https.html.ini
deleted file mode 100644
index 0e57356683e..00000000000
--- a/tests/wpt/metadata/webxr/render_state_update.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[render_state_update.https.html]
-  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht
index 4200e1542ba..30363789686 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/combining-characters-002.xht
@@ -4,8 +4,11 @@
         <title>CSS Test: Combining characters and styling</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#ctrlchars" />
+        <link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#first-letter-pseudo"/>
         <meta name="flags" content="" />
-        <meta name="assert" content="The combined characters are styled as one character." />
+        <meta name="assert" content="The combined characters are styled as one character.
+        (according to css3, the styling of a typographical ccharacter unit split by an element boundary is undefined.
+        However, this test is still fine because ::first-letter selects the whole character unit.)" />
         <style type="text/css">
             div:first-letter
             {
@@ -17,4 +20,4 @@
         <p>Test passes if the character below is an uppercase 'o' with an accent above it.</p>
         <div>o<span>&#x301;</span></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht
new file mode 100644
index 00000000000..ec24b9871d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 20px/1em Ahem;
+            }
+            #span1,
+            #span2
+            {
+                margin-left: 6em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below (with no jagged edges).</p>
+        <div>
+            <div>
+                <span>x</span><span id="span1">x</span>
+            </div>
+            <div>
+                <span>x</span><span id="span2">x</span>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht b/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht
index f771afe302a..31d5612b62a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/letter-spacing-079.xht
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
         <link rel="help" href="https://drafts.csswg.org/css-text-3/#letter-spacing-property"/>
-        <link rel="match" href="letter-spacing-007-ref.xht" />
+        <link rel="match" href="letter-spacing-079-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'letter-spacing' property sets a nominal length value in 'em' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht
index 12434f53f1b..51abc502d64 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-016.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-text-indent" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
+        <link rel="match" href="text-indent-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent -0 pt adds 0pt in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -24,4 +26,4 @@
         <div>X</div>
         <div id="test">X</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht
index 7c498d2b5f9..977d32170e7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-100.xht
@@ -23,7 +23,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is only one black box on this page (with no jagged edges).</p>
+        <p>Test passes if there is one black box on this page (with no jagged edges).</p>
         <div id="parent">
             <div>X</div>
             <div id="test">X</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht
index 5007ff643d8..35e155aea8d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-101.xht
@@ -23,7 +23,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is only one black box on this page (with no jagged edges).</p>
+        <p>Test passes if there is one black box on this page (with no jagged edges).</p>
         <div id="parent">
             <div>X</div>
             <div id="test">X</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht
index b187c79f524..a0352dea21a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-102.xht
@@ -23,7 +23,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is only one black box on this page (with no jagged edges).</p>
+        <p>Test passes if there is one black box on this page (with no jagged edges).</p>
         <div id="parent">
             <div>X</div>
             <div id="test">X</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht
new file mode 100644
index 00000000000..4fffdaf4130
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002-ref.xht
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #div1
+            {
+                font-family: Ahem;
+                line-height: 1em;
+                padding-left: 5em;
+                width: 40em;
+            }
+            div div
+            {
+                margin-left: -5em;
+            }
+            #div2
+            {
+                background: blue;
+                height: 1em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is directly above the blue box.</p>
+        <div id="div1">
+            <div>XXXXX</div>
+        </div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht
index ef4ac42d2a8..7c2f54a15a4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-002.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
         <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
+        <link rel="match" href="text-indent-overflow-002-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property with negative value follows the 'overflow: visible' assignment." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht
new file mode 100644
index 00000000000..ba7d905ae52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003-ref.xht
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #div1
+            {
+                font-family: Ahem;
+                line-height: 1em;
+                width: 40em;
+            }
+            #div2
+            {
+                margin-left: 10em;
+                width: 5em;
+            }
+            #div3
+            {
+                background: blue;
+                height: 1em;
+                margin-left: 10em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is directly above the blue box.</p>
+        <div id="div1">
+            <div id="div2">XXXXX</div>
+            <div id="div3"></div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht
index 79b3cb4bc33..fe6ac1bb5c9 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
         <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
+        <link rel="match" href="text-indent-overflow-003-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property with a value exceeding the available width follows the 'overflow: visible' assignment." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht
new file mode 100644
index 00000000000..048bb048330
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001-ref.xht
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>A <span>A</span></div>
+<div>B <span>B</span></div>
+<div>C <span>C</span></div>
+<div>D <span>D</span></div>
+<div>E <span>E</span></div>
+<div>F <span>F</span></div>
+<div>G <span>G</span></div>
+<div>H <span>H</span></div>
+<div>I <span>I</span></div>
+<div>J <span>J</span></div>
+<div>K <span>K</span></div>
+<div>L <span>L</span></div>
+<div>M <span>M</span></div>
+<div>N <span>N</span></div>
+<div>O <span>O</span></div>
+<div>P <span>P</span></div>
+<div>Q <span>Q</span></div>
+<div>R <span>R</span></div>
+<div>S <span>S</span></div>
+<div>T <span>T</span></div>
+<div>U <span>U</span></div>
+<div>V <span>V</span></div>
+<div>W <span>W</span></div>
+<div>X <span>X</span></div>
+<div>Y <span>Y</span></div>
+<div>Z <span>Z</span></div>
+<div>À <span>À</span></div>
+<div>Á <span>Á</span></div>
+<div>Â <span>Â</span></div>
+<div>Ã <span>Ã</span></div>
+<div>Ä <span>Ä</span></div>
+<div>Å <span>Å</span></div>
+<div>Æ <span>Æ</span></div>
+<div>Ç <span>Ç</span></div>
+<div>È <span>È</span></div>
+<div>É <span>É</span></div>
+<div>Ê <span>Ê</span></div>
+<div>Ë <span>Ë</span></div>
+<div>Ì <span>Ì</span></div>
+<div>Í <span>Í</span></div>
+<div>Î <span>Î</span></div>
+<div>Ï <span>Ï</span></div>
+<div>Ð <span>Ð</span></div>
+<div>Ñ <span>Ñ</span></div>
+<div>Ò <span>Ò</span></div>
+<div>Ó <span>Ó</span></div>
+<div>Ô <span>Ô</span></div>
+<div>Õ <span>Õ</span></div>
+<div>Ö <span>Ö</span></div>
+<div>Ø <span>Ø</span></div>
+<div>Ù <span>Ù</span></div>
+<div>Ú <span>Ú</span></div>
+<div>Û <span>Û</span></div>
+<div>Ü <span>Ü</span></div>
+<div>Ý <span>Ý</span></div>
+<div>Þ <span>Þ</span></div>
+<div>Ÿ <span>Ÿ</span></div>
+</div>
+
+
+<!--p class="notes">Notes: <br />The <a href='http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-transform'>CSS2 specification</a> only requires that text-transform work for 'the Latin1 repertoire'. It is not clear what characters the term 'Latin1' covers. This test assumes that it means the Basic Latin and Latin-1 Supplement blocks of the Unicode Standard (equivalent to ISO-8859-1). There is one character in this set, ÿ, that only occurs in the lower-case form.</p-->
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht
index 48a7bc86e3d..1db12c286d7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-001.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-001-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=1' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase all letters in the Latin 1 set when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht
new file mode 100644
index 00000000000..a8e51fd7dad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002-ref.xht
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div><span>a</span> a</div>
+<div><span>b</span> b</div>
+<div><span>c</span> c</div>
+<div><span>d</span> d</div>
+<div><span>e</span> e</div>
+<div><span>f</span> f</div>
+<div><span>g</span> g</div>
+<div><span>h</span> h</div>
+<div><span>i</span> i</div>
+<div><span>j</span> j</div>
+<div><span>k</span> k</div>
+<div><span>l</span> l</div>
+<div><span>m</span> m</div>
+<div><span>n</span> n</div>
+<div><span>o</span> o</div>
+<div><span>p</span> p</div>
+<div><span>q</span> q</div>
+<div><span>r</span> r</div>
+<div><span>s</span> s</div>
+<div><span>t</span> t</div>
+<div><span>u</span> u</div>
+<div><span>v</span> v</div>
+<div><span>w</span> w</div>
+<div><span>x</span> x</div>
+<div><span>y</span> y</div>
+<div><span>z</span> z</div>
+<div><span>à</span> à</div>
+<div><span>á</span> á</div>
+<div><span>â</span> â</div>
+<div><span>ã</span> ã</div>
+<div><span>ä</span> ä</div>
+<div><span>å</span> å</div>
+<div><span>æ</span> æ</div>
+<div><span>ç</span> ç</div>
+<div><span>è</span> è</div>
+<div><span>é</span> é</div>
+<div><span>ê</span> ê</div>
+<div><span>ë</span> ë</div>
+<div><span>ì</span> ì</div>
+<div><span>í</span> í</div>
+<div><span>î</span> î</div>
+<div><span>ï</span> ï</div>
+<div><span>ð</span> ð</div>
+<div><span>ñ</span> ñ</div>
+<div><span>ò</span> ò</div>
+<div><span>ó</span> ó</div>
+<div><span>ô</span> ô</div>
+<div><span>õ</span> õ</div>
+<div><span>ö</span> ö</div>
+<div><span>ø</span> ø</div>
+<div><span>ù</span> ù</div>
+<div><span>ú</span> ú</div>
+<div><span>û</span> û</div>
+<div><span>ü</span> ü</div>
+<div><span>ý</span> ý</div>
+<div><span>þ</span> þ</div>
+<div><span>ÿ</span> ÿ</div>
+</div>
+
+
+<!--p class="notes">Notes: <br />The <a href='http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-transform'>CSS2 specification</a> only requires that text-transform work for 'the Latin1 repertoire'. It is not clear what characters the term 'Latin1' covers. This test assumes that it means the Basic Latin and Latin-1 Supplement blocks of the Unicode Standard (equivalent to ISO-8859-1). There is one character in this set, ÿ, that only occurs in the lower-case form.</p-->
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht
index 4cce6d8a3b6..8233d51aa7a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-002.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-002-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=2' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase all letters in the Latin 1 set when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht
new file mode 100644
index 00000000000..b2c7cfec368
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003-ref.xht
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 3em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ÿ Ÿ</div>
+<div>Ā Ā</div>
+<div>Ă Ă</div>
+<div>Ą Ą</div>
+<div>Ć Ć</div>
+<div>Ĉ Ĉ</div>
+<div>Ċ Ċ</div>
+<div>Č Č</div>
+<div>Ď Ď</div>
+<div>Đ Đ</div>
+<div>Ē Ē</div>
+<div>Ĕ Ĕ</div>
+<div>Ė Ė</div>
+<div>Ę Ę</div>
+<div>Ě Ě</div>
+<div>Ĝ Ĝ</div>
+<div>Ğ Ğ</div>
+<div>Ġ Ġ</div>
+<div>Ģ Ģ</div>
+<div>Ĥ Ĥ</div>
+<div>Ħ Ħ</div>
+<div>Ĩ Ĩ</div>
+<div>Ī Ī</div>
+<div>Ĭ Ĭ</div>
+<div>Į Į</div>
+<div>I I</div>
+<div>IJ IJ</div>
+<div>Ĵ Ĵ</div>
+<div>Ķ Ķ</div>
+<div>Ĺ Ĺ</div>
+<div>Ļ Ļ</div>
+<div>Ľ Ľ</div>
+<div>Ŀ Ŀ</div>
+<div>Ł Ł</div>
+<div>Ń Ń</div>
+<div>Ņ Ņ</div>
+<div>Ň Ň</div>
+<div>Ŋ Ŋ</div>
+<div>Ō Ō</div>
+<div>Ŏ Ŏ</div>
+<div>Ő Ő</div>
+<div>Œ Œ</div>
+<div>Ŕ Ŕ</div>
+<div>Ŗ Ŗ</div>
+<div>Ř Ř</div>
+<div>Ś Ś</div>
+<div>Ŝ Ŝ</div>
+<div>Ş Ş</div>
+<div>Š Š</div>
+<div>Ţ Ţ</div>
+<div>Ť Ť</div>
+<div>Ŧ Ŧ</div>
+<div>Ũ Ũ</div>
+<div>Ū Ū</div>
+<div>Ŭ Ŭ</div>
+<div>Ů Ů</div>
+<div>Ű Ű</div>
+<div>Ų Ų</div>
+<div>Ŵ Ŵ</div>
+<div>Ŷ Ŷ</div>
+<div>Ź Ź</div>
+<div>Ż Ż</div>
+<div>Ž Ž</div>
+<div>S S</div>
+<div>Ƃ Ƃ</div>
+<div>Ƅ Ƅ</div>
+<div>Ƈ Ƈ</div>
+<div>Ƌ Ƌ</div>
+<div>Ƒ Ƒ</div>
+<div>Ƕ Ƕ</div>
+<div>Ƙ Ƙ</div>
+<div>Ƞ Ƞ</div>
+<div>Ơ Ơ</div>
+<div>Ƣ Ƣ</div>
+<div>Ƥ Ƥ</div>
+<div>Ƨ Ƨ</div>
+<div>Ƭ Ƭ</div>
+<div>Ư Ư</div>
+<div>Ƴ Ƴ</div>
+<div>Ƶ Ƶ</div>
+<div>Ƹ Ƹ</div>
+<div>Ƽ Ƽ</div>
+<div>Ƿ Ƿ</div>
+<div>DŽ DŽ</div>
+<div>DŽ DŽ</div>
+<div>LJ LJ</div>
+<div>LJ LJ</div>
+<div>NJ NJ</div>
+<div>NJ NJ</div>
+<div>Ǎ Ǎ</div>
+<div>Ǐ Ǐ</div>
+<div>Ǒ Ǒ</div>
+<div>Ǔ Ǔ</div>
+<div>Ǖ Ǖ</div>
+<div>Ǘ Ǘ</div>
+<div>Ǚ Ǚ</div>
+<div>Ǜ Ǜ</div>
+<div>Ǝ Ǝ</div>
+<div>Ǟ Ǟ</div>
+<div>Ǡ Ǡ</div>
+<div>Ǣ Ǣ</div>
+<div>Ǥ Ǥ</div>
+<div>Ǧ Ǧ</div>
+<div>Ǩ Ǩ</div>
+<div>Ǫ Ǫ</div>
+<div>Ǭ Ǭ</div>
+<div>Ǯ Ǯ</div>
+<div>DZ DZ</div>
+<div>DZ DZ</div>
+<div>Ǵ Ǵ</div>
+<div>Ǹ Ǹ</div>
+<div>Ǻ Ǻ</div>
+<div>Ǽ Ǽ</div>
+<div>Ǿ Ǿ</div>
+<div>Ȁ Ȁ</div>
+<div>Ȃ Ȃ</div>
+<div>Ȅ Ȅ</div>
+<div>Ȇ Ȇ</div>
+<div>Ȉ Ȉ</div>
+<div>Ȋ Ȋ</div>
+<div>Ȍ Ȍ</div>
+<div>Ȏ Ȏ</div>
+<div>Ȑ Ȑ</div>
+<div>Ȓ Ȓ</div>
+<div>Ȕ Ȕ</div>
+<div>Ȗ Ȗ</div>
+<div>Ș Ș</div>
+<div>Ț Ț</div>
+<div>Ȝ Ȝ</div>
+<div>Ȟ Ȟ</div>
+<div>Ȣ Ȣ</div>
+<div>Ȥ Ȥ</div>
+<div>Ȧ Ȧ</div>
+<div>Ȩ Ȩ</div>
+<div>Ȫ Ȫ</div>
+<div>Ȭ Ȭ</div>
+<div>Ȯ Ȯ</div>
+<div>Ȱ Ȱ</div>
+<div>Ȳ Ȳ</div>
+<div>Ɓ Ɓ</div>
+<div>Ɔ Ɔ</div>
+<div>Ɖ Ɖ</div>
+<div>Ɗ Ɗ</div>
+<div>Ə Ə</div>
+<div>Ɛ Ɛ</div>
+<div>Ɠ Ɠ</div>
+<div>Ɣ Ɣ</div>
+<div>Ɨ Ɨ</div>
+<div>Ɩ Ɩ</div>
+<div>Ɯ Ɯ</div>
+<div>Ɲ Ɲ</div>
+<div>Ɵ Ɵ</div>
+<div>Ʀ Ʀ</div>
+<div>Ʃ Ʃ</div>
+<div>Ʈ Ʈ</div>
+<div>Ʊ Ʊ</div>
+<div>Ʋ Ʋ</div>
+<div>Ʒ Ʒ</div>
+<div>Ḁ Ḁ</div>
+<div>Ḃ Ḃ</div>
+<div>Ḅ Ḅ</div>
+<div>Ḇ Ḇ</div>
+<div>Ḉ Ḉ</div>
+<div>Ḋ Ḋ</div>
+<div>Ḍ Ḍ</div>
+<div>Ḏ Ḏ</div>
+<div>Ḑ Ḑ</div>
+<div>Ḓ Ḓ</div>
+<div>Ḕ Ḕ</div>
+<div>Ḗ Ḗ</div>
+<div>Ḙ Ḙ</div>
+<div>Ḛ Ḛ</div>
+<div>Ḝ Ḝ</div>
+<div>Ḟ Ḟ</div>
+<div>Ḡ Ḡ</div>
+<div>Ḣ Ḣ</div>
+<div>Ḥ Ḥ</div>
+<div>Ḧ Ḧ</div>
+<div>Ḩ Ḩ</div>
+<div>Ḫ Ḫ</div>
+<div>Ḭ Ḭ</div>
+<div>Ḯ Ḯ</div>
+<div>Ḱ Ḱ</div>
+<div>Ḳ Ḳ</div>
+<div>Ḵ Ḵ</div>
+<div>Ḷ Ḷ</div>
+<div>Ḹ Ḹ</div>
+<div>Ḻ Ḻ</div>
+<div>Ḽ Ḽ</div>
+<div>Ḿ Ḿ</div>
+<div>Ṁ Ṁ</div>
+<div>Ṃ Ṃ</div>
+<div>Ṅ Ṅ</div>
+<div>Ṇ Ṇ</div>
+<div>Ṉ Ṉ</div>
+<div>Ṋ Ṋ</div>
+<div>Ṍ Ṍ</div>
+<div>Ṏ Ṏ</div>
+<div>Ṑ Ṑ</div>
+<div>Ṓ Ṓ</div>
+<div>Ṕ Ṕ</div>
+<div>Ṗ Ṗ</div>
+<div>Ṙ Ṙ</div>
+<div>Ṛ Ṛ</div>
+<div>Ṝ Ṝ</div>
+<div>Ṟ Ṟ</div>
+<div>Ṡ Ṡ</div>
+<div>Ṣ Ṣ</div>
+<div>Ṥ Ṥ</div>
+<div>Ṧ Ṧ</div>
+<div>Ṩ Ṩ</div>
+<div>Ṫ Ṫ</div>
+<div>Ṭ Ṭ</div>
+<div>Ṯ Ṯ</div>
+<div>Ṱ Ṱ</div>
+<div>Ṳ Ṳ</div>
+<div>Ṵ Ṵ</div>
+<div>Ṷ Ṷ</div>
+<div>Ṹ Ṹ</div>
+<div>Ṻ Ṻ</div>
+<div>Ṽ Ṽ</div>
+<div>Ṿ Ṿ</div>
+<div>Ẁ Ẁ</div>
+<div>Ẃ Ẃ</div>
+<div>Ẅ Ẅ</div>
+<div>Ẇ Ẇ</div>
+<div>Ẉ Ẉ</div>
+<div>Ẋ Ẋ</div>
+<div>Ẍ Ẍ</div>
+<div>Ẏ Ẏ</div>
+<div>Ẑ Ẑ</div>
+<div>Ẓ Ẓ</div>
+<div>Ẕ Ẕ</div>
+<div>Ṡ Ṡ</div>
+<div>Ạ Ạ</div>
+<div>Ả Ả</div>
+<div>Ấ Ấ</div>
+<div>Ầ Ầ</div>
+<div>Ẩ Ẩ</div>
+<div>Ẫ Ẫ</div>
+<div>Ậ Ậ</div>
+<div>Ắ Ắ</div>
+<div>Ằ Ằ</div>
+<div>Ẳ Ẳ</div>
+<div>Ẵ Ẵ</div>
+<div>Ặ Ặ</div>
+<div>Ẹ Ẹ</div>
+<div>Ẻ Ẻ</div>
+<div>Ẽ Ẽ</div>
+<div>Ế Ế</div>
+<div>Ề Ề</div>
+<div>Ể Ể</div>
+<div>Ễ Ễ</div>
+<div>Ệ Ệ</div>
+<div>Ỉ Ỉ</div>
+<div>Ị Ị</div>
+<div>Ọ Ọ</div>
+<div>Ỏ Ỏ</div>
+<div>Ố Ố</div>
+<div>Ồ Ồ</div>
+<div>Ổ Ổ</div>
+<div>Ỗ Ỗ</div>
+<div>Ộ Ộ</div>
+<div>Ớ Ớ</div>
+<div>Ờ Ờ</div>
+<div>Ở Ở</div>
+<div>Ỡ Ỡ</div>
+<div>Ợ Ợ</div>
+<div>Ụ Ụ</div>
+<div>Ủ Ủ</div>
+<div>Ứ Ứ</div>
+<div>Ừ Ừ</div>
+<div>Ử Ử</div>
+<div>Ữ Ữ</div>
+<div>Ự Ự</div>
+<div>Ỳ Ỳ</div>
+<div>Ỵ Ỵ</div>
+<div>Ỷ Ỷ</div>
+<div>Ỹ Ỹ</div>
+</div>
+
+
+<!--p class="notes">Notes: <br />The <a href='http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-transform'>CSS2 specification</a> only requires that text-transform work for 'the Latin1 repertoire'. It is not clear what characters the term 'Latin1' covers. This test assumes that it means the Basic Latin and Latin-1 Supplement blocks of the Unicode Standard (equivalent to ISO-8859-1).</p-->
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht
index a6e9cc321db..53314d839eb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-003.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-003-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=3' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase all Latin Unicode letters beyond Latin1 when text-transform is set to uppercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: uppercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 3em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht
new file mode 100644
index 00000000000..d6f19211599
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004-ref.xht
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 3em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ÿ ÿ</div>
+<div>ā ā</div>
+<div>ă ă</div>
+<div>ą ą</div>
+<div>ć ć</div>
+<div>ĉ ĉ</div>
+<div>ċ ċ</div>
+<div>č č</div>
+<div>ď ď</div>
+<div>đ đ</div>
+<div>ē ē</div>
+<div>ĕ ĕ</div>
+<div>ė ė</div>
+<div>ę ę</div>
+<div>ě ě</div>
+<div>ĝ ĝ</div>
+<div>ğ ğ</div>
+<div>ġ ġ</div>
+<div>ģ ģ</div>
+<div>ĥ ĥ</div>
+<div>ħ ħ</div>
+<div>ĩ ĩ</div>
+<div>ī ī</div>
+<div>ĭ ĭ</div>
+<div>į į</div>
+<div>ı ı</div>
+<div>ij ij</div>
+<div>ĵ ĵ</div>
+<div>ķ ķ</div>
+<div>ĺ ĺ</div>
+<div>ļ ļ</div>
+<div>ľ ľ</div>
+<div>ŀ ŀ</div>
+<div>ł ł</div>
+<div>ń ń</div>
+<div>ņ ņ</div>
+<div>ň ň</div>
+<div>ŋ ŋ</div>
+<div>ō ō</div>
+<div>ŏ ŏ</div>
+<div>ő ő</div>
+<div>œ œ</div>
+<div>ŕ ŕ</div>
+<div>ŗ ŗ</div>
+<div>ř ř</div>
+<div>ś ś</div>
+<div>ŝ ŝ</div>
+<div>ş ş</div>
+<div>š š</div>
+<div>ţ ţ</div>
+<div>ť ť</div>
+<div>ŧ ŧ</div>
+<div>ũ ũ</div>
+<div>ū ū</div>
+<div>ŭ ŭ</div>
+<div>ů ů</div>
+<div>ű ű</div>
+<div>ų ų</div>
+<div>ŵ ŵ</div>
+<div>ŷ ŷ</div>
+<div>ź ź</div>
+<div>ż ż</div>
+<div>ž ž</div>
+<div>ſ ſ</div>
+<div>ƃ ƃ</div>
+<div>ƅ ƅ</div>
+<div>ƈ ƈ</div>
+<div>ƌ ƌ</div>
+<div>ƒ ƒ</div>
+<div>ƕ ƕ</div>
+<div>ƙ ƙ</div>
+<div>ƞ ƞ</div>
+<div>ơ ơ</div>
+<div>ƣ ƣ</div>
+<div>ƥ ƥ</div>
+<div>ƨ ƨ</div>
+<div>ƭ ƭ</div>
+<div>ư ư</div>
+<div>ƴ ƴ</div>
+<div>ƶ ƶ</div>
+<div>ƹ ƹ</div>
+<div>ƽ ƽ</div>
+<div>ƿ ƿ</div>
+<div>dž dž</div>
+<div>dž dž</div>
+<div>lj lj</div>
+<div>lj lj</div>
+<div>nj nj</div>
+<div>nj nj</div>
+<div>ǎ ǎ</div>
+<div>ǐ ǐ</div>
+<div>ǒ ǒ</div>
+<div>ǔ ǔ</div>
+<div>ǖ ǖ</div>
+<div>ǘ ǘ</div>
+<div>ǚ ǚ</div>
+<div>ǜ ǜ</div>
+<div>ǝ ǝ</div>
+<div>ǟ ǟ</div>
+<div>ǡ ǡ</div>
+<div>ǣ ǣ</div>
+<div>ǥ ǥ</div>
+<div>ǧ ǧ</div>
+<div>ǩ ǩ</div>
+<div>ǫ ǫ</div>
+<div>ǭ ǭ</div>
+<div>ǯ ǯ</div>
+<div>dz dz</div>
+<div>dz dz</div>
+<div>ǵ ǵ</div>
+<div>ǹ ǹ</div>
+<div>ǻ ǻ</div>
+<div>ǽ ǽ</div>
+<div>ǿ ǿ</div>
+<div>ȁ ȁ</div>
+<div>ȃ ȃ</div>
+<div>ȅ ȅ</div>
+<div>ȇ ȇ</div>
+<div>ȉ ȉ</div>
+<div>ȋ ȋ</div>
+<div>ȍ ȍ</div>
+<div>ȏ ȏ</div>
+<div>ȑ ȑ</div>
+<div>ȓ ȓ</div>
+<div>ȕ ȕ</div>
+<div>ȗ ȗ</div>
+<div>ș ș</div>
+<div>ț ț</div>
+<div>ȝ ȝ</div>
+<div>ȟ ȟ</div>
+<div>ȣ ȣ</div>
+<div>ȥ ȥ</div>
+<div>ȧ ȧ</div>
+<div>ȩ ȩ</div>
+<div>ȫ ȫ</div>
+<div>ȭ ȭ</div>
+<div>ȯ ȯ</div>
+<div>ȱ ȱ</div>
+<div>ȳ ȳ</div>
+<div>ɓ ɓ</div>
+<div>ɔ ɔ</div>
+<div>ɖ ɖ</div>
+<div>ɗ ɗ</div>
+<div>ə ə</div>
+<div>ɛ ɛ</div>
+<div>ɠ ɠ</div>
+<div>ɣ ɣ</div>
+<div>ɨ ɨ</div>
+<div>ɩ ɩ</div>
+<div>ɯ ɯ</div>
+<div>ɲ ɲ</div>
+<div>ɵ ɵ</div>
+<div>ʀ ʀ</div>
+<div>ʃ ʃ</div>
+<div>ʈ ʈ</div>
+<div>ʊ ʊ</div>
+<div>ʋ ʋ</div>
+<div>ʒ ʒ</div>
+<div>ḁ ḁ</div>
+<div>ḃ ḃ</div>
+<div>ḅ ḅ</div>
+<div>ḇ ḇ</div>
+<div>ḉ ḉ</div>
+<div>ḋ ḋ</div>
+<div>ḍ ḍ</div>
+<div>ḏ ḏ</div>
+<div>ḑ ḑ</div>
+<div>ḓ ḓ</div>
+<div>ḕ ḕ</div>
+<div>ḗ ḗ</div>
+<div>ḙ ḙ</div>
+<div>ḛ ḛ</div>
+<div>ḝ ḝ</div>
+<div>ḟ ḟ</div>
+<div>ḡ ḡ</div>
+<div>ḣ ḣ</div>
+<div>ḥ ḥ</div>
+<div>ḧ ḧ</div>
+<div>ḩ ḩ</div>
+<div>ḫ ḫ</div>
+<div>ḭ ḭ</div>
+<div>ḯ ḯ</div>
+<div>ḱ ḱ</div>
+<div>ḳ ḳ</div>
+<div>ḵ ḵ</div>
+<div>ḷ ḷ</div>
+<div>ḹ ḹ</div>
+<div>ḻ ḻ</div>
+<div>ḽ ḽ</div>
+<div>ḿ ḿ</div>
+<div>ṁ ṁ</div>
+<div>ṃ ṃ</div>
+<div>ṅ ṅ</div>
+<div>ṇ ṇ</div>
+<div>ṉ ṉ</div>
+<div>ṋ ṋ</div>
+<div>ṍ ṍ</div>
+<div>ṏ ṏ</div>
+<div>ṑ ṑ</div>
+<div>ṓ ṓ</div>
+<div>ṕ ṕ</div>
+<div>ṗ ṗ</div>
+<div>ṙ ṙ</div>
+<div>ṛ ṛ</div>
+<div>ṝ ṝ</div>
+<div>ṟ ṟ</div>
+<div>ṡ ṡ</div>
+<div>ṣ ṣ</div>
+<div>ṥ ṥ</div>
+<div>ṧ ṧ</div>
+<div>ṩ ṩ</div>
+<div>ṫ ṫ</div>
+<div>ṭ ṭ</div>
+<div>ṯ ṯ</div>
+<div>ṱ ṱ</div>
+<div>ṳ ṳ</div>
+<div>ṵ ṵ</div>
+<div>ṷ ṷ</div>
+<div>ṹ ṹ</div>
+<div>ṻ ṻ</div>
+<div>ṽ ṽ</div>
+<div>ṿ ṿ</div>
+<div>ẁ ẁ</div>
+<div>ẃ ẃ</div>
+<div>ẅ ẅ</div>
+<div>ẇ ẇ</div>
+<div>ẉ ẉ</div>
+<div>ẋ ẋ</div>
+<div>ẍ ẍ</div>
+<div>ẏ ẏ</div>
+<div>ẑ ẑ</div>
+<div>ẓ ẓ</div>
+<div>ẕ ẕ</div>
+<div>ẛ ẛ</div>
+<div>ạ ạ</div>
+<div>ả ả</div>
+<div>ấ ấ</div>
+<div>ầ ầ</div>
+<div>ẩ ẩ</div>
+<div>ẫ ẫ</div>
+<div>ậ ậ</div>
+<div>ắ ắ</div>
+<div>ằ ằ</div>
+<div>ẳ ẳ</div>
+<div>ẵ ẵ</div>
+<div>ặ ặ</div>
+<div>ẹ ẹ</div>
+<div>ẻ ẻ</div>
+<div>ẽ ẽ</div>
+<div>ế ế</div>
+<div>ề ề</div>
+<div>ể ể</div>
+<div>ễ ễ</div>
+<div>ệ ệ</div>
+<div>ỉ ỉ</div>
+<div>ị ị</div>
+<div>ọ ọ</div>
+<div>ỏ ỏ</div>
+<div>ố ố</div>
+<div>ồ ồ</div>
+<div>ổ ổ</div>
+<div>ỗ ỗ</div>
+<div>ộ ộ</div>
+<div>ớ ớ</div>
+<div>ờ ờ</div>
+<div>ở ở</div>
+<div>ỡ ỡ</div>
+<div>ợ ợ</div>
+<div>ụ ụ</div>
+<div>ủ ủ</div>
+<div>ứ ứ</div>
+<div>ừ ừ</div>
+<div>ử ử</div>
+<div>ữ ữ</div>
+<div>ự ự</div>
+<div>ỳ ỳ</div>
+<div>ỵ ỵ</div>
+<div>ỷ ỷ</div>
+<div>ỹ ỹ</div>
+</div>
+
+
+<!--p class="notes">Notes: <br />The <a href='http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-transform'>CSS2 specification</a> only requires that text-transform work for 'the Latin1 repertoire'. It is not clear what characters the term 'Latin1' covers. This test assumes that it means the Basic Latin and Latin-1 Supplement blocks of the Unicode Standard (equivalent to ISO-8859-1).</p-->
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht
index dc55e4c5b7d..83b0de6568b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-004.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-004-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=4' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase all Latin Unicode letters beyond Latin1 when text-transform is set to lowercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: lowercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 3em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht
new file mode 100644
index 00000000000..6f993f3a3a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005-ref.xht
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test" xml:lang="tr"><div>I <span>I</span></div> <div>İ <span>İ</span></div></div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht
index 7e7f79143bb..5467156a8d8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-005.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-005-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=5' />
 <meta name='flags' content='' />
 <meta name="assert" content="When the language is declared to be Turkish, the UA will use Turkish-specific rules when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht
new file mode 100644
index 00000000000..ddf3b8b3ec8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006-ref.xht
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test" xml:lang="tr"><div><span>ı</span> ı</div> <div><span>i</span> i</div></div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht
index dec1852ec3a..d86c8f5a2c4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-006.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-006-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=6' />
 <meta name='flags' content='' />
 <meta name="assert" content="When the language is declared to be Turkish, the UA will use Turkish-specific rules when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht
new file mode 100644
index 00000000000..56e640913d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007-ref.xht
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 4em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ά Ά</div>
+<div>Έ Έ</div>
+<div>Ή Ή</div>
+<div>Ί Ί</div>
+<div>Α Α</div>
+<div>Β Β</div>
+<div>Γ Γ</div>
+<div>Δ Δ</div>
+<div>Ε Ε</div>
+<div>Ζ Ζ</div>
+<div>Η Η</div>
+<div>Θ Θ</div>
+<div>Ι Ι</div>
+<div>Κ Κ</div>
+<div>Λ Λ</div>
+<div>Μ Μ</div>
+<div>Ν Ν</div>
+<div>Ξ Ξ</div>
+<div>Ο Ο</div>
+<div>Π Π</div>
+<div>Ρ Ρ</div>
+<div>Σ Σ</div>
+<div>Σ Σ</div>
+<div>Τ Τ</div>
+<div>Υ Υ</div>
+<div>Φ Φ</div>
+<div>Χ Χ</div>
+<div>Ψ Ψ</div>
+<div>Ω Ω</div>
+<div>Ϊ Ϊ</div>
+<div>Ϋ Ϋ</div>
+<div>Ό Ό</div>
+<div>Ύ Ύ</div>
+<div>Ώ Ώ</div>
+<div>Β Β</div>
+<div>Θ Θ</div>
+<div>Φ Φ</div>
+<div>Π Π</div>
+<div>Ϙ Ϙ</div>
+<div>Ϛ Ϛ</div>
+<div>Ϝ Ϝ</div>
+<div>Ϟ Ϟ</div>
+<div>Ϡ Ϡ</div>
+<div>Κ Κ</div>
+<div>Ρ Ρ</div>
+<div>Ϲ Ϲ</div>
+<div>Ε Ε</div>
+<div>Ϸ Ϸ</div>
+<div>Ϻ Ϻ</div>
+<div>Ἀ Ἀ</div>
+<div>Ἁ Ἁ</div>
+<div>Ἂ Ἂ</div>
+<div>Ἃ Ἃ</div>
+<div>Ἄ Ἄ</div>
+<div>Ἅ Ἅ</div>
+<div>Ἆ Ἆ</div>
+<div>Ἇ Ἇ</div>
+<div>Ἐ Ἐ</div>
+<div>Ἑ Ἑ</div>
+<div>Ἒ Ἒ</div>
+<div>Ἓ Ἓ</div>
+<div>Ἔ Ἔ</div>
+<div>Ἕ Ἕ</div>
+<div>Ἠ Ἠ</div>
+<div>Ἡ Ἡ</div>
+<div>Ἢ Ἢ</div>
+<div>Ἣ Ἣ</div>
+<div>Ἤ Ἤ</div>
+<div>Ἥ Ἥ</div>
+<div>Ἦ Ἦ</div>
+<div>Ἧ Ἧ</div>
+<div>Ἰ Ἰ</div>
+<div>Ἱ Ἱ</div>
+<div>Ἲ Ἲ</div>
+<div>Ἳ Ἳ</div>
+<div>Ἴ Ἴ</div>
+<div>Ἵ Ἵ</div>
+<div>Ἶ Ἶ</div>
+<div>Ἷ Ἷ</div>
+<div>Ὀ Ὀ</div>
+<div>Ὁ Ὁ</div>
+<div>Ὂ Ὂ</div>
+<div>Ὃ Ὃ</div>
+<div>Ὄ Ὄ</div>
+<div>Ὅ Ὅ</div>
+<div>Ὑ Ὑ</div>
+<div>Ὓ Ὓ</div>
+<div>Ὕ Ὕ</div>
+<div>Ὗ Ὗ</div>
+<div>Ὠ Ὠ</div>
+<div>Ὡ Ὡ</div>
+<div>Ὢ Ὢ</div>
+<div>Ὣ Ὣ</div>
+<div>Ὤ Ὤ</div>
+<div>Ὥ Ὥ</div>
+<div>Ὦ Ὦ</div>
+<div>Ὧ Ὧ</div>
+<div>Ὰ Ὰ</div>
+<div>Ά Ά</div>
+<div>Ὲ Ὲ</div>
+<div>Έ Έ</div>
+<div>Ὴ Ὴ</div>
+<div>Ή Ή</div>
+<div>Ὶ Ὶ</div>
+<div>Ί Ί</div>
+<div>Ὸ Ὸ</div>
+<div>Ό Ό</div>
+<div>Ὺ Ὺ</div>
+<div>Ύ Ύ</div>
+<div>Ὼ Ὼ</div>
+<div>Ώ Ώ</div>
+<div>ᾈ ᾈ</div>
+<div>ᾉ ᾉ</div>
+<div>ᾊ ᾊ</div>
+<div>ᾋ ᾋ</div>
+<div>ᾌ ᾌ</div>
+<div>ᾍ ᾍ</div>
+<div>ᾎ ᾎ</div>
+<div>ᾏ ᾏ</div>
+<div>ᾘ ᾘ</div>
+<div>ᾙ ᾙ</div>
+<div>ᾚ ᾚ</div>
+<div>ᾛ ᾛ</div>
+<div>ᾜ ᾜ</div>
+<div>ᾝ ᾝ</div>
+<div>ᾞ ᾞ</div>
+<div>ᾟ ᾟ</div>
+<div>ᾨ ᾨ</div>
+<div>ᾩ ᾩ</div>
+<div>ᾪ ᾪ</div>
+<div>ᾫ ᾫ</div>
+<div>ᾬ ᾬ</div>
+<div>ᾭ ᾭ</div>
+<div>ᾮ ᾮ</div>
+<div>ᾯ ᾯ</div>
+<div>Ᾰ Ᾰ</div>
+<div>Ᾱ Ᾱ</div>
+<div>ᾼ ᾼ</div>
+<div>Ι Ι</div>
+<div>ῌ ῌ</div>
+<div>Ῐ Ῐ</div>
+<div>Ῑ Ῑ</div>
+<div>Ῠ Ῠ</div>
+<div>Ῡ Ῡ</div>
+<div>Ῥ Ῥ</div>
+<div>ῼ ῼ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht
index 6691aa2db00..43fa4c33222 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-007.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-007-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=7' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Greek when text-transform is set to uppercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: uppercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 4em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht
new file mode 100644
index 00000000000..7fdd0d0140f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008-ref.xht
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 4em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ά ά</div>
+<div>έ έ</div>
+<div>ή ή</div>
+<div>ί ί</div>
+<div>α α</div>
+<div>β β</div>
+<div>γ γ</div>
+<div>δ δ</div>
+<div>ε ε</div>
+<div>ζ ζ</div>
+<div>η η</div>
+<div>θ θ</div>
+<div>ι ι</div>
+<div>κ κ</div>
+<div>λ λ</div>
+<div>μ μ</div>
+<div>ν ν</div>
+<div>ξ ξ</div>
+<div>ο ο</div>
+<div>π π</div>
+<div>ρ ρ</div>
+<div>ς ς</div>
+<div>σ σ</div>
+<div>τ τ</div>
+<div>υ υ</div>
+<div>φ φ</div>
+<div>χ χ</div>
+<div>ψ ψ</div>
+<div>ω ω</div>
+<div>ϊ ϊ</div>
+<div>ϋ ϋ</div>
+<div>ό ό</div>
+<div>ύ ύ</div>
+<div>ώ ώ</div>
+<div>ϐ ϐ</div>
+<div>ϑ ϑ</div>
+<div>ϕ ϕ</div>
+<div>ϖ ϖ</div>
+<div>ϙ ϙ</div>
+<div>ϛ ϛ</div>
+<div>ϝ ϝ</div>
+<div>ϟ ϟ</div>
+<div>ϡ ϡ</div>
+<div>ϰ ϰ</div>
+<div>ϱ ϱ</div>
+<div>ϲ ϲ</div>
+<div>ϵ ϵ</div>
+<div>ϸ ϸ</div>
+<div>ϻ ϻ</div>
+<div>ἀ ἀ</div>
+<div>ἁ ἁ</div>
+<div>ἂ ἂ</div>
+<div>ἃ ἃ</div>
+<div>ἄ ἄ</div>
+<div>ἅ ἅ</div>
+<div>ἆ ἆ</div>
+<div>ἇ ἇ</div>
+<div>ἐ ἐ</div>
+<div>ἑ ἑ</div>
+<div>ἒ ἒ</div>
+<div>ἓ ἓ</div>
+<div>ἔ ἔ</div>
+<div>ἕ ἕ</div>
+<div>ἠ ἠ</div>
+<div>ἡ ἡ</div>
+<div>ἢ ἢ</div>
+<div>ἣ ἣ</div>
+<div>ἤ ἤ</div>
+<div>ἥ ἥ</div>
+<div>ἦ ἦ</div>
+<div>ἧ ἧ</div>
+<div>ἰ ἰ</div>
+<div>ἱ ἱ</div>
+<div>ἲ ἲ</div>
+<div>ἳ ἳ</div>
+<div>ἴ ἴ</div>
+<div>ἵ ἵ</div>
+<div>ἶ ἶ</div>
+<div>ἷ ἷ</div>
+<div>ὀ ὀ</div>
+<div>ὁ ὁ</div>
+<div>ὂ ὂ</div>
+<div>ὃ ὃ</div>
+<div>ὄ ὄ</div>
+<div>ὅ ὅ</div>
+<div>ὑ ὑ</div>
+<div>ὓ ὓ</div>
+<div>ὕ ὕ</div>
+<div>ὗ ὗ</div>
+<div>ὠ ὠ</div>
+<div>ὡ ὡ</div>
+<div>ὢ ὢ</div>
+<div>ὣ ὣ</div>
+<div>ὤ ὤ</div>
+<div>ὥ ὥ</div>
+<div>ὦ ὦ</div>
+<div>ὧ ὧ</div>
+<div>ὰ ὰ</div>
+<div>ά ά</div>
+<div>ὲ ὲ</div>
+<div>έ έ</div>
+<div>ὴ ὴ</div>
+<div>ή ή</div>
+<div>ὶ ὶ</div>
+<div>ί ί</div>
+<div>ὸ ὸ</div>
+<div>ό ό</div>
+<div>ὺ ὺ</div>
+<div>ύ ύ</div>
+<div>ὼ ὼ</div>
+<div>ώ ώ</div>
+<div>ᾀ ᾀ</div>
+<div>ᾁ ᾁ</div>
+<div>ᾂ ᾂ</div>
+<div>ᾃ ᾃ</div>
+<div>ᾄ ᾄ</div>
+<div>ᾅ ᾅ</div>
+<div>ᾆ ᾆ</div>
+<div>ᾇ ᾇ</div>
+<div>ᾐ ᾐ</div>
+<div>ᾑ ᾑ</div>
+<div>ᾒ ᾒ</div>
+<div>ᾓ ᾓ</div>
+<div>ᾔ ᾔ</div>
+<div>ᾕ ᾕ</div>
+<div>ᾖ ᾖ</div>
+<div>ᾗ ᾗ</div>
+<div>ᾠ ᾠ</div>
+<div>ᾡ ᾡ</div>
+<div>ᾢ ᾢ</div>
+<div>ᾣ ᾣ</div>
+<div>ᾤ ᾤ</div>
+<div>ᾥ ᾥ</div>
+<div>ᾦ ᾦ</div>
+<div>ᾧ ᾧ</div>
+<div>ᾰ ᾰ</div>
+<div>ᾱ ᾱ</div>
+<div>ᾳ ᾳ</div>
+<div>ι ι</div>
+<div>ῃ ῃ</div>
+<div>ῐ ῐ</div>
+<div>ῑ ῑ</div>
+<div>ῠ ῠ</div>
+<div>ῡ ῡ</div>
+<div>ῥ ῥ</div>
+<div>ῳ ῳ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht
index 03ffaf15b7c..31ed3373c77 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-008.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-008-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=8' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Greek when text-transform is set to lowercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: lowercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 4em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht
new file mode 100644
index 00000000000..1a8727ddec1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009-ref.xht
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ϣ Ϣ</div>
+<div>Ϥ Ϥ</div>
+<div>Ϧ Ϧ</div>
+<div>Ϩ Ϩ</div>
+<div>Ϫ Ϫ</div>
+<div>Ϭ Ϭ</div>
+<div>Ϯ Ϯ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht
index 366b7fa54bb..2253509872d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-009.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-009-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=9' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Coptic when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht
new file mode 100644
index 00000000000..c5d842cb9c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010-ref.xht
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ϣ ϣ</div>
+<div>ϥ ϥ</div>
+<div>ϧ ϧ</div>
+<div>ϩ ϩ</div>
+<div>ϫ ϫ</div>
+<div>ϭ ϭ</div>
+<div>ϯ ϯ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht
index 768c66ebace..33c8116c90d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-010.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-010-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=10' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Coptic when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht
new file mode 100644
index 00000000000..54945b7d61c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011-ref.xht
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 3em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>А А</div>
+<div>Б Б</div>
+<div>В В</div>
+<div>Г Г</div>
+<div>Д Д</div>
+<div>Е Е</div>
+<div>Ж Ж</div>
+<div>З З</div>
+<div>И И</div>
+<div>Й Й</div>
+<div>К К</div>
+<div>Л Л</div>
+<div>М М</div>
+<div>Н Н</div>
+<div>О О</div>
+<div>П П</div>
+<div>Р Р</div>
+<div>С С</div>
+<div>Т Т</div>
+<div>У У</div>
+<div>Ф Ф</div>
+<div>Х Х</div>
+<div>Ц Ц</div>
+<div>Ч Ч</div>
+<div>Ш Ш</div>
+<div>Щ Щ</div>
+<div>Ъ Ъ</div>
+<div>Ы Ы</div>
+<div>Ь Ь</div>
+<div>Э Э</div>
+<div>Ю Ю</div>
+<div>Я Я</div>
+<div>Ѐ Ѐ</div>
+<div>Ё Ё</div>
+<div>Ђ Ђ</div>
+<div>Ѓ Ѓ</div>
+<div>Є Є</div>
+<div>Ѕ Ѕ</div>
+<div>І І</div>
+<div>Ї Ї</div>
+<div>Ј Ј</div>
+<div>Љ Љ</div>
+<div>Њ Њ</div>
+<div>Ћ Ћ</div>
+<div>Ќ Ќ</div>
+<div>Ѝ Ѝ</div>
+<div>Ў Ў</div>
+<div>Џ Џ</div>
+<div>Ѡ Ѡ</div>
+<div>Ѣ Ѣ</div>
+<div>Ѥ Ѥ</div>
+<div>Ѧ Ѧ</div>
+<div>Ѩ Ѩ</div>
+<div>Ѫ Ѫ</div>
+<div>Ѭ Ѭ</div>
+<div>Ѯ Ѯ</div>
+<div>Ѱ Ѱ</div>
+<div>Ѳ Ѳ</div>
+<div>Ѵ Ѵ</div>
+<div>Ѷ Ѷ</div>
+<div>Ѹ Ѹ</div>
+<div>Ѻ Ѻ</div>
+<div>Ѽ Ѽ</div>
+<div>Ѿ Ѿ</div>
+<div>Ҁ Ҁ</div>
+<div>Ҋ Ҋ</div>
+<div>Ҍ Ҍ</div>
+<div>Ҏ Ҏ</div>
+<div>Ґ Ґ</div>
+<div>Ғ Ғ</div>
+<div>Ҕ Ҕ</div>
+<div>Җ Җ</div>
+<div>Ҙ Ҙ</div>
+<div>Қ Қ</div>
+<div>Ҝ Ҝ</div>
+<div>Ҟ Ҟ</div>
+<div>Ҡ Ҡ</div>
+<div>Ң Ң</div>
+<div>Ҥ Ҥ</div>
+<div>Ҧ Ҧ</div>
+<div>Ҩ Ҩ</div>
+<div>Ҫ Ҫ</div>
+<div>Ҭ Ҭ</div>
+<div>Ү Ү</div>
+<div>Ұ Ұ</div>
+<div>Ҳ Ҳ</div>
+<div>Ҵ Ҵ</div>
+<div>Ҷ Ҷ</div>
+<div>Ҹ Ҹ</div>
+<div>Һ Һ</div>
+<div>Ҽ Ҽ</div>
+<div>Ҿ Ҿ</div>
+<div>Ӂ Ӂ</div>
+<div>Ӄ Ӄ</div>
+<div>Ӆ Ӆ</div>
+<div>Ӈ Ӈ</div>
+<div>Ӊ Ӊ</div>
+<div>Ӌ Ӌ</div>
+<div>Ӎ Ӎ</div>
+<div>Ӑ Ӑ</div>
+<div>Ӓ Ӓ</div>
+<div>Ӕ Ӕ</div>
+<div>Ӗ Ӗ</div>
+<div>Ә Ә</div>
+<div>Ӛ Ӛ</div>
+<div>Ӝ Ӝ</div>
+<div>Ӟ Ӟ</div>
+<div>Ӡ Ӡ</div>
+<div>Ӣ Ӣ</div>
+<div>Ӥ Ӥ</div>
+<div>Ӧ Ӧ</div>
+<div>Ө Ө</div>
+<div>Ӫ Ӫ</div>
+<div>Ӭ Ӭ</div>
+<div>Ӯ Ӯ</div>
+<div>Ӱ Ӱ</div>
+<div>Ӳ Ӳ</div>
+<div>Ӵ Ӵ</div>
+<div>Ӹ Ӹ</div>
+<div>Ԁ Ԁ</div>
+<div>Ԃ Ԃ</div>
+<div>Ԅ Ԅ</div>
+<div>Ԇ Ԇ</div>
+<div>Ԉ Ԉ</div>
+<div>Ԋ Ԋ</div>
+<div>Ԍ Ԍ</div>
+<div>Ԏ Ԏ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht
index c4e81233670..c4bc984c2f7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-011.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-011-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=11' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Cyrillic when text-transform is set to uppercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: uppercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 3em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht
new file mode 100644
index 00000000000..745b7c7326d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012-ref.xht
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { line-height: 2; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 3em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>а а</div>
+<div>б б</div>
+<div>в в</div>
+<div>г г</div>
+<div>д д</div>
+<div>е е</div>
+<div>ж ж</div>
+<div>з з</div>
+<div>и и</div>
+<div>й й</div>
+<div>к к</div>
+<div>л л</div>
+<div>м м</div>
+<div>н н</div>
+<div>о о</div>
+<div>п п</div>
+<div>р р</div>
+<div>с с</div>
+<div>т т</div>
+<div>у у</div>
+<div>ф ф</div>
+<div>х х</div>
+<div>ц ц</div>
+<div>ч ч</div>
+<div>ш ш</div>
+<div>щ щ</div>
+<div>ъ ъ</div>
+<div>ы ы</div>
+<div>ь ь</div>
+<div>э э</div>
+<div>ю ю</div>
+<div>я я</div>
+<div>ѐ ѐ</div>
+<div>ё ё</div>
+<div>ђ ђ</div>
+<div>ѓ ѓ</div>
+<div>є є</div>
+<div>ѕ ѕ</div>
+<div>і і</div>
+<div>ї ї</div>
+<div>ј ј</div>
+<div>љ љ</div>
+<div>њ њ</div>
+<div>ћ ћ</div>
+<div>ќ ќ</div>
+<div>ѝ ѝ</div>
+<div>ў ў</div>
+<div>џ џ</div>
+<div>ѡ ѡ</div>
+<div>ѣ ѣ</div>
+<div>ѥ ѥ</div>
+<div>ѧ ѧ</div>
+<div>ѩ ѩ</div>
+<div>ѫ ѫ</div>
+<div>ѭ ѭ</div>
+<div>ѯ ѯ</div>
+<div>ѱ ѱ</div>
+<div>ѳ ѳ</div>
+<div>ѵ ѵ</div>
+<div>ѷ ѷ</div>
+<div>ѹ ѹ</div>
+<div>ѻ ѻ</div>
+<div>ѽ ѽ</div>
+<div>ѿ ѿ</div>
+<div>ҁ ҁ</div>
+<div>ҋ ҋ</div>
+<div>ҍ ҍ</div>
+<div>ҏ ҏ</div>
+<div>ґ ґ</div>
+<div>ғ ғ</div>
+<div>ҕ ҕ</div>
+<div>җ җ</div>
+<div>ҙ ҙ</div>
+<div>қ қ</div>
+<div>ҝ ҝ</div>
+<div>ҟ ҟ</div>
+<div>ҡ ҡ</div>
+<div>ң ң</div>
+<div>ҥ ҥ</div>
+<div>ҧ ҧ</div>
+<div>ҩ ҩ</div>
+<div>ҫ ҫ</div>
+<div>ҭ ҭ</div>
+<div>ү ү</div>
+<div>ұ ұ</div>
+<div>ҳ ҳ</div>
+<div>ҵ ҵ</div>
+<div>ҷ ҷ</div>
+<div>ҹ ҹ</div>
+<div>һ һ</div>
+<div>ҽ ҽ</div>
+<div>ҿ ҿ</div>
+<div>ӂ ӂ</div>
+<div>ӄ ӄ</div>
+<div>ӆ ӆ</div>
+<div>ӈ ӈ</div>
+<div>ӊ ӊ</div>
+<div>ӌ ӌ</div>
+<div>ӎ ӎ</div>
+<div>ӑ ӑ</div>
+<div>ӓ ӓ</div>
+<div>ӕ ӕ</div>
+<div>ӗ ӗ</div>
+<div>ә ә</div>
+<div>ӛ ӛ</div>
+<div>ӝ ӝ</div>
+<div>ӟ ӟ</div>
+<div>ӡ ӡ</div>
+<div>ӣ ӣ</div>
+<div>ӥ ӥ</div>
+<div>ӧ ӧ</div>
+<div>ө ө</div>
+<div>ӫ ӫ</div>
+<div>ӭ ӭ</div>
+<div>ӯ ӯ</div>
+<div>ӱ ӱ</div>
+<div>ӳ ӳ</div>
+<div>ӵ ӵ</div>
+<div>ӹ ӹ</div>
+<div>ԁ ԁ</div>
+<div>ԃ ԃ</div>
+<div>ԅ ԅ</div>
+<div>ԇ ԇ</div>
+<div>ԉ ԉ</div>
+<div>ԋ ԋ</div>
+<div>ԍ ԍ</div>
+<div>ԏ ԏ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht
index 7036841721b..9d051a58f1c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-012.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-012-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=12' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Cyrillic when text-transform is set to lowercase." />
@@ -13,9 +15,9 @@
 .test span { text-transform: lowercase; }
 
 /* the CSS below is not part of the test */
-.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test { line-height: 2; color: blue; }
 .test div { white-space: nowrap; text-align: center;
-             width: 5em; display: inline-block; }</style>
+             width: 3em; display: inline-block; }</style>
 <script type='text/javascript'>
 //<![CDATA[
 function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht
new file mode 100644
index 00000000000..48a8b43b4b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013-ref.xht
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ա Ա</div>
+<div>Բ Բ</div>
+<div>Գ Գ</div>
+<div>Դ Դ</div>
+<div>Ե Ե</div>
+<div>Զ Զ</div>
+<div>Է Է</div>
+<div>Ը Ը</div>
+<div>Թ Թ</div>
+<div>Ժ Ժ</div>
+<div>Ի Ի</div>
+<div>Լ Լ</div>
+<div>Խ Խ</div>
+<div>Ծ Ծ</div>
+<div>Կ Կ</div>
+<div>Հ Հ</div>
+<div>Ձ Ձ</div>
+<div>Ղ Ղ</div>
+<div>Ճ Ճ</div>
+<div>Մ Մ</div>
+<div>Յ Յ</div>
+<div>Ն Ն</div>
+<div>Շ Շ</div>
+<div>Ո Ո</div>
+<div>Չ Չ</div>
+<div>Պ Պ</div>
+<div>Ջ Ջ</div>
+<div>Ռ Ռ</div>
+<div>Ս Ս</div>
+<div>Վ Վ</div>
+<div>Տ Տ</div>
+<div>Ր Ր</div>
+<div>Ց Ց</div>
+<div>Ւ Ւ</div>
+<div>Փ Փ</div>
+<div>Ք Ք</div>
+<div>Օ Օ</div>
+<div>Ֆ Ֆ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht
index c259b9accf0..513febe42dc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-013.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-013-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=13' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Armenian when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht
new file mode 100644
index 00000000000..27249cce979
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014-ref.xht
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ա ա</div>
+<div>բ բ</div>
+<div>գ գ</div>
+<div>դ դ</div>
+<div>ե ե</div>
+<div>զ զ</div>
+<div>է է</div>
+<div>ը ը</div>
+<div>թ թ</div>
+<div>ժ ժ</div>
+<div>ի ի</div>
+<div>լ լ</div>
+<div>խ խ</div>
+<div>ծ ծ</div>
+<div>կ կ</div>
+<div>հ հ</div>
+<div>ձ ձ</div>
+<div>ղ ղ</div>
+<div>ճ ճ</div>
+<div>մ մ</div>
+<div>յ յ</div>
+<div>ն ն</div>
+<div>շ շ</div>
+<div>ո ո</div>
+<div>չ չ</div>
+<div>պ պ</div>
+<div>ջ ջ</div>
+<div>ռ ռ</div>
+<div>ս ս</div>
+<div>վ վ</div>
+<div>տ տ</div>
+<div>ր ր</div>
+<div>ց ց</div>
+<div>ւ ւ</div>
+<div>փ փ</div>
+<div>ք ք</div>
+<div>օ օ</div>
+<div>ֆ ֆ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht
index a830f346500..62409ea9bdc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-014.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-014-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=14' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Armenian when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht
new file mode 100644
index 00000000000..2f5c8877cfe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015-ref.xht
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ⅰ Ⅰ</div>
+<div>Ⅱ Ⅱ</div>
+<div>Ⅲ Ⅲ</div>
+<div>Ⅳ Ⅳ</div>
+<div>Ⅴ Ⅴ</div>
+<div>Ⅵ Ⅵ</div>
+<div>Ⅶ Ⅶ</div>
+<div>Ⅷ Ⅷ</div>
+<div>Ⅸ Ⅸ</div>
+<div>Ⅹ Ⅹ</div>
+<div>Ⅺ Ⅺ</div>
+<div>Ⅻ Ⅻ</div>
+<div>Ⅼ Ⅼ</div>
+<div>Ⅽ Ⅽ</div>
+<div>Ⅾ Ⅾ</div>
+<div>Ⅿ Ⅿ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht
index 8ecc385a015..b3e44534fbe 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-015.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-015-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=15' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Roman numerals when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht
new file mode 100644
index 00000000000..c4b2e8e031d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016-ref.xht
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ⅰ ⅰ</div>
+<div>ⅱ ⅱ</div>
+<div>ⅲ ⅲ</div>
+<div>ⅳ ⅳ</div>
+<div>ⅴ ⅴ</div>
+<div>ⅵ ⅵ</div>
+<div>ⅶ ⅶ</div>
+<div>ⅷ ⅷ</div>
+<div>ⅸ ⅸ</div>
+<div>ⅹ ⅹ</div>
+<div>ⅺ ⅺ</div>
+<div>ⅻ ⅻ</div>
+<div>ⅼ ⅼ</div>
+<div>ⅽ ⅽ</div>
+<div>ⅾ ⅾ</div>
+<div>ⅿ ⅿ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht
index d84fc7d1779..7d834572e7f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-016.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-016-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=16' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Roman numerals when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht
new file mode 100644
index 00000000000..4262ac0478f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017-ref.xht
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ⓐ Ⓐ</div>
+<div>Ⓑ Ⓑ</div>
+<div>Ⓒ Ⓒ</div>
+<div>Ⓓ Ⓓ</div>
+<div>Ⓔ Ⓔ</div>
+<div>Ⓕ Ⓕ</div>
+<div>Ⓖ Ⓖ</div>
+<div>Ⓗ Ⓗ</div>
+<div>Ⓘ Ⓘ</div>
+<div>Ⓙ Ⓙ</div>
+<div>Ⓚ Ⓚ</div>
+<div>Ⓛ Ⓛ</div>
+<div>Ⓜ Ⓜ</div>
+<div>Ⓝ Ⓝ</div>
+<div>Ⓞ Ⓞ</div>
+<div>Ⓟ Ⓟ</div>
+<div>Ⓠ Ⓠ</div>
+<div>Ⓡ Ⓡ</div>
+<div>Ⓢ Ⓢ</div>
+<div>Ⓣ Ⓣ</div>
+<div>Ⓤ Ⓤ</div>
+<div>Ⓥ Ⓥ</div>
+<div>Ⓦ Ⓦ</div>
+<div>Ⓧ Ⓧ</div>
+<div>Ⓨ Ⓨ</div>
+<div>Ⓩ Ⓩ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht
index 678d37c649e..a6152f452ee 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-017.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-017-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=17' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Circled Latin when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht
new file mode 100644
index 00000000000..1665eba3c4f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018-ref.xht
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ⓐ ⓐ</div>
+<div>ⓑ ⓑ</div>
+<div>ⓒ ⓒ</div>
+<div>ⓓ ⓓ</div>
+<div>ⓔ ⓔ</div>
+<div>ⓕ ⓕ</div>
+<div>ⓖ ⓖ</div>
+<div>ⓗ ⓗ</div>
+<div>ⓘ ⓘ</div>
+<div>ⓙ ⓙ</div>
+<div>ⓚ ⓚ</div>
+<div>ⓛ ⓛ</div>
+<div>ⓜ ⓜ</div>
+<div>ⓝ ⓝ</div>
+<div>ⓞ ⓞ</div>
+<div>ⓟ ⓟ</div>
+<div>ⓠ ⓠ</div>
+<div>ⓡ ⓡ</div>
+<div>ⓢ ⓢ</div>
+<div>ⓣ ⓣ</div>
+<div>ⓤ ⓤ</div>
+<div>ⓥ ⓥ</div>
+<div>ⓦ ⓦ</div>
+<div>ⓧ ⓧ</div>
+<div>ⓨ ⓨ</div>
+<div>ⓩ ⓩ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht
index 31a8dc0bd9f..e4fe1eea47f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-018.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-018-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=18' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Circled Latin when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht
new file mode 100644
index 00000000000..97b3be4a1d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019-ref.xht
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>Ａ Ａ</div>
+<div>Ｂ Ｂ</div>
+<div>Ｃ Ｃ</div>
+<div>Ｄ Ｄ</div>
+<div>Ｅ Ｅ</div>
+<div>Ｆ Ｆ</div>
+<div>Ｇ Ｇ</div>
+<div>Ｈ Ｈ</div>
+<div>Ｉ Ｉ</div>
+<div>Ｊ Ｊ</div>
+<div>Ｋ Ｋ</div>
+<div>Ｌ Ｌ</div>
+<div>Ｍ Ｍ</div>
+<div>Ｎ Ｎ</div>
+<div>Ｏ Ｏ</div>
+<div>Ｐ Ｐ</div>
+<div>Ｑ Ｑ</div>
+<div>Ｒ Ｒ</div>
+<div>Ｓ Ｓ</div>
+<div>Ｔ Ｔ</div>
+<div>Ｕ Ｕ</div>
+<div>Ｖ Ｖ</div>
+<div>Ｗ Ｗ</div>
+<div>Ｘ Ｘ</div>
+<div>Ｙ Ｙ</div>
+<div>Ｚ Ｚ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht
index 259b95852e4..0fe0d8c7abd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-019.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-019-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=19' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Full-width Latin when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht
new file mode 100644
index 00000000000..51d41c4cd7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020-ref.xht
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>ａ ａ</div>
+<div>ｂ ｂ</div>
+<div>ｃ ｃ</div>
+<div>ｄ ｄ</div>
+<div>ｅ ｅ</div>
+<div>ｆ ｆ</div>
+<div>ｇ ｇ</div>
+<div>ｈ ｈ</div>
+<div>ｉ ｉ</div>
+<div>ｊ ｊ</div>
+<div>ｋ ｋ</div>
+<div>ｌ ｌ</div>
+<div>ｍ ｍ</div>
+<div>ｎ ｎ</div>
+<div>ｏ ｏ</div>
+<div>ｐ ｐ</div>
+<div>ｑ ｑ</div>
+<div>ｒ ｒ</div>
+<div>ｓ ｓ</div>
+<div>ｔ ｔ</div>
+<div>ｕ ｕ</div>
+<div>ｖ ｖ</div>
+<div>ｗ ｗ</div>
+<div>ｘ ｘ</div>
+<div>ｙ ｙ</div>
+<div>ｚ ｚ</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht
index 087d4709eed..113f8e38d63 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-020.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-020-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=20' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Full-width Latin when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht
new file mode 100644
index 00000000000..17567c6b8c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021-ref.xht
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the right-hand character in each pair matches the left-hand one.</p>
+
+
+<div class="test">
+<div>𐐀 𐐀</div>
+<div>𐐁 𐐁</div>
+<div>𐐂 𐐂</div>
+<div>𐐃 𐐃</div>
+<div>𐐄 𐐄</div>
+<div>𐐅 𐐅</div>
+<div>𐐆 𐐆</div>
+<div>𐐇 𐐇</div>
+<div>𐐈 𐐈</div>
+<div>𐐉 𐐉</div>
+<div>𐐊 𐐊</div>
+<div>𐐋 𐐋</div>
+<div>𐐌 𐐌</div>
+<div>𐐍 𐐍</div>
+<div>𐐎 𐐎</div>
+<div>𐐏 𐐏</div>
+<div>𐐐 𐐐</div>
+<div>𐐑 𐐑</div>
+<div>𐐒 𐐒</div>
+<div>𐐓 𐐓</div>
+<div>𐐔 𐐔</div>
+<div>𐐕 𐐕</div>
+<div>𐐖 𐐖</div>
+<div>𐐗 𐐗</div>
+<div>𐐘 𐐘</div>
+<div>𐐙 𐐙</div>
+<div>𐐚 𐐚</div>
+<div>𐐛 𐐛</div>
+<div>𐐜 𐐜</div>
+<div>𐐝 𐐝</div>
+<div>𐐞 𐐞</div>
+<div>𐐟 𐐟</div>
+<div>𐐠 𐐠</div>
+<div>𐐡 𐐡</div>
+<div>𐐢 𐐢</div>
+<div>𐐣 𐐣</div>
+<div>𐐤 𐐤</div>
+<div>𐐥 𐐥</div>
+<div>𐐦 𐐦</div>
+<div>𐐧 𐐧</div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht
index 2de260ef97f..a7496546485 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-021.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-021-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=21' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will uppercase Unicode Deseret characters when text-transform is set to uppercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht
new file mode 100644
index 00000000000..f2ca31d3e6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022-ref.xht
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>test reference</title>
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test { font-size: 130%; line-height: 2.5; color: blue; }
+.test div { white-space: nowrap; text-align: center;
+             width: 5em; display: inline-block; }</style>
+<script type='text/javascript'>
+//<![CDATA[
+function setFontFamily () {var fontName = document.getElementById( 'fontName' ).value;	var divs = document.getElementsByTagName('div');	var i = 0; var div;	while (i < divs.length) {	 	div = divs.item(i);		if (div.className == 'test') { 			div.style.fontFamily = fontName; 			}		i++;		}	}
+//]]>
+</script>
+</head>
+<body>
+<p class="instructions">Test passes if the left-hand character in each pair matches the right-hand one.</p>
+
+
+<div class="test">
+<div>𐐨 𐐨</div>
+<div>𐐩 𐐩</div>
+<div>𐐪 𐐪</div>
+<div>𐐫 𐐫</div>
+<div>𐐬 𐐬</div>
+<div>𐐭 𐐭</div>
+<div>𐐮 𐐮</div>
+<div>𐐯 𐐯</div>
+<div>𐐰 𐐰</div>
+<div>𐐱 𐐱</div>
+<div>𐐲 𐐲</div>
+<div>𐐳 𐐳</div>
+<div>𐐴 𐐴</div>
+<div>𐐵 𐐵</div>
+<div>𐐶 𐐶</div>
+<div>𐐷 𐐷</div>
+<div>𐐸 𐐸</div>
+<div>𐐹 𐐹</div>
+<div>𐐺 𐐺</div>
+<div>𐐻 𐐻</div>
+<div>𐐼 𐐼</div>
+<div>𐐽 𐐽</div>
+<div>𐐾 𐐾</div>
+<div>𐐿 𐐿</div>
+<div>𐑀 𐑀</div>
+<div>𐑁 𐑁</div>
+<div>𐑂 𐑂</div>
+<div>𐑃 𐑃</div>
+<div>𐑄 𐑄</div>
+<div>𐑅 𐑅</div>
+<div>𐑆 𐑆</div>
+<div>𐑇 𐑇</div>
+<div>𐑈 𐑈</div>
+<div>𐑉 𐑉</div>
+<div>𐑊 𐑊</div>
+<div>𐑋 𐑋</div>
+<div>𐑌 𐑌</div>
+<div>𐑍 𐑍</div>
+<div>𐑎 𐑎</div>
+<div>𐑏 𐑏 </div>
+</div>
+
+
+<p id='fontChange' style='display: none;' class='notes'>If you are unable to see font glyphs for certain characters using the browsers default font you can apply a specific font by typing its name in the following box: <input class='css' name='fontName' id='fontName' value='' type='text' /> <button class='notes' type='button' onclick='setFontFamily()'>Apply</button></p><script type='text/javascript'>if (document.getElementById) {document.getElementById('fontChange').style.display = 'block'}</script></body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht
index 9e195af6e14..7f8c65c67ed 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-bicameral-022.xht
@@ -6,6 +6,8 @@
 <link rel='author' title='Richard Ishida' href='http://rishida.net' />
 <link rel='reviewer' title='Elika J. Etemad' href='http://fantasai.inkedblade.net/contact' />
 <link rel='help' href='http://www.w3.org/TR/CSS21/text.html#caps-prop' />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+<link rel="match" href="text-transform-bicameral-022-ref.xht"/>
 <link rel='alternate' href='http://www.w3.org/International/tests/tests-html-css/tests-text-transform/generate?test=22' />
 <meta name='flags' content='' />
 <meta name="assert" content="The UA will lowercase Unicode Deseret characters when text-transform is set to lowercase." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-001-ref.xht
rename to tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001.xht
similarity index 80%
rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-001.xht
rename to tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001.xht
index 5dd16835457..329f5f7ff02 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-001.xht
@@ -2,7 +2,8 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
-    <link rel="match" href="text-transform-capitalize-001-ref.xht"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+    <link rel="match" href="text-transform-cap-001-ref.xht"/>
     <meta name="flags" content="" />
   </head><body style="letter-spacing:2px">
     <span style="text-transform:capitalize">This text should be capitalized.</span>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-002.xht
similarity index 80%
rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-002.xht
rename to tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-002.xht
index ebc1f50afde..bf4632b1d59 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-002.xht
@@ -2,7 +2,8 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
-    <link rel="match" href="text-transform-capitalize-001-ref.xht"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+    <link rel="match" href="text-transform-cap-001-ref.xht"/>
     <meta name="flags" content="" />
   </head><body style="letter-spacing:2px">
     T<span style="text-transform:capitalize">his text should be capitalized.</span>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-003-ref.xht
rename to tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003.xht
similarity index 85%
rename from tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-003.xht
rename to tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003.xht
index e2869d18a4e..d3290c2a328 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-capitalize-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-cap-003.xht
@@ -2,7 +2,8 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
-    <link rel="match" href="text-transform-capitalize-003-ref.xht"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+    <link rel="match" href="text-transform-cap-003-ref.xht"/>
     <meta name="flags" content="" />
 </head><body style="letter-spacing:2px">
 <p><span style="text-transform:capitalize">i ask "questions"</span>
@@ -13,4 +14,4 @@
 </p><p style="white-space:nowrap"><span style="text-transform:capitalize">i ask questions</span>
 
 
-</p></body></html>
\ No newline at end of file
+</p></body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht
index 59d9b245a1d..58d8eb70375 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-lowercase-001.xht
@@ -2,6 +2,7 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
     <link rel="match" href="text-transform-lowercase-001-ref.xht"/>
     <meta name="flags" content="" />
   </head><body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht
new file mode 100644
index 00000000000..3dffb508688
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001-ref.xht
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+    </head>
+    <body>
+        <p>Test passes if the two characters below look exactly alike.</p>
+        <div>
+            <span id="test">&#4304;</span>
+            <span>&#4304;</span>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht
index c899e90046b..3979cbbd9cb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-unicase-001.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Text-transform and unicase scripts</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
+        <link rel="match" href="text-transform-unicase-001-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Verifies that text-transform does not capitalize a unicase script." />
         <style type="text/css">
@@ -20,4 +22,4 @@
             <span>&#4304;</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht
index 8b0d28e18e0..4ef06f3e664 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-001.xht
@@ -2,6 +2,7 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
     <link rel="match" href="text-transform-uppercase-001-ref.xht"/>
     <meta name="flags" content="" />
   </head><body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht
index 9e268c80cad..0aff0f0aa13 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-uppercase-002.xht
@@ -2,6 +2,7 @@
     <link rel="author" title="Robert O'Callahan" href="mailto:robert@ocallahan.org" />
     <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
     <link rel="match" href="text-transform-uppercase-002-ref.xht"/>
     <meta name="flags" content="" />
   </head><body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht
index eaf86aad80c..04e90d7f950 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-002.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: block' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht
index 031e3a8d562..67ad1e5d103 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-003.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-applies-to-003-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to display: list-item elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht
index db6a06282dc..8508a884be4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-005.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: inline-block' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht
index d750da518be..b60f51ff757 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-006.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht
index c99cdf93346..2521a6d8b44 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-007.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: inline-table' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht
index d3fd1fab0a9..214d844f1a0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-008.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-row-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht
index 2fef90d7c51..5328956af61 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-009.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-header-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht
index 4c636785956..affee6ab1a8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-010.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-footer-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht
index 31370f896a6..f4dcfbe9b03 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-011.xht
@@ -4,7 +4,8 @@
         <title>CSS Test: White-space application to 'display:  table-row' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display:  table-row' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht
index 8819f33f129..f4d9ecfe4e0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-012.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property is not applied to 'display: table-column-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht
index 32171998cfd..4e01932c837 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-013.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property is not applied to 'display: table-column' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht
index 9911721e8dc..fc9b6412526 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-014.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-cell' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht
index bb11f26d2cf..1b8acd7b050 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-applies-to-015.xht
@@ -5,6 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-white-space" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'white-space' property applies to 'display: table-caption' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht
index 40c4727704c..09d66cd49be 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-control-characters-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White-space and non white space control characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#ctrlchars" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="White space processing model does not affect non white space control characters, in this case the 'Start of string' character." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -33,4 +34,4 @@
         <div id="div1"><span>X &#x98; XX</span></div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
index 228b4f8c19f..995cf637dd1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-nowrap-attribute-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White-space 'nowrap' vs. 'nowrap' attribute</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-generated-content-before-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'nowrap' attribute and 'white-space: nowrap' assignment behave the same way with respect to white space." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht
index ac7376b134d..7074b87df9d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-p-element-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White-space 'normal' vs. 'p' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-generated-content-before-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'p' element and 'white-space: normal' assignment behave the same way with respect to white space." />
@@ -12,7 +13,7 @@
             {
                 white-space: normal;
             }
-	    div + p { margin: 0; }
+            div + p { margin: 0; }
        </style>
     </head>
     <body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht
index 7ec2ba896d4..a40988144d7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-pre-element-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: White-space 'pre' vs. 'pre' element</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property"/>
         <link rel="match" href="white-space-pre-element-001-ref.xht" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'pre' element and 'white-space: pre' assignment behave the same way with respect to white space." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht
new file mode 100644
index 00000000000..e42ddd80857
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005-ref.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font-family: Ahem;
+                height: 1em;
+                margin-bottom: 3px;
+                width: 3em;
+            }
+            #div2
+            {
+                background-color: blue;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
+        <div id="div1">XX</div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht
index 0cc09c00d45..1237c6830d3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-005.xht
@@ -4,8 +4,10 @@
         <title>CSS Test: White-space 'normal' with carriage return adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing"/>
         <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'normal'. The linefeed may be rendered as a space or not rendered." />
+        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'normal'. The linefeed may be rendered as a space or not rendered. Under css-text-3, this is stricter: the carriage return is turned into a space, which is removed before a line feed, and the line feed must be turned into a space, which must be discarded since it's at the end of a line." />
+        <link rel="match" href="white-space-processing-005-ref.xht"/>
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
@@ -26,7 +28,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#x0D;&#10;</div>
         <div id="div2"></div>
     </body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht
new file mode 100644
index 00000000000..76e313a593b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font-family: Ahem;
+                height: 1em;
+                margin-bottom: 3px;
+                width: 4em;
+            }
+            #div1
+            {
+                background: black;
+                white-space: nowrap;
+            }
+            #div2
+            {
+                background-color: blue;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is the same width, or shorter, than the blue box. Its okay if the black box has a small notch in it.</p>
+        <div id="div1">XX X</div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht
index c67cf835351..886e6bdc059 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-006.xht
@@ -5,7 +5,9 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
         <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'nowrap'. The linefeed may be rendered as a space or not rendered." />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing"/>
+        <link rel="match" href="white-space-processing-006-ref.xht" />
+        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'nowrap'. The linefeed may be rendered as a space or not rendered. Under css-text-3 rules, this is scriter, and 1 space is expected" />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
@@ -31,4 +33,4 @@
         <div id="div1">XX&#13;&#10;X</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht
index 4c0a8325810..d05501d169d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-007.xht
@@ -4,8 +4,10 @@
         <title>CSS Test: White-space 'pre-line' with carriage return adjoining linefeed</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-processing"/>
         <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'pre-line'.  The linefeed may be rendered as a space or not rendered." />
+        <link rel="match" href="white-space-processing-005-ref.xht"/>
+        <meta name="assert" content="A carriage return before a linefeed is removed if 'white-space' is set to 'pre-line'.  The linefeed may be rendered as a space or not rendered. Under css-text-3, the result is fully deterministic." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
@@ -26,8 +28,8 @@
         </style>
     </head>
     <body>
-        <p>Test passes if the black box below is the same width, or shorter, than the blue box.</p>
+        <p>Test passes if the black box below is shorter than the blue box.</p>
         <div id="div1">XX&#13;&#10;</div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht
new file mode 100644
index 00000000000..9b1bc070d21
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014-ref.xht
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+                height: 1em;
+                margin-bottom: 3px;
+            }
+            #div1
+            {
+                background-color: blue;
+                width: 5em;
+            }
+            #div2
+            {
+                background-color: orange;
+                width: 4em;
+            }
+            span
+            {
+                background-color: black;
+                white-space: normal;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is the same width as either the blue box or the orange box.</p>
+        <div id="div1"></div>
+        <div>
+            <span>XX XX</span>
+        </div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht
index 75fb87be126..8f4c10f6e02 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-014.xht
@@ -4,8 +4,10 @@
         <title>CSS Test: White-space 'normal' and linefeed characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform"/>
+        <link rel="match" href="white-space-processing-014-ref.xht"/>
         <meta name="flags" content="ahem may" />
-        <meta name="assert" content="Linefeed characters are transformed into spaces, zero-width space, or not rendered when 'white-space' is set to 'normal'." />
+        <meta name="assert" content="Linefeed characters are transformed into spaces, zero-width space, or not rendered when 'white-space' is set to 'normal'. Under css-text-3 rules, they must be transformed into spaces" />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
@@ -39,4 +41,4 @@
         </div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht
new file mode 100644
index 00000000000..d31a52d448e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015-ref.xht
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            span
+            {
+                background-color: black;
+                font-family: Ahem;
+                white-space: nowrap;
+            }
+            #div1
+            {
+                background: blue;
+                display: inline-block;
+                height: 1em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is one black box below and it is at least as long as the blue box (it can be longer).</p>
+        <div>
+            <span>XX XX</span>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht
index b123db459ce..329753677b5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-015.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: White-space 'nowrap' and linefeed characters</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform"/>
+        <link rel="match" href="white-space-processing-015-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Linefeed characters are transformed into spaces, zero-width space, or not rendered when 'white-space' is set to 'nowrap'." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -30,4 +32,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht
new file mode 100644
index 00000000000..ab837b02768
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048-ref.xht
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #div1
+            {
+                font-family: Ahem;
+                white-space: normal;
+                width: 5em;
+            }
+            div div
+            {
+                color: blue;
+                float: right;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the blue box is below the black box.</p>
+        <div id="div1">
+            <span>XXXXXX</span>
+            <div>XXX</div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht
index d4c64697310..13a639ab756 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-048.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Floats and line opportunity with 'white-space'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding"/>
+        <link rel="match" href="white-space-processing-048-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="A line breaking opportunity is not introduced with floats." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -24,8 +26,7 @@
     <body>
         <p>Test passes if the blue box is below the black box.</p>
         <div id="div1">
-            <span>XXXXXX</span>
-            <div>XXX</div>
+            <span>XXX<div>XXX</div>XXX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht
index 5d5602de342..4492d4b64b5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-049.xht
@@ -5,7 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-08-11 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-		<link rel="match" href="white-space-processing-049-ref.xht" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding"/>
+        <link rel="match" href="white-space-processing-049-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="A line breaking opportunity is not introduced with an absolutely positioned element." />
@@ -31,8 +32,7 @@
     <body>
         <p>Test passes if there is an orange sliver on the left and right of a short blue stripe.</p>
         <div id="div1">
-            <span>XXXXXXX</span>
-            <div>XXX</div>
+            <span>XXX<div>XXX</div>XXXX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-057.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-057.xht
deleted file mode 100644
index b54e9b5419b..00000000000
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-057.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: White-space 'pre-wrap' and tab at end of line</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A tab at end of line may be removed when 'white-space' is set to 'pre-wrap'." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css">
-            div
-            {
-                font-family: Ahem;
-            }
-            #span1
-            {
-                white-space: pre-wrap;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is one or two boxes below.</p>
-        <div>
-            <span id="span1">X&#32;</span>
-            <span>X</span>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-058.xht b/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-058.xht
deleted file mode 100644
index 40007dbbd10..00000000000
--- a/tests/wpt/web-platform-tests/css/CSS2/text/white-space-processing-058.xht
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: White-space 'pre-wrap' and space at end of line before following inline element</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model" />
-        <meta name="flags" content="ahem may" />
-        <meta name="assert" content="A space at end of line may be removed when 'white-space' is set to 'pre-wrap'." />
-        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-        <style type="text/css">
-            div
-            {
-                font-family: Ahem;
-            }
-            #span1
-            {
-                white-space: pre-wrap;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is one or two boxes below.</p>
-        <div>
-            <span id="span1">X </span>
-            <span>X</span>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht
new file mode 100644
index 00000000000..2dab814ef0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004-ref.xht
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below (with no jagged edges).</p>
+        <div>
+            <div>
+                <span>x x</span>
+            </div>
+            <div id="test">x x</div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht
index 823197cc803..f7e449efc25 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-004.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in pixels." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht
index c28f3cb375a..16db0a26f65 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-005.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in pixels." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht
index 9b3d54d7f21..8eb27fd6b5d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-006.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in pixels." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht
new file mode 100644
index 00000000000..dddf4d31ea8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #wrapper
+            {
+                font: 16px/1em Ahem;
+            }
+            #span1,
+            #span2
+            {
+                margin-left: 112px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below (with no jagged edges).</p>
+        <div id="wrapper">
+            <div>
+                <span>x</span><span id="span1">x</span>
+            </div>
+            <div>
+                <span>x</span><span id="span2">x</span>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht
index 8c18aa337e4..98a55006ad1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-007.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 96px adds 96px (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 120px;
+                margin-left: 96px;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht
index a58eff478f6..a69ac2cc726 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-008.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +96px adds 96px (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 120px;
+                margin-left: 96px;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht
index 7114e7f6ecc..d35020bb858 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-016.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in points." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht
index 9cd07ece404..53752f76247 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-017.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in points." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht
index 810d45bd6dd..ce7ed139741 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-018.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in points." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht
index 5e3cd60f478..5c047edfa61 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-019.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that letter-spacing 72pt adds 72pt (in addition to default spacing) between letters in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 12pt/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 84pt;
+                margin-left: 72pt;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht
index f49a79e3b79..c4ee51998f7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-020.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +72pt adds +72 points (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 12pt/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 84pt;
+                margin-left: 72pt;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht
index 75019e2eb25..bc4ad9ff2bb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-028.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in picas." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht
index 67aa05e1216..c33d73e3502 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-029.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in picas." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht
index da8ff8df0e7..74575f93ad2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-030.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in picas." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht
index 89cac8dde5b..f28c3c123cf 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-031.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 6pc adds 6pc (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 3pc/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 9pc;
+                margin-left: 6pc;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht
index 5e78d8f7deb..bf7cea9b1c5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-032.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +6pc adds 6pc (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 3pc/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 9pc;
+                margin-left: 6pc;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht
index 2669c344ed7..7d9995882e3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-040.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in centimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht
index 0b1e293f6ae..9daf333f8e2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-041.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in centimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht
index 48166f8df4b..f07bd616b43 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-042.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in centimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht
index 58b40e98dd5..6d56c4ae080 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-043.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 2.54cm adds 2.54cm (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 1cm/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
@@ -32,4 +34,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht
index 9c54efe2065..ba5650373f4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-044.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +2.54cm adds 2.54cm (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 1cm/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
@@ -32,4 +34,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht
index 330829c266d..97a017bf205 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-052.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in millimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht
index b17d188797d..2224326c9be 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-053.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in millimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht
index 9ec2d3fb93a..e8d217e1567 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-054.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in millimeters." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht
index f76ba7a7b7a..895882fa7fc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-055.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 25.4mm adds 25.4mm (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 25.4mm/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 50.8mm;
+                margin-left: 25.4mm;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht
index 1cbc5ab1377..8d393bc97c5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-056.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +25.4mm adds 25.4mm (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 25.4mm/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 50.8mm;
+                margin-left: 25.4mm;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht
index 354265d6209..5f60fd66181 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-064.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in inches." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht
index 5a99dd0209a..3f9a20f0301 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-065.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in inches." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht
index 8ecad8b2c04..0f4a7bb00cb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-066.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in inches." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht
index 1e100bfbd19..f2f2eda7bf8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-067.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 1in adds 1in (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 2in/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 3in;
+                margin-left: 1in;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht
index 299326934e2..d8aa6b7b60c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-068.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +1in adds 1in (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 2in/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left:3in;
+                margin-left: 1in;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht
index bcc867e9dd7..01cfc7d5ed2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-076.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in 'em' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht
index ebeca116dea..b27a1105548 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-077.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in 'em' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht
index bf86663d505..6d53a9b4322 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-078.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in 'em' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht
index 005946794a8..aa26d4e6a14 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-079.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 6em adds 6em (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -15,7 +17,7 @@
             }
             #span2
             {
-                margin-left: 112px;
+                margin-left: 6em;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht
index b9593cb2646..9c9cedb4bc1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-080.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +6em adds 6em (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -15,7 +17,7 @@
             }
             #span2
             {
-                margin-left: 112px;
+                margin-left: 6em;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht
index d9d764cc5ff..324ebbe1b5d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-088.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a negative zero length value in 'ex' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht
index 244463958e8..cd4e4370c8f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-089.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a zero length value in 'ex' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht
index dbb29b82c52..d77ef61e0b0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-090.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property sets a positive zero length value in 'ex' units." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht
new file mode 100644
index 00000000000..5f80730fb08
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #wrapper
+            {
+                font: 16px/1em Ahem;
+            }
+            #span1,
+            #span2
+            {
+                margin-left: 12ex;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below (with no jagged edges).</p>
+        <div id="wrapper">
+            <div>
+                <span>x </span><span id="span1">x</span>
+            </div>
+            <div>
+                <span>x </span><span id="span2">x</span>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht
index 42dfe990ab1..534e3018a46 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-091.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-091-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 12ex adds 12ex (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 20px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 212px;
+                margin-left: 12ex;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht
index b1362668cd3..11b5e581690 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-092.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-091-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +12ex adds 12ex (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 20px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 212px;
+                margin-left: 12ex;
             }
             #test
             {
@@ -27,9 +29,9 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht
index f6a9d05d94f..e6807d77aa2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-097.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing -0 adds 0 (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht
index 9d03c315d42..23b22a24065 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-098.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing 0 adds no extra space (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht
index ecf88acbf02..160d1671d2b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-099.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing +0 adds no extra space (in addition to default spacing) between words in the element." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht
index f520c66cfc2..41208d7153d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-100.xht
@@ -5,13 +5,15 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-004-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property set to normal does not change spacing between words." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -28,4 +30,4 @@
             <div id="test">x x</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht
index 1dacf22738d..cc09cd2c45a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-101.xht
@@ -5,17 +5,19 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property" />
+        <link rel="match" href="word-spacing-091-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that word-spacing with inherit uses its parents value for word-spacing." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #wrapper
             {
-                font: 20px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #span2
             {
-                margin-left: 212px;
+                margin-left: 12ex;
             }
             #parent
             {
@@ -32,11 +34,11 @@
         <p>Test passes if there are only two boxes below (with no jagged edges).</p>
         <div id="wrapper">
             <div>
-                <span>x</span><span id="span2">x</span>
+                <span>x </span><span id="span2">x</span>
             </div>
             <div id="parent">
                 <div id="test">x x</div>
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht
new file mode 100644
index 00000000000..adec02560e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001-ref.xht
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            div div
+            {
+                display: inline;
+            }
+            #div1
+            {
+                background: blue;
+                height: 1em;
+                width: 22em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two black boxes below and the last black box ends when the blue box ends.</p>
+        <div>
+            <div>XXXXX &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;XXXXXX</div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht
index abc44082937..1b8935ba3ec 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-001.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: inline' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -33,4 +35,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht
index 2168839e3b5..905623e6cbb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-002.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: block' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -33,4 +35,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht
new file mode 100644
index 00000000000..620db3dc400
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003-ref.xht
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            body
+            {
+                margin-left: 2em;
+            }
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            div div
+            {
+                display: list-item;
+            }
+            #div2
+            {
+                background: blue;
+                height: 1em;
+                width: 22em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two black boxes below and the last black box ends when the blue box ends. There also needs to be a marker bullet on the left-hand side of the left most black box.</p>
+        <div>
+            <div>XXXXX &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;XXXXXX</div>
+        </div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht
index 062b26b02ba..df82c523dae 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-003.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-003-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: list-item' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -37,4 +39,4 @@
         </div>
         <div id="div2"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht
index 121629fe120..3d3980335a5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-005.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: inline-block' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -33,4 +35,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht
index 3916c6ddbbc..2391060920d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-006.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -43,4 +45,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht
new file mode 100644
index 00000000000..3763d7e86b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007-ref.xht
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #table
+            {
+                display: inline-table;
+            }
+            #row
+            {
+                display: table-row;
+            }
+            #cell
+            {
+                display: table-cell;
+            }
+            #div1
+            {
+                background: blue;
+                height: 1em;
+                width: 22em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two black boxes below and the last black box ends when the blue box ends.</p>
+        <div id="table">
+            <div id="row">
+                <div id="cell">XXXXX &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;XXXXXX</div>
+            </div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht
index f126cd1a986..a8780bf5de7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-007.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-007-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: inline-table' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -43,4 +45,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht
index 811172ca506..f5b1f983577 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-008.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-row-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -49,4 +51,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht
index 53bd343da4d..aecc99e2a3c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-009.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-header-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -49,4 +51,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht
index 3ccf704fcd7..f726522e73b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-010.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-footer-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -49,4 +51,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht
index 53a846da438..ad9d843c75b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-011.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-row' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -43,4 +45,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht
new file mode 100644
index 00000000000..59fcf0312ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012-ref.xht
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #table
+            {
+                display: table;
+            }
+            #test
+            {
+                display: table-column-group;
+            }
+            #row
+            {
+                display: table-row;
+            }
+            #cell
+            {
+                display: table-cell;
+            }
+            #div1
+            {
+                background: blue;
+                height: 1em;
+                width: 11em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are two black boxes below and the last black box ends when the blue box ends.</p>
+        <div id="table">
+            <div id="test"></div>
+            <div id="row">
+                <div id="cell">XXXXX XXXXX</div>
+            </div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht
index 930e0d64bdc..2bc77c239dd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-012.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-012-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property is not applied to 'display: table-column-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -48,4 +50,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht
index b6033bcf383..628c5163353 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-013.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-012-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property is not applied to 'display: table-column' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -48,4 +50,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht
index 2d46ce4a923..0fe3c6217fc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-014.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-cell' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -43,4 +45,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht
index a57e9d7da9e..c81aa5a99a7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-applies-to-015.xht
@@ -5,6 +5,8 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-applies-to-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'word-spacing' property applies to 'display: table-caption' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -49,4 +51,4 @@
         </div>
         <div id="div1"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht
new file mode 100644
index 00000000000..4a6004eb6fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001-ref.xht
@@ -0,0 +1,80 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>test reference</title>
+  <style type="text/css">
+    div {
+      margin: 1em;
+      font-family: monospace;
+      page-break-inside: avoid;
+    }
+    div p {
+      margin: 0;
+    }
+    .controlcontrol {
+      background: orange;
+      width: 4em;
+    }
+
+    .control span {
+      background: blue;
+      color: blue;
+    }
+    .spacer {
+      padding-left: 4em;
+    }
+    .test span {
+      background: orange;
+      color: orange;
+    }
+    .ws-pre p {
+      white-space: pre;
+    }
+  </style>
+ </head>
+ <body>
+   <p>In each of the following pairs, the blue and orange bars must have equal lengths.</p>
+
+    <div>
+      <p class="control"><span class="spacer"></span>&nbsp;</p>
+      <p class="controlcontrol">&nbsp;</p>
+    </div>
+
+   <div class="ws-normal">
+     <p class="control"><span>A <span class="spacer"></span>B</span></p>
+     <p class="test"><span>A <span class="spacer"></span>B</span></p>
+   </div>
+   <div class="ws-normal">
+     <p class="control"><span>A <span class="spacer"></span>B</span></p>
+     <p class="test"><span>A <span class="spacer"></span>B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A <span class="spacer"></span> <span class="spacer"></span>B</span></p>
+     <p class="test"><span>A <span class="spacer"></span> <span class="spacer"></span>B</span></p>
+   </div>
+
+   <div class="ws-normal">
+     <p class="control"><span>A&nbsp;<span class="spacer"></span>B</span></p>
+     <p class="test"><span>A&nbsp;<span class="spacer"></span>B</span></p>
+   </div>
+   <div class="ws-normal">
+     <p class="control"><span>A&nbsp;&nbsp;<span class="spacer"></span><span class="spacer"></span>B</span></p>
+     <p class="test"><span>A&nbsp;&nbsp;<span class="spacer"></span><span class="spacer"></span>B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&nbsp;&nbsp;<span class="spacer"></span><span class="spacer"></span>B</span></p>
+     <p class="test"><span>A&nbsp;&nbsp;<span class="spacer"></span><span class="spacer"></span>B</span></p>
+   </div>
+
+   <div class="ws-normal">
+     <p class="control"><span>A&nbsp; &nbsp; <span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span>B</span></p>
+     <p class="test"><span>A&nbsp; &nbsp; <span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span>B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&nbsp;  &nbsp;  <span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span>&#09;B</span></p>
+     <p class="test"><span>A&nbsp;  &nbsp;  <span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span><span class="spacer"></span>&#09;B</span></p>
+   </div>
+
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht
index c0cc3d7e888..73cd132ef40 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-001.xht
@@ -5,6 +5,8 @@
   <title>CSS Test: word-spacing on Flexible Space Characters</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+  <link rel="match" href="word-spacing-characters-001-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Word-spacing affects each space (U+0020)
         and non-breaking space (U+00A0)."/>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht
new file mode 100644
index 00000000000..4b7928d9762
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002-ref.xht
@@ -0,0 +1,175 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>test reference</title>
+  <style type="text/css">
+    div {
+      margin: 1em;
+      font-family: monospace;
+      page-break-inside: avoid;
+    }
+    div p {
+      margin: 0;
+    }
+
+    .control span {
+      background: blue;
+      color: blue;
+    }
+    .test span {
+      background: orange;
+      color: orange;
+    }
+    .ws-pre p {
+      white-space: pre;
+    }
+    body > div { display: inline-block; } /* to avoid overflowing the screen. Non essential to the test. */
+  </style>
+ </head>
+ <body>
+   <p>In each of the following pairs, the blue and orange bars must have equal lengths.</p>
+
+   <!-- IDEOGRAPHIC SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x3000;&#x3000;&#x3000;&#x3000;B</span></p>
+     <p class="test"><span>A&#x3000;&#x3000;&#x3000;&#x3000;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x3000;&#x3000;&#x3000;&#x3000;B</span></p>
+     <p class="test"><span>A&#x3000;&#x3000;&#x3000;&#x3000;B</span></p>
+   </div>
+
+   <!-- EN QUAD -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2000;&#x2000;&#x2000;&#x2000;B</span></p>
+     <p class="test"><span>A&#x2000;&#x2000;&#x2000;&#x2000;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2000;&#x2000;&#x2000;&#x2000;B</span></p>
+     <p class="test"><span>A&#x2000;&#x2000;&#x2000;&#x2000;B</span></p>
+   </div>
+
+   <!-- EM QUAD -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2001;&#x2001;&#x2001;&#x2001;B</span></p>
+     <p class="test"><span>A&#x2001;&#x2001;&#x2001;&#x2001;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2001;&#x2001;&#x2001;&#x2001;B</span></p>
+     <p class="test"><span>A&#x2001;&#x2001;&#x2001;&#x2001;B</span></p>
+   </div>
+
+   <!-- EN SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2002;&#x2002;&#x2002;&#x2002;B</span></p>
+     <p class="test"><span>A&#x2002;&#x2002;&#x2002;&#x2002;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2002;&#x2002;&#x2002;&#x2002;B</span></p>
+     <p class="test"><span>A&#x2002;&#x2002;&#x2002;&#x2002;B</span></p>
+   </div>
+
+   <!-- EM SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2003;&#x2003;&#x2003;&#x2003;B</span></p>
+     <p class="test"><span>A&#x2003;&#x2003;&#x2003;&#x2003;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2003;&#x2003;&#x2003;&#x2003;B</span></p>
+     <p class="test"><span>A&#x2003;&#x2003;&#x2003;&#x2003;B</span></p>
+   </div>
+
+   <!-- THREE-PER-EM SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2004;&#x2004;&#x2004;&#x2004;B</span></p>
+     <p class="test"><span>A&#x2004;&#x2004;&#x2004;&#x2004;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2004;&#x2004;&#x2004;&#x2004;B</span></p>
+     <p class="test"><span>A&#x2004;&#x2004;&#x2004;&#x2004;B</span></p>
+   </div>
+
+   <!-- FOUR-PER-EM SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2005;&#x2005;&#x2005;&#x2005;B</span></p>
+     <p class="test"><span>A&#x2005;&#x2005;&#x2005;&#x2005;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2005;&#x2005;&#x2005;&#x2005;B</span></p>
+     <p class="test"><span>A&#x2005;&#x2005;&#x2005;&#x2005;B</span></p>
+   </div>
+
+   <!-- SIX-PER-EM SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2006;&#x2006;&#x2006;&#x2006;B</span></p>
+     <p class="test"><span>A&#x2006;&#x2006;&#x2006;&#x2006;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2006;&#x2006;&#x2006;&#x2006;B</span></p>
+     <p class="test"><span>A&#x2006;&#x2006;&#x2006;&#x2006;B</span></p>
+   </div>
+
+   <!-- FIGURE SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2007;&#x2007;&#x2007;&#x2007;B</span></p>
+     <p class="test"><span>A&#x2007;&#x2007;&#x2007;&#x2007;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2007;&#x2007;&#x2007;&#x2007;B</span></p>
+     <p class="test"><span>A&#x2007;&#x2007;&#x2007;&#x2007;B</span></p>
+   </div>
+
+   <!-- PUNCTUATION SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2008;&#x2008;&#x2008;&#x2008;B</span></p>
+     <p class="test"><span>A&#x2008;&#x2008;&#x2008;&#x2008;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2008;&#x2008;&#x2008;&#x2008;B</span></p>
+     <p class="test"><span>A&#x2008;&#x2008;&#x2008;&#x2008;B</span></p>
+   </div>
+
+   <!--THIN SPACE  -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x2009;&#x2009;&#x2009;&#x2009;B</span></p>
+     <p class="test"><span>A&#x2009;&#x2009;&#x2009;&#x2009;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x2009;&#x2009;&#x2009;&#x2009;B</span></p>
+     <p class="test"><span>A&#x2009;&#x2009;&#x2009;&#x2009;B</span></p>
+   </div>
+
+   <!-- HAIR SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x200A;&#x200A;&#x200A;&#x200A;B</span></p>
+     <p class="test"><span>A&#x200A;&#x200A;&#x200A;&#x200A;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x200A;&#x200A;&#x200A;&#x200A;B</span></p>
+     <p class="test"><span>A&#x200A;&#x200A;&#x200A;&#x200A;B</span></p>
+   </div>
+
+   <!-- NARROW NO-BREAK SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x202F;&#x202F;&#x202F;&#x202F;B</span></p>
+     <p class="test"><span>A&#x202F;&#x202F;&#x202F;&#x202F;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x202F;&#x202F;&#x202F;&#x202F;B</span></p>
+     <p class="test"><span>A&#x202F;&#x202F;&#x202F;&#x202F;B</span></p>
+   </div>
+
+   <!-- MEDIUM MATHEMATICAL SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x205F;&#x205F;&#x205F;&#x205F;B</span></p>
+     <p class="test"><span>A&#x205F;&#x205F;&#x205F;&#x205F;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x205F;&#x205F;&#x205F;&#x205F;B</span></p>
+     <p class="test"><span>A&#x205F;&#x205F;&#x205F;&#x205F;B</span></p>
+   </div>
+
+
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht
index 6cc25712b03..e35c5133693 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-002.xht
@@ -5,6 +5,8 @@
   <title>CSS Test: word-spacing on Fixed-Width Space Characters</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+  <link rel="match" href="word-spacing-characters-002-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Word-spacing does not affect fixed-width spaces."/>
   <style type="text/css">
@@ -29,6 +31,7 @@
     .ws-pre p {
       white-space: pre;
     }
+    body > div { display: inline-block; } /* to avoid overflowing the screen. Non essential to the test. */
   </style>
  </head>
  <body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht
new file mode 100644
index 00000000000..b8d64adee1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003-ref.xht
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>test reference</title>
+  <style type="text/css">
+    div {
+      margin: 1em;
+      font-family: monospace;
+      page-break-inside: avoid;
+    }
+    div p {
+      margin: 0;
+    }
+
+    .control span {
+      background: blue;
+      color: blue;
+    }
+    .test span {
+      background: orange;
+      color: orange;
+    }
+    .ws-pre p {
+      white-space: pre;
+    }
+  </style>
+ </head>
+ <body>
+   <p>In each of the following pairs, the blue and orange bars must have equal lengths.</p>
+
+   <!-- ZERO-WIDTH SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x200B;&#x200B;&#x200B;&#x200B;B</span></p>
+     <p class="test"><span>A&#x200B;&#x200B;&#x200B;&#x200B;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x200B;&#x200B;&#x200B;&#x200B;B</span></p>
+     <p class="test"><span>A&#x200B;&#x200B;&#x200B;&#x200B;B</span></p>
+   </div>
+
+   <!-- ZERO-WIDTH NO-BREAK SPACE -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#xFEFF;&#xFEFF;&#xFEFF;&#xFEFF;B</span></p>
+     <p class="test"><span>A&#xFEFF;&#xFEFF;&#xFEFF;&#xFEFF;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#xFEFF;&#xFEFF;&#xFEFF;&#xFEFF;B</span></p>
+     <p class="test"><span>A&#xFEFF;&#xFEFF;&#xFEFF;&#xFEFF;B</span></p>
+   </div>
+
+   <!-- ZERO-WIDTH NON-JOINER -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x200C;&#x200C;&#x200C;&#x200C;B</span></p>
+     <p class="test"><span>A&#x200C;&#x200C;&#x200C;&#x200C;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x200C;&#x200C;&#x200C;&#x200C;B</span></p>
+     <p class="test"><span>A&#x200C;&#x200C;&#x200C;&#x200C;B</span></p>
+   </div>
+
+   <!-- ZERO-WIDTH JOINER -->
+   <div class="ws-normal">
+     <p class="control"><span>A&#x200D;&#x200D;&#x200D;&#x200D;B</span></p>
+     <p class="test"><span>A&#x200D;&#x200D;&#x200D;&#x200D;B</span></p>
+   </div>
+   <div class="ws-pre">
+     <p class="control"><span>A&#x200D;&#x200D;&#x200D;&#x200D;B</span></p>
+     <p class="test"><span>A&#x200D;&#x200D;&#x200D;&#x200D;B</span></p>
+   </div>
+
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht
index 203aa133173..97527191885 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-characters-003.xht
@@ -5,6 +5,8 @@
   <title>CSS Test: word-spacing on Zero-Width Characters</title>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+  <link rel="match" href="word-spacing-characters-003-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="Word-spacing does not affect zero-width characters."/>
   <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht
new file mode 100644
index 00000000000..90268c2994a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001-ref.xht
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            span
+            {
+                display: block;
+                font: 16px/1em Ahem;
+                width: 20em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are three distinct boxes below.</p>
+        <div>
+            <span>XXXXX &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;XXXXX XXXXX &nbsp;&nbsp;&nbsp;XXXXX</span>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht
index beae011e920..17d811de98f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-justify-001.xht
@@ -4,6 +4,10 @@
         <title>CSS Test: Word-spacing and 'text-align: justify'</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-justify-property"/>
+        <link rel="match" href="word-spacing-justify-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The word spacing is changed when combined with 'text-align: justify'." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -24,4 +28,4 @@
             <span>XXXXX XXXXX XXXXX XXXXX</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht
new file mode 100644
index 00000000000..8f331d3dbcc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 3em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X &nbsp;&nbsp;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht
index 5f9a77b5f8c..0f28e33f648 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-001.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The white space processing removes spaces before 'word-spacing' is applied." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,4 @@
         <div id="div1">X  X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht
new file mode 100644
index 00000000000..36e21947518
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 12em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht
index 57f7f159937..990b98eca8b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-002.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple non-breaking spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-002-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The white space processing removes non-breaking space before 'word-spacing' is applied." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,4 @@
         <div id="div1">X&nbsp; &nbsp; X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht
new file mode 100644
index 00000000000..596ee02c975
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003-ref.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 8em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X&#x3000;  &nbsp;&nbsp;&#x3000; &nbsp;&nbsp;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht
index 41b6cb6531b..9655c134ebd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-003.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple ideographic spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-003-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The white space processing removes ideographic space before 'word-spacing' is applied." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,4 @@
         <div id="div1">X&#x3000;  &#x3000; X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht
new file mode 100644
index 00000000000..8c55f28f725
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004-ref.xht
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div1
+            {
+                white-space: pre;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 6em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X &nbsp;&nbsp; &nbsp;&nbsp;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht
index 96c94a3a80a..5aa54a68101 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-004.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple preserved spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-004-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Any space left after white-space processing model occurs, has word-spacing applied to it." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -35,4 +37,4 @@
         <div id="div1">X  X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht
new file mode 100644
index 00000000000..de884afbba0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005-ref.xht
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div1
+            {
+                white-space: pre;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 9em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht
index 7cb53c84f57..daaa40fb2c6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-005.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple preserved spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-005-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Any non-breaking space left after white-space processing model occurs, has word-spacing applied to it." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -35,4 +37,4 @@
         <div id="div1">X&nbsp; &nbsp;X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht
new file mode 100644
index 00000000000..1a809e523b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006-ref.xht
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>test reference</title>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            div
+            {
+                font: 16px/1em Ahem;
+            }
+            #div1
+            {
+                white-space: pre;
+            }
+            #div2, #div3
+            {
+                background: black;
+                display: inline-block;
+                height: 1em;
+                width: 1em;
+            }
+            #div3
+            {
+                margin-left: 8em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there are only two boxes below.</p>
+        <div id="div1">X&#x3000; &nbsp;&nbsp; &nbsp;&nbsp;&#x3000;X</div>
+        <div id="div2"></div><div id="div3"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht
index bd660ca2693..d3b2936770f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/word-spacing-remove-space-006.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Word-spacing and white space with multiple preserved spaces</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property"/>
+        <link rel="match" href="word-spacing-remove-space-006-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Any ideographic space left after white-space processing model occurs, has word-spacing applied to it." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -35,4 +37,4 @@
         <div id="div1">X&#x3000;  &#x3000;X</div>
         <div id="div2"></div><div id="div3"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html
new file mode 100644
index 00000000000..1d90cc45f61
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-fill-balance-004.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf" title="7.1. column-fill">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="writing-mode:vertical-rl; columns:2; column-gap:0; inline-size:100px; background:red;">
+  <div style="block-size:20px;">
+    <div style="block-size:200px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html
new file mode 100644
index 00000000000..041c211b855
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-015.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#spanning-columns">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-margins">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-gap:0; width:100px; background:red;">
+  <div style="height:30px;"></div>
+  <div style="height:30px; background:green;"></div>
+  <div>
+    <div style="column-span:all; height:40px; background:green;">
+      <div style="width:50px; height:40px; background:red;"></div>
+    </div>
+  </div>
+  <div style="margin-top:-70px; height:130px; background:green;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html b/tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html
new file mode 100644
index 00000000000..9efaf1bff88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/scroll-width-height.tentative.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+.multi {
+  width: 400px;
+  height: 400px;
+  columns: 3;
+}
+.child {
+  inline-size: 100px;
+  block-size: 100px;
+  outline: solid black;
+}
+.grandchild {
+  inline-size: 100px;
+  block-size: 300px;
+  background: lime;
+}
+</style>
+<body onload="checkLayout('.child, .grandchild')">
+<div id=log></div>
+
+<div class="multi" style="writing-mode: horizontal-tb">
+  <div class="child" data-expected-scroll-width="100" data-expected-scroll-height="300">
+    <div class="grandchild" data-expected-scroll-width="100" data-expected-scroll-height="300"></div>
+  </div>
+</div>
+<div class="multi" style="writing-mode: vertical-rl">
+  <div class="child" data-expected-scroll-width="300" data-expected-scroll-height="100">
+    <div class="grandchild" data-expected-scroll-width="300" data-expected-scroll-height="100"></div>
+  </div>
+</div>
+<div class="multi" style="writing-mode: vertical-lr">
+  <div class="child" data-expected-scroll-width="300" data-expected-scroll-height="100">
+    <div class="grandchild" data-expected-scroll-width="300" data-expected-scroll-height="100"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-006.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-006.html
new file mode 100644
index 00000000000..08f755ad75c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-006.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="width: 100px; height: 100px; overflow-x: auto;">
+  <div style="overflow-x: clip;">
+    <div style="width: 200px; height: 100px; background: green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-007.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-007.html
new file mode 100644
index 00000000000..642ea9c3e6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-007.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="width: 100px; height: 100px; overflow-y: auto;">
+  <div style="overflow-y: clip; height: 100px;">
+    <div style="width: 100px; height: 200px; background: green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-001-ref.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-lowercase-101-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-001-ref.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-001-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/reference/text-transform-uppercase-101-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-001.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-101.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-001.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-101.xht
index dc3fadf64ca..2016cf07200 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-101.xht
@@ -5,7 +5,7 @@
 		<title>CSS Test: text-transform - lowercase - basic cases</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
 		<link rel="help" title="CSS Text Level 3: 3.1. Transforming Text: the ‘text-transform’ property" href="http://www.w3.org/TR/css-text-3/#text-transform" />
-		<link rel="match" href="reference/text-transform-lowercase-001-ref.xht"/>
+		<link rel="match" href="reference/text-transform-lowercase-101-ref.xht"/>
 		<meta name="flags" content="" />
 		<meta name="assert" content="The UA should put all characters in lowercase when text-transform is set to lowercase." />
 		<style type="text/css">
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-002-ref.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-002-ref.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102-ref.xht
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-002.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102.xht
similarity index 91%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-002.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102.xht
index 42deb58b1bb..ebbd5bf2d2b 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-002.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-lowercase-102.xht
@@ -3,7 +3,7 @@
     <title>CSS Test: text-transform I with dot above</title>
     <link rel="author" title="Anthony Ramine" href="mailto:n.oxyde@gmail.com"/>
     <link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-text-transform-lowercase"/>
-    <link rel="match" href="text-transform-lowercase-002-ref.xht"/>
+    <link rel="match" href="text-transform-lowercase-102-ref.xht"/>
     <meta name="assert" content="Tests that U+0130 to lowercase includes U+0307"/>
     <meta name="flags" content=""/>
   </head><body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-001.xht b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-101.xht
similarity index 94%
rename from tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-001.xht
rename to tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-101.xht
index e0d1f9a1955..559992e76ee 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-001.xht
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-uppercase-101.xht
@@ -5,7 +5,7 @@
 		<title>CSS Test: text-transform - uppercase - basic cases</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
 		<link rel="help" title="CSS Text Level 3: 3.1. Transforming Text: the ‘text-transform’ property" href="http://www.w3.org/TR/css-text-3/#text-transform" />
-		<link rel="match" href="reference/text-transform-uppercase-001-ref.xht"/>
+		<link rel="match" href="reference/text-transform-uppercase-101-ref.xht"/>
 		<meta name="flags" content="" />
 		<meta name="assert" content="The UA should put all characters in uppercase when text-transform is set to uppercase." />
 		<style type="text/css">
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js b/tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js
new file mode 100644
index 00000000000..0094b8a2c75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/support/transform-interpolation-reftests.js
@@ -0,0 +1,126 @@
+'use strict';
+
+// Each test is an array of [endpoint, midpoint, endpoint] and tests
+// whether the endpoints interpolate to the same visual state as the midpoint
+const transformTests = {
+  translate: [
+    ['translateX(0px)', 'translateX(25px)', 'translateX(50px)'],
+    ['translateY(0px)', 'translateY(25px)', 'translateY(50px)'],
+    ['translateX(0%)', 'translateX(25%)', 'translateX(50%)'],
+    ['translateY(0%)', 'translateY(25%)', 'translateY(50%)'],
+    ['translateX(50%)', 'translate(25%, 25%)', 'translateY(50%)'],
+    ['translateX(50%)', 'translate(25%, 25px)', 'translateY(50px)'],
+    ['translateX(50px)', 'translateX(calc(25px + 25%))', 'translateX(50%)']
+  ],
+  translateEm: [
+    ['translateX(0em)', 'translateX(2em)', 'translateX(4em)'],
+    ['translateX(-50px)', 'translateX(calc(2em - 25px))', 'translateX(4em)'],
+    ['translateX(50%)', 'translateX(calc(25% - 2em))', 'translateX(-4em)']
+  ],
+  rotate: [
+    ['rotate(0deg)', 'rotate(45deg)', 'rotate(90deg)'],
+    ['rotateX(0deg)', 'rotateX(45deg)', 'rotateX(90deg)'],
+    ['rotateY(0deg)', 'rotateY(45deg)', 'rotateY(90deg)'],
+    ['rotate(0deg)', 'rotate(180deg)', 'rotate(360deg)'],
+    ['rotate3d(7, 8, 9, 0deg)', 'rotate3d(7, 8, 9, 45deg)', 'rotate3d(7, 8, 9, 90deg)'],
+    // First endpoint is the same rotation as rotateZ(0deg) but triggers SLERP
+    ['rotateX(360deg)', 'rotateZ(45deg)', 'rotateZ(90deg)']
+  ],
+  scale: [
+    ['scaleX(0.5)', 'scaleX(0.75)', 'scaleX(1)'],
+    ['scaleY(0.5)', 'scaleY(0.75)', 'scaleY(1)'],
+    ['scale(0.5)', 'scale(0.75)', 'scale(1)'],
+    ['scaleX(0.5)', 'scale(0.75)', 'scaleY(0.5)'],
+    ['scale3d(0.5, 1, 2)', 'scale3d(0.75, 0.75, 3)', 'scale3d(1, 0.5, 4)']
+  ],
+  skew: [
+    ['skewX(0deg)', 'skewX(30deg)', 'skewX(60deg)'],
+    ['skewY(0deg)', 'skewY(30deg)', 'skewY(60deg)'],
+    ['skew(60deg, 0deg)', 'skew(30deg, 30deg)', 'skew(0deg, 60deg)'],
+    ['skewX(0deg) rotate(0deg)', 'skewX(0deg) rotate(180deg)', 'skewX(0deg) rotate(360deg)'],
+    ['skewX(0deg) rotate(0deg)', 'matrix(1, 0, 0, 1, 0, 0)', 'skewY(0deg) rotate(360deg)']
+  ],
+  matrix: [
+    // matched matrix parameters do not collapse the values after them
+    ['matrix(1,0,0,1,0,0) rotate(0deg)', 'matrix(1.5,0,0,1.5,0,0) rotate(180deg)', 'matrix(2,0,0,2,0,0) rotate(360deg)']
+  ]
+}
+
+// Initial setup, which includes properties that will be overridden to
+// test invalidation.
+function initialStyle(div) {
+  div.style.width = '180px';
+  div.style.height = '150px';
+  div.style.margin = '50px';
+  div.style.borderLeft = 'solid 40px blue';
+  div.style.backgroundColor = 'green';
+  div.style.willChange = 'transform';
+  div.style.fontSize = '30px';
+}
+
+function finalStyle(div) {
+  div.style.width = '80px';
+  div.style.height = '80px';
+  div.style.fontSize = '15px';
+}
+
+function styleBody(){
+  let body = document.body;
+  body.style.display = 'flex';
+  body.style.flexDirection = 'row';
+  body.style.flexWrap = 'wrap';
+}
+
+// Simulate a static image at 50% progeress with a running animation.
+// The easing curve has zero slope and curvature at its midpoint of 50% -> 50%.
+// The timing values are chosen so as so that a delay of up to 10s will not
+// cause a visual change.
+const easing = 'cubic-bezier(0,1,1,0)';
+const duration = 1e9;
+const delay = -duration/2;
+
+// Indices to unpack a test case, which is in the format
+// [start, midpoint, end]
+const startIndex = 0;
+const midIndex = 1;
+const endIndex = 2;
+
+async function createTests(tests) {
+  styleBody();
+  for (const test of tests) {
+    let div = document.createElement('div');
+    document.body.appendChild(div);
+    initialStyle(div);
+    var anim = div.animate(
+        {transform: [test[startIndex], test[endIndex]]},
+        {duration: duration, delay: delay, easing: easing});
+    await anim.ready;
+    finalStyle(div);  // Change size to test invalidation.
+  }
+
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  takeScreenshot();
+}
+
+// Create references using an animation with identical keyframes for start
+// and end so as to avoid rounding and anti-aliasing differences between
+// animated and non-animated pathways.
+async function createRefs(tests) {
+  styleBody();
+  for (const test of tests) {
+    let div = document.createElement('div');
+    document.body.appendChild(div);
+    initialStyle(div);
+    finalStyle(div);
+    var anim = div.animate(
+        {transform: [test[midIndex], test[midIndex]]},
+        {duration: duration, delay: delay, easing: easing});
+    await anim.ready;
+  }
+
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  takeScreenshot();
+}
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html
new file mode 100644
index 00000000000..0930a7469a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-animated-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+const testName = window.location.search.substr(1);
+createRefsWithAnimation(transformTests[testName]);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html
new file mode 100644
index 00000000000..b5f9c3cd308
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-matrix.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?matrix">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.matrix);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html
new file mode 100644
index 00000000000..2fee6f7c1fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+const testName = window.location.search.substr(1);
+createRefs(transformTests[testName]);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html
new file mode 100644
index 00000000000..9d94d83424d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-rotate.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?rotate">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.rotate);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html
new file mode 100644
index 00000000000..ef0da0d1f43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-scale.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?scale">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.scale);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
new file mode 100644
index 00000000000..4f8aa52fd10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-skew.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?skew">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.skew);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html
new file mode 100644
index 00000000000..aff613ab09c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate-em.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?translateEm">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.translateEm);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html
new file mode 100644
index 00000000000..5abeb240932
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/transform-interpolation-translate.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="match" href="transform-interpolation-ref.html?translate">
+<link rel="help" href="https://drafts.csswg.org/css-transforms/">
+
+<script src="../../../common/reftest-wait.js"></script>
+<script src="support/transform-interpolation-reftests.js"></script>
+
+<body>
+<script>
+createTests(transformTests.translate);
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
index 091cfd0631b..6f0b77f22ed 100644
--- a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-deltas.html
@@ -11,6 +11,11 @@
   height: 500px;
   background: red;
 }
+html, body {
+  /* Prevent any built-in browser overscroll features from consuming the scroll
+   * deltas */
+  overscroll-behavior: none;
+}
 
 </style>
 
@@ -46,6 +51,11 @@ function runTest() {
     await waitFor(() => { return scrollend_received; },
         'Document did not receive scrollend event.');
 
+    // Even though we request 300 pixels of scroll, the API above doesn't
+    // guarantee how much scroll delta will be generated - different browsers
+    // can consume different amounts for "touch slop" (for example). Ensure the
+    // overscroll reaches at least 100 pixels which is a fairly conservative
+    // value.
     assert_greater_than(overscrolled_y_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
     assert_equals(overscrolled_x_deltas.filter(function(x){ return x!=0; }).length, 0, "The deltaX attribute must be 0 when there is no scrolling in x direction.");
     assert_less_than_equal(Math.max(...overscrolled_y_deltas), 0, "The deltaY attribute must be <= 0 when there is overscrolling in up direction.");
@@ -61,10 +71,14 @@ function runTest() {
     await waitFor(() => { return scrollend_received; },
         'Document did not receive scrollend event.');
 
+    // TODO(bokan): It looks like Chrome inappropriately filters some scroll
+    // events despite |overscroll-behavior| being set to none. The overscroll
+    // amount here has been loosened but this should be fixed in Chrome.
+    // https://crbug.com/1112183.
     assert_greater_than(overscrolled_y_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
     assert_equals(overscrolled_y_deltas.filter(function(x){ return x!=0; }).length, 0, "The deltaY attribute must be 0 when there is no scrolling in y direction.");
     assert_less_than_equal(Math.max(...overscrolled_x_deltas), 0, "The deltaX attribute must be <= 0 when there is overscrolling in left direction.");
-    assert_less_than_equal(Math.min(...overscrolled_x_deltas),-100, "The deltaX attribute must be the number of pixels overscrolled.");
+    assert_less_than_equal(Math.min(...overscrolled_x_deltas),-50, "The deltaX attribute must be the number of pixels overscrolled.");
 
   }, 'Tests that the document gets overscroll event with right deltaX/Y attributes.');
 }
diff --git a/tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html b/tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html
new file mode 100644
index 00000000000..eb1499936eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/editing/run/caret-navigation-around-line-break.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Caret navigation around line break</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<meta name="assert" content="This test checks that caret navigation works well around various kinds of line breaks." />
+<meta name="timeout" content="long">
+<style>
+.test {
+  font-size: 16px;
+  line-height: 20px;
+  padding: 4px;
+  width: 5.5ch;
+  padding: 5px;
+  font-family: monospace;
+  word-wrap: break-word;
+}
+</style>
+
+<div class="test" contenteditable data-title="no separator"
+    >line1line2</div>
+<div class="test" contenteditable data-title="<br> separator"
+    >line1<br>line2</div>
+<div class="test" contenteditable data-title="<wbr> separator"
+    >line1<wbr>line2</div>
+<div class="test" contenteditable data-title="<span> separator"
+    >line1<span></span>line2</div>
+<div class="test" contenteditable data-title="two <span> separators"
+    >line1<span></span><span></span>line2</div>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script>
+const KEY_CODE_MAP = {
+  'ArrowLeft':  '\uE012',
+  'ArrowUp':    '\uE013',
+  'ArrowRight': '\uE014',
+  'ArrowDown':  '\uE015',
+};
+
+function click(target, x, y) {
+  return new test_driver.Actions()
+    .pointerMove(x, y, {origin: target})
+    .pointerDown()
+    .pointerUp()
+    .send();
+}
+
+const s = getSelection();
+for (const test of document.querySelectorAll(".test")) {
+  const padding = 4;
+  const halfLineWidth = Math.floor((test.offsetWidth - padding) / 2);
+  const halfLineHeight = Math.floor(20 / 2);
+  const hasSeparator = test.firstChild !== test.lastChild;
+  const line1 = {
+    node: test.firstChild,
+    start: 0,
+    end: "line1".length,
+  };
+  const line2 = {
+    node: test.lastChild,
+    start: hasSeparator ? 0 : "line1".length,
+    end: hasSeparator ? "line2".length : "line1line2".length,
+  };
+
+  promise_test(async t => {
+    // Click at the start of line 1
+    await click(test, -halfLineWidth, -halfLineHeight);
+    assert_equals(s.anchorNode, line1.node, "Caret is in line 1");
+    assert_equals(s.anchorOffset, line1.start, "Caret is at the start of line 1");
+
+    // Move down, expect start of line 2
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowDown);
+    assert_equals(s.anchorNode, line2.node, "Caret moved to line 2");
+    assert_equals(s.anchorOffset, line2.start, "Caret moved to the start of line 2");
+
+    // Click at the end of line 1
+    await click(test, +halfLineWidth, -halfLineHeight);
+    range = getSelection().getRangeAt(0);
+    assert_equals(s.anchorNode, line1.node, "Caret is in line 1");
+    assert_equals(s.anchorOffset, line1.end, "Caret is at the end of line 1");
+
+    // Move down, expect end of line 2
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowDown);
+    assert_equals(s.anchorNode, line2.node, "Caret moved to line 2");
+    assert_equals(s.anchorOffset, line2.end, "Caret moved to the end of line 2");
+  }, test.dataset.title + " - move down");
+
+  promise_test(async t => {
+    // Click at the start of line 2
+    await click(test, -halfLineWidth, +halfLineHeight);
+    assert_equals(s.anchorNode, line2.node, "Caret is in line 2");
+    assert_equals(s.anchorOffset, line2.start, "Caret is at the start of line 2");
+
+    // Move up, expect start of line 1
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowUp);
+    assert_equals(s.anchorNode, line1.node, "Caret moved to line 1");
+    assert_equals(s.anchorOffset, line1.start, "Caret moved to the start of line 1");
+
+    // Click at the end of line 2
+    await click(test, +halfLineWidth, +halfLineHeight);
+    assert_equals(s.anchorNode, line2.node, "Caret is in line 2");
+    assert_equals(s.anchorOffset, line2.end, "Caret is at the end of line 2");
+
+    // Move up, expect end of line 1
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowUp);
+    assert_equals(s.anchorNode, line1.node, "Caret moved to line 1");
+    assert_equals(s.anchorOffset, line1.end, "Caret moved to the end of line 1");
+  }, test.dataset.title + " - move up");
+
+  promise_test(async t => {
+    // Click at the end of line 1
+    await click(test, +halfLineWidth, -halfLineHeight);
+    assert_equals(s.anchorNode, line1.node, "Caret is in line 1");
+    assert_equals(s.anchorOffset, line1.end, "Caret is at the end of line 1");
+
+    // Move right, expect start or start+1 of line 2
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowRight);
+    assert_equals(s.anchorNode, line2.node, "Caret moved to line 2");
+    assert_in_array(s.anchorOffset, [line2.start, line2.start + 1], "Caret moved to the start or start+1 of line 2");
+  }, test.dataset.title + " - move right");
+
+  promise_test(async t => {
+    // Click at the start of line 2
+    await click(test, -halfLineWidth, +halfLineHeight);
+    assert_equals(s.anchorNode, line2.node, "Caret is in line 2");
+    assert_equals(s.anchorOffset, line2.start, "Caret is at the start of line 2");
+
+    // Move left, expect end or end-1 of line 1
+    await test_driver.send_keys(test, KEY_CODE_MAP.ArrowLeft);
+    assert_equals(s.anchorNode, line1.node, "Caret moved to line 1");
+    assert_in_array(s.anchorOffset, [line1.end, line1.end - 1], "Caret moved to the end or end-1 of line 1");
+  }, test.dataset.title + " - move left");
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js b/tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js
index a7f8ec11c96..2950a9e58ed 100644
--- a/tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js
+++ b/tests/wpt/web-platform-tests/encoding/streams/decode-non-utf8.any.js
@@ -25,6 +25,12 @@ const encodings = [
     expected: "\u{6c34}",
     invalid: [255]
   },
+  {
+    name: 'ISO-2022-JP',
+    value: [65, 66, 67, 0x1B, 65, 66, 67],
+    expected: "ABC\u{fffd}ABC",
+    invalid: [0x0E]
+  },
   {
     name: 'ISO-8859-14',
     value: [100, 240, 114],
diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
index daa2aa182da..df53af22364 100644
--- a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
@@ -24,16 +24,5 @@
         expect_feature_unavailable_default, 'payment');
   }, header + ' disallows cross-origin navigation in an iframe.');
 
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, same_origin_src,
-        expect_feature_available_default, 'payment', 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows same-origin navigation in an iframe.');
-
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, cross_origin_src,
-        expect_feature_unavailable_default, 'payment', 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true disallows cross-origin navigation in an iframe.');
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
index ae77daa8151..ccb6740d6a2 100644
--- a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
@@ -32,16 +32,5 @@
         expect_feature_available_default);
   }, header + ' allows cross-origin iframes.');
 
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, same_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows same-origin iframes.');
-
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, cross_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows cross-origin iframes.');
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html
index ad4bbdcee60..f73ac82ab75 100644
--- a/tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/payment-default-feature-policy.https.sub.html
@@ -32,16 +32,5 @@
         expect_feature_unavailable_default);
   }, header + ' disallows cross-origin iframes.');
 
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, same_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows same-origin iframes.');
-
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, cross_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows cross-origin iframes.');
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html
index b82eb4f1ef5..0e479fd2a3d 100644
--- a/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/payment-disabled-by-feature-policy.https.sub.html
@@ -30,16 +30,5 @@
         expect_feature_unavailable_default,);
   }, header + ' disallows cross-origin iframes.');
 
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, same_origin_src,
-        expect_feature_unavailable_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true disallows same-origin iframes.');
-
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, cross_origin_src,
-        expect_feature_unavailable_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true disallows cross-origin iframes.');
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
index e2feee96e3d..347cba1deea 100644
--- a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
+++ b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
@@ -13,9 +13,9 @@ function assert_feature_policy_supported() {
 //        "/feature-policy/resources/feature-policy-payment.html",
 //        "/feature-policy/resources/feature-policy-usb.html".
 //    expect_feature_available: a callback(data, feature_description) to
-//        verify if a feature is avaiable or unavailable as expected.
+//        verify if a feature is available or unavailable as expected.
 //        The file under the path "src" defines what "data" is sent back as a
-//        pistMessage. Inside the callback, some tests (e.g., EXPECT_EQ,
+//        postMessage. Inside the callback, some tests (e.g., EXPECT_EQ,
 //        EXPECT_TRUE, etc) are run accordingly to test a feature's
 //        availability.
 //        Example: expect_feature_available_default(data, feature_description).
@@ -24,8 +24,8 @@ function assert_feature_policy_supported() {
 //      feature (https://wicg.github.io/feature-policy/#features).
 //      See examples at:
 //      https://github.com/WICG/feature-policy/blob/master/features.md
-//    allow_attribute: Optional argument, only used for testing fullscreen or
-//      payment: either "allowfullscreen" or "allowpaymentrequest" is passed.
+//    allow_attribute: Optional argument, only used for testing fullscreen:
+//      "allowfullscreen"
 function test_feature_availability(
     feature_description, test, src, expect_feature_available, feature_name,
     allow_attribute) {
diff --git a/tests/wpt/web-platform-tests/html/dom/elements-embedded.js b/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
index 27b5b61845d..c4b572cf309 100644
--- a/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
+++ b/tests/wpt/web-platform-tests/html/dom/elements-embedded.js
@@ -30,7 +30,6 @@ var embeddedElements = {
     sandbox: "settable tokenlist",
     allowFullscreen: "boolean",
     allowUserMedia: "boolean",
-    allowPaymentRequest: "boolean",
     width: "string",
     height: "string",
     referrerPolicy: {type: "enum", keywords: ["", "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "strict-origin", "origin-when-cross-origin", "strict-origin-when-cross-origin", "unsafe-url"]},
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html
new file mode 100644
index 00000000000..be4656d04a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-during-and-after-dispatch.tentative.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>InputEvent.getTargetRanges() should return same array in various timings</title>
+<div contenteditable></div>
+<script src="input-events-get-target-ranges.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script>
+"use strict";
+
+// https://github.com/w3c/input-events/issues/114
+function checkGetTargetRangesKeepReturningSameValue(event, desc) {
+  assert_equals(
+      getArrayOfRangesDescription(event.getTargetRanges()),
+      getArrayOfRangesDescription(event.cachedRanges),
+      `getTargetRanges() of ${event.type} event should keep returning the same array of ranges ${desc}`);
+}
+
+promise_test(async () => {
+  initializeTest("<p>abc</p>");
+  let textNode = gEditor.firstChild.firstChild;
+  gSelection.collapse(textNode, 2);
+  await sendBackspaceKey();
+  assert_equals(gEditor.innerHTML, "<p>ac</p>", 'Should "b" be deleted');
+  checkGetTargetRangesKeepReturningSameValue(gBeforeinput[0], "even after its propagation");
+  checkGetTargetRangesKeepReturningSameValue(gInput[0], "even after its propagation");
+}, "Check consistency of getTargetRanges() result between during propagation and after propagation");
+
+promise_test(async () => {
+  initializeTest("<p>abc</p>");
+  let textNode = gEditor.firstChild.firstChild;
+  gSelection.collapse(textNode, 2);
+  gEditor.addEventListener("beforeinput", (event) => {
+    assert_false(typeof event.cachedRanges === "undefined", "The beforeinput event should have cache of getTargetRanges()");
+    gSelection.collapse(textNode, 3);
+    checkGetTargetRangesKeepReturningSameValue(event, "even after changing selection");
+  }, {once: true});
+  await sendBackspaceKey();
+  assert_equals(gEditor.innerHTML, "<p>ab</p>", 'Should "c" be deleted');
+}, "Check consistency of getTargetRanges() result between before and after changing selection in an event listener");
+
+promise_test(async () => {
+  initializeTest("<p>abc</p>");
+  let textNode = gEditor.firstChild.firstChild;
+  gSelection.collapse(textNode, 2);
+  window.addEventListener("beforeinput", (event) => {
+    assert_true(typeof event.cachedRanges === "undefined", "The beforeinput event shouldn't have cached ranges yet");
+    gSelection.collapse(textNode, 3);
+  }, {once: true, capture: true});
+  await sendBackspaceKey();
+  assert_equals(gEditor.innerHTML, "<p>ab</p>", 'Should "c" be deleted');
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: textNode,
+    startOffset: 1,
+    endContainer: textNode,
+    endOffset: 2,
+  });
+}, "The result of getTargetRanges() of beforeinput event should be fixed at being dispatched");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
index 4d09c4da521..a957678c50f 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
@@ -13,31 +13,66 @@ const kKeyA = "a";
 const kImgSrc =
   "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==";
 
-let gSelection = getSelection();
-let gEditor = document.querySelector("div[contenteditable]");
-let gBeforeinput = [];
-let gInput = [];
-gEditor.addEventListener("beforeinput", e => {
-  // NOTE: Blink makes `getTargetRanges()` return empty range after propagation,
-  //       but this test wants to check the result during propagation.
-  //       Therefore, we need to cache the result, but will assert if
-  //       `getTargetRanges()` returns different ranges after checking the
-  //       cached ranges.
-  e.cachedRanges = e.getTargetRanges();
-  gBeforeinput.push(e);
-});
-gEditor.addEventListener("input", e => {
-  e.cachedRanges = e.getTargetRanges();
-  gInput.push(e);
-});
+let gSelection, gEditor, gBeforeinput, gInput;
 
 function initializeTest(aInnerHTML) {
+  function onBeforeinput(event) {
+    // NOTE: Blink makes `getTargetRanges()` return empty range after
+    //       propagation, but this test wants to check the result during
+    //       propagation.  Therefore, we need to cache the result, but will
+    //       assert if `getTargetRanges()` returns different ranges after
+    //       checking the cached ranges.
+    event.cachedRanges = event.getTargetRanges();
+    gBeforeinput.push(event);
+  }
+  function onInput(event) {
+    event.cachedRanges = event.getTargetRanges();
+    gInput.push(event);
+  }
+  if (gEditor !== document.querySelector("div[contenteditable]")) {
+    if (gEditor) {
+      gEditor.isListeningToInputEvents = false;
+      gEditor.removeEventListener("beforeinput", onBeforeinput);
+      gEditor.removeEventListener("input", onInput);
+    }
+    gEditor = document.querySelector("div[contenteditable]");
+  }
+  gSelection = getSelection();
+  gBeforeinput = [];
+  gInput = [];
+  if (!gEditor.isListeningToInputEvents) {
+    gEditor.isListeningToInputEvents = true;
+    gEditor.addEventListener("beforeinput", onBeforeinput);
+    gEditor.addEventListener("input", onInput);
+  }
+
   gEditor.innerHTML = aInnerHTML;
   gEditor.focus();
   gBeforeinput = [];
   gInput = [];
 }
 
+function getArrayOfRangesDescription(arrayOfRanges) {
+  if (arrayOfRanges === null) {
+    return "null";
+  }
+  if (arrayOfRanges === undefined) {
+    return "undefined";
+  }
+  if (!Array.isArray(arrayOfRanges)) {
+    return "Unknown Object";
+  }
+  if (arrayOfRanges.length === 0) {
+    return "[]";
+  }
+  let result = "[";
+  for (let range of arrayOfRanges) {
+    result += `{${getRangeDescription(range)}},`;
+  }
+  result += "]";
+  return result;
+}
+
 function getRangeDescription(range) {
   function getNodeDescription(node) {
     if (!node) {
@@ -68,27 +103,6 @@ function getRangeDescription(range) {
       }) - (${getNodeDescription(range.endContainer)}, ${range.endOffset})`;
 }
 
-function getArrayOfRangesDescription(arrayOfRanges) {
-  if (arrayOfRanges === null) {
-    return "null";
-  }
-  if (arrayOfRanges === undefined) {
-    return "undefined";
-  }
-  if (!Array.isArray(arrayOfRanges)) {
-    return "Unknown Object";
-  }
-  if (arrayOfRanges.length === 0) {
-    return "[]";
-  }
-  let result = "[";
-  for (let range of arrayOfRanges) {
-    result += `{${getRangeDescription(range)}},`;
-  }
-  result += "]";
-  return result;
-}
-
 function sendDeleteKey(modifier) {
   if (!modifier) {
     return new test_driver.Actions()
@@ -140,46 +154,39 @@ function sendArrowRightKey() {
     .send();
 }
 
-function checkGetTargetRangesKeepReturningSameValue(event) {
-  // https://github.com/w3c/input-events/issues/114
-  assert_equals(
-    getArrayOfRangesDescription(event.getTargetRanges()),
-    getArrayOfRangesDescription(event.cachedRanges),
-    `${event.type}.getTargetRanges() should keep returning the same array of ranges even after its propagation finished`
-  );
-}
-
-function checkGetTargetRangesOfBeforeinputOnDeleteSomething(expectedRange) {
+function checkGetTargetRangesOfBeforeinputOnDeleteSomething(expectedRanges) {
   assert_equals(
     gBeforeinput.length,
     1,
-    "One beforeinput event should be fired if the key operation deletes something"
+    "One beforeinput event should be fired if the key operation tries to delete something"
   );
   assert_true(
     Array.isArray(gBeforeinput[0].cachedRanges),
-    "gBeforeinput[0].getTargetRanges() should return an array of StaticRange instances during propagation"
+    "gBeforeinput[0].getTargetRanges() should return an array of StaticRange instances at least during propagation"
   );
-  // Before checking the length of array of ranges, we should check the first
-  // range first because the first range data is more important than whether
-  // there are additional unexpected ranges.
-  if (gBeforeinput[0].cachedRanges.length > 0) {
+  let arrayOfExpectedRanges = Array.isArray(expectedRanges)
+    ? expectedRanges
+    : [expectedRanges];
+  // Before checking the length of array of ranges, we should check the given
+  // range first because the ranges are more important than whether there are
+  // redundant additional unexpected ranges.
+  for (
+    let i = 0;
+    i <
+    Math.max(arrayOfExpectedRanges.length, gBeforeinput[0].cachedRanges.length);
+    i++
+  ) {
     assert_equals(
-      getRangeDescription(gBeforeinput[0].cachedRanges[0]),
-      getRangeDescription(expectedRange),
-      `gBeforeinput[0].getTargetRanges() should return expected range (inputType is "${gBeforeinput[0].inputType}")`
-    );
-    assert_equals(
-      gBeforeinput[0].cachedRanges.length,
-      1,
-      "gBeforeinput[0].getTargetRanges() should return one range within an array"
+      getRangeDescription(gBeforeinput[0].cachedRanges[i]),
+      getRangeDescription(arrayOfExpectedRanges[i]),
+      `gBeforeinput[0].getTargetRanges()[${i}] should return expected range (inputType is "${gBeforeinput[0].inputType}")`
     );
   }
   assert_equals(
     gBeforeinput[0].cachedRanges.length,
-    1,
-    "One range should be returned from getTargetRanges() when the key operation deletes something"
+    arrayOfExpectedRanges.length,
+    `getTargetRanges() of beforeinput event should return ${arrayOfExpectedRanges.length} ranges`
   );
-  checkGetTargetRangesKeepReturningSameValue(gBeforeinput[0]);
 }
 
 function checkGetTargetRangesOfInputOnDeleteSomething() {
@@ -191,14 +198,13 @@ function checkGetTargetRangesOfInputOnDeleteSomething() {
   // https://github.com/w3c/input-events/issues/113
   assert_true(
     Array.isArray(gInput[0].cachedRanges),
-    "gInput[0].getTargetRanges() should return an array of StaticRange instances during propagation"
+    "gInput[0].getTargetRanges() should return an array of StaticRange instances at least during propagation"
   );
   assert_equals(
     gInput[0].cachedRanges.length,
     0,
     "gInput[0].getTargetRanges() should return empty array during propagation"
   );
-  checkGetTargetRangesKeepReturningSameValue(gInput[0]);
 }
 
 function checkGetTargetRangesOfInputOnDoNothing() {
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 3bf41f95893..8bf6d0f52df 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1580,6 +1580,8 @@ interface ElementInternals {
   boolean reportValidity();
 
   readonly attribute NodeList labels;
+
+  readonly attribute ShadowRoot? shadowRoot;
 };
 
 ElementInternals includes ARIAMixin;
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-request.idl b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
index 9b6537c97ec..dc0511b0c4b 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-request.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
@@ -16,8 +16,6 @@ interface PaymentRequest : EventTarget {
   Promise<undefined> abort();
   [NewObject]
   Promise<boolean> canMakePayment();
-  [NewObject]
-  Promise<boolean> hasEnrolledInstrument();
 
   readonly attribute DOMString id;
   readonly attribute PaymentAddress? shippingAddress;
diff --git a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
index 600ae0514a3..6778c51bdfd 100644
--- a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
+++ b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
@@ -10,4 +10,5 @@
 
 dictionary SanitizerConfig {
   sequence<DOMString>? dropElements;
+  sequence<DOMString>? dropAttributes;
 };
diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html b/tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html
index f5645bf3e3f..0a1426ef021 100644
--- a/tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html
+++ b/tests/wpt/web-platform-tests/intersection-observer/resources/same-origin-grand-child-iframe.html
@@ -8,8 +8,10 @@
 <div id="target" style="width: 100px; height: 100px; position: absolute; right: 0"></div>
 <script>
 const observer = new IntersectionObserver(records => {
-  let { rootBounds, intersectionRect } = records[0];
-  window.top.postMessage({ rootBounds, intersectionRect }, "*");
+  if (records[0].isIntersecting) {
+    let { rootBounds, intersectionRect } = records[0];
+    window.top.postMessage({ rootBounds, intersectionRect }, "*");
+  }
 }, {});
 observer.observe(document.getElementById("target"));
 </script>
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 38ec5e19221..8431077e6a6 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -183,7 +183,6 @@ SET TIMEOUT: mixed-content/generic/sanity-checker.js
 SET TIMEOUT: navigation-timing/*
 SET TIMEOUT: old-tests/submission/Microsoft/history/history_000.htm
 SET TIMEOUT: paint-timing/resources/subframe-painting.html
-SET TIMEOUT: payment-request/allowpayment/setting-allowpaymentrequest-timing.https.sub.html
 SET TIMEOUT: portals/resources/portals-adopt-predecessor-portal.html
 SET TIMEOUT: preload/single-download-preload.html
 SET TIMEOUT: resize-observer/resources/iframe.html
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 cb37d430114..fe3234b6501 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
@@ -19,7 +19,7 @@ def main(request, response):
         query_string_pieces.append(b"header=" + request.GET.first(b"header"))
       if b"send-loaded-message" in request.GET:
         query_string_pieces.append(b"send-loaded-message")
-      query_string = "?" + "&".join(query_string_pieces)
+      query_string = b"?" + b"&".join(query_string_pieces)
 
       return (
         302,
diff --git a/tests/wpt/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-same-origin-bc-containers.https.html b/tests/wpt/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-same-origin-bc-containers.https.html
deleted file mode 100644
index e6675428b64..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/allowpayment/allowpaymentrequest-attribute-same-origin-bc-containers.https.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<title>PaymentRequest allowpaymentrequest attribute same origin browsing context containers</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-const expectSuccess = {'iframe': true, 'frame': true, 'object': true, 'embed': true};
-const setAllowPayment = true;
-const testCrossOrigin = false;
-</script>
-<script src=common.sub.js></script>
diff --git a/tests/wpt/web-platform-tests/payment-request/allowpayment/basic.https.html b/tests/wpt/web-platform-tests/payment-request/allowpayment/basic.https.html
deleted file mode 100644
index af2c8e16b4a..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/allowpayment/basic.https.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<title>PaymentRequest &lt;iframe allowpaymentrequest> basic</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<iframe id="iframe" allow="payment"></iframe>
-<script>
-async_test((t) => {
-  const paymentArgs = [[{supportedMethods: 'foo'}], {total: {label: 'label', amount: {currency: 'USD', value: '5.00'}}}];
-
-  onload = t.step_func_done(() => {
-    new window[0].PaymentRequest(...paymentArgs);
-  });
-});
-</script>
diff --git a/tests/wpt/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest-timing.https.sub.html b/tests/wpt/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest-timing.https.sub.html
deleted file mode 100644
index f9962e4ffa4..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/allowpayment/setting-allowpaymentrequest-timing.https.sub.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-<title>PaymentRequest setting allow="payment" after document creation, before response</title>
-<meta name="timeout" content="long">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id="log"></div>
-<script>
-// Set allow="payment" attribute in a timeout after <iframe> has been inserted to the document.
-// The iframe's response is delayed so it happens after the attribute is set.
-// The allow="payment" permission is *not* set when the browsing context is created
-// (when the <iframe> is inserted), because there's no attribute at that time,
-// and the flag stays as not set when the attribute is added because per spec
-// the flag is only set when a browsing context is created and when it's navigated.
-
-async_test((t) => {
-  const iframe = document.createElement('iframe');
-  // no allow="payment" attribute
-
-  const path = location.pathname.substring(0, location.pathname.lastIndexOf('/') + 1);
-  iframe.src = "https://{{domains[www1]}}:{{ports[https][0]}}" + path + "echo-PaymentRequest.html?pipe=trickle(d3)";
-  iframe.onload = t.step_func(() => {
-    iframe.contentWindow.postMessage('What is the result of new PaymentRequest(...)?', '*');
-  });
-
-  window.onmessage = t.step_func((e) => {
-    // Ignore messages that are not part of the test.
-    if (e.source != iframe.contentWindow) return;
-
-    assert_equals(e.data.message, 'Exception');
-    assert_equals(4, e.data.details.length);
-    // The last entry is the error stacktrace. Ignore it in comparison.
-    assert_array_equals(e.data.details.slice(0, 3), [true /* ex instanceof DOMException */, DOMException.SECURITY_ERR, 'SecurityError']);
-    t.done();
-  });
-
-  document.body.appendChild(iframe);
-
-  setTimeout(() => {
-    iframe.allow = "payment";
-  }, 10);
-});
-</script>
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html b/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
index d5e04a83d0d..fed6eaf6d9f 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-is-showing.https.html
@@ -41,7 +41,7 @@
      */
     async function attachIframe(src = "blank.html") {
       const iframe = document.createElement("iframe");
-      iframe.allowPaymentRequest = true;
+      iframe.allow = "payment";
       iframe.src = src;
       document.body.appendChild(iframe);
       await new Promise(resolve => {
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html b/tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html
index 28bb53313dc..6f2e9e95d41 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-response/rejects_if_not_active-manual.https.html
@@ -56,7 +56,7 @@ function methodNotFullyActive(button, method, ...args) {
   const text = button.textContent.trim();
   promise_test(async t => {
     const iframe = document.createElement("iframe");
-    iframe.allowPaymentRequest = true;
+    iframe.allow = "payment";
     document.body.appendChild(iframe);
 
     // We first got to page1.html, grab a PaymentResponse instance.
@@ -87,7 +87,7 @@ function methodBecomesNotFullyActive(button, methodName, ...args) {
   const text = button.textContent.trim();
   promise_test(async t => {
     const iframe = document.createElement("iframe");
-    iframe.allowPaymentRequest = true;
+    iframe.allow = "payment";
     document.body.appendChild(iframe);
 
     // We first got to page1.html, grab a PaymentResponse instance.
diff --git a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
index 8e214cb6094..bab6a8c54c6 100644
--- a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
@@ -54,7 +54,7 @@ function getLoadedPaymentRequest(iframe, url) {
 function testAbortShowIfDocumentIsNotActive() {
   promise_test(async t => {
     const iframe = document.createElement("iframe");
-    iframe.allowPaymentRequest = true;
+    iframe.allow = "payment";
     document.body.appendChild(iframe);
     // We first got to page1.html, grab a PaymentRequest instance.
     const request1 = await getLoadedPaymentRequest(
@@ -96,7 +96,7 @@ function testAbortShowIfDocumentIsNotFullyActive() {
   promise_test(async t => {
     // We nest two iframes and wait for them to load.
     const outerIframe = document.createElement("iframe");
-    outerIframe.allowPaymentRequest = true;
+    outerIframe.allow = "payment";
     document.body.appendChild(outerIframe);
     // Load the outer iframe (we don't care about the awaited request)
     await getLoadedPaymentRequest(
@@ -106,7 +106,7 @@ function testAbortShowIfDocumentIsNotFullyActive() {
 
     // Now we create the inner iframe
     const innerIframe = outerIframe.contentDocument.createElement("iframe");
-    innerIframe.allowPaymentRequest = true;
+    innerIframe.allow = "payment";
 
     // nest them
     outerIframe.contentDocument.body.appendChild(innerIframe);
diff --git a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html
index 1c666aea435..89c3407e3d0 100644
--- a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active.https.html
@@ -51,7 +51,7 @@ function getLoadedPaymentRequest(iframe, url) {
 
 promise_test(async t => {
   const iframe = document.createElement("iframe");
-  iframe.allowPaymentRequest = true;
+  iframe.allow = "payment";
   document.body.appendChild(iframe);
   // Make a request in the iframe.
   const request = await getLoadedPaymentRequest(
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
index b9172dddb4c..f24661aadb8 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
@@ -38,8 +38,9 @@
                     detected_pointertypes[event.pointerType] = true;
                     target0.setPointerCapture(event.pointerId);
                     // After we receive a pointerover event, dispatch a pointer move to move out of target0.
+                    // https://github.com/w3c/webdriver/issues/1545
                     actions_promise.then(function() {
-                        return new test_driver.Actions().pointerMove(0, 0).send();
+                        return new test_driver.Actions().pointerMove(1, 1).send();
                     });
                 });
 
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html
new file mode 100644
index 00000000000..3cf713f9048
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-circle.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Test for checking position of the svg element when animateMotion's mpath is a circle</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <circle id="circle" cx="-100" r="100" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#circle"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, -200, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[0];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html
new file mode 100644
index 00000000000..104744c17f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-display-none.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Test for checking position of the svg element when animateMotion's mpath is display:none</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path id="path" d="M0,0 100,0" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#path"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 50, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 100, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[0];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html
new file mode 100644
index 00000000000..109ae4f5869
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-ellipse.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Test for checking position of the svg element when animateMotion's mpath is an ellipse</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <ellipse id="ellipse" cx="-100" rx="100" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#ellipse"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, -200, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+    assert_approx_equals(rootSVGElement.getBBox().y, 0, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[0];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html
new file mode 100644
index 00000000000..f304de62dcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-line.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Test for checking position of the svg element when animateMotion's mpath is a line</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <line id="line" x2="100" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#line"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 50, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 100, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[0];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html b/tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html
new file mode 100644
index 00000000000..8853b047c36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animateMotion-rect.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+<meta charset="utf-8">
+<title>Test for checking position of the svg element when animateMotion's mpath is a rect</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/SVGAnimationTestCase-testharness.js"></script>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <rect id="rect" width="100" height="100" display="none"/>
+  <rect width="50" height="50" x="0" y="0" fill="green">
+    <animateMotion id="anim" begin="0s" dur="4s" fill="freeze">
+      <mpath href="#rect"/>
+    </animateMotion>
+  </rect>
+</svg>
+
+<script>
+var rootSVGElement = document.querySelector("svg");
+var epsilon = 1.0;
+
+// Setup animation test
+function sample1() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+}
+
+function sample2() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 100, epsilon);
+}
+
+function sample3() {
+    assert_approx_equals(rootSVGElement.getBBox().x, 0, epsilon);
+}
+
+smil_async_test((t) => {
+    var rects = rootSVGElement.ownerDocument.getElementsByTagName("rect");
+    rect1 = rects[1];
+
+    const expectedValues = [
+        // [animationId, time, sampleCallback]
+        ["anim", 0.0,   sample1],
+        ["anim", 2.0,   sample2],
+        ["anim", 4.0,   sample3]
+    ];
+
+    runAnimationTest(t, expectedValues);
+});
+
+window.animationStartsImmediately = true;
+
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html b/tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html
new file mode 100644
index 00000000000..1e5d5af57cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/use-getComputedStyle.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<title>SVG Test: Resolved positioning inside use</title>
+<link rel="help" href="https://www.w3.org/TR/SVG2/struct.html#UseElement">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg>
+  <use id="use" x="1" y="2"/>
+</svg>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(use).x, "1px", "use element should have x computed to '1px'.");
+    assert_equals(getComputedStyle(use).y, "2px", "use element should have y computed to '2px'.");
+  }, "Test that we map use element positioning to style.");
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
index a4bd72a8c21..49a7d163385 100755
--- a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
+++ b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
@@ -18,8 +18,13 @@ def get_browser_args(product, channel):
         return ["--install-browser", "--install-webdriver"]
     if product == "servo":
         return ["--install-browser", "--processes=12"]
-    if product == "chrome" and channel == "nightly":
-        return ["--install-browser", "--install-webdriver"]
+    if product == "chrome":
+        # Taskcluster machines do not have proper GPUs, so we need to use
+        # software rendering for webgl: https://crbug.com/1130585
+        args = ["--binary-arg=--use-gl=swiftshader-webgl"]
+        if channel == "nightly":
+            args.extend(["--install-browser", "--install-webdriver"])
+        return args
     if product == "webkitgtk_minibrowser":
         return ["--install-browser"]
     return []
diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
index dba7237d88a..c7a906c82e5 100644
--- a/tests/wpt/web-platform-tests/url/resources/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
@@ -4618,7 +4618,7 @@
     "search": "",
     "hash": ""
   },
-  "# unknown scheme with non-URL characters in the path",
+  "# unknown scheme with non-URL characters",
   {
     "input": "wow:\uFFFF",
     "base": "about:blank",
@@ -4634,6 +4634,21 @@
     "search": "",
     "hash": ""
   },
+  {
+    "input": "http://example.com/\uD800\uD801\uDFFE\uDFFF\uFDD0\uFDCF\uFDEF\uFDF0\uFFFE\uFFFF?\uD800\uD801\uDFFE\uDFFF\uFDD0\uFDCF\uFDEF\uFDF0\uFFFE\uFFFF",
+    "base": "about:blank",
+    "href": "http://example.com/%EF%BF%BD%F0%90%9F%BE%EF%BF%BD%EF%B7%90%EF%B7%8F%EF%B7%AF%EF%B7%B0%EF%BF%BE%EF%BF%BF?%EF%BF%BD%F0%90%9F%BE%EF%BF%BD%EF%B7%90%EF%B7%8F%EF%B7%AF%EF%B7%B0%EF%BF%BE%EF%BF%BF",
+    "origin": "http://example.com",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "example.com",
+    "hostname": "example.com",
+    "port": "",
+    "pathname": "/%EF%BF%BD%F0%90%9F%BE%EF%BF%BD%EF%B7%90%EF%B7%8F%EF%B7%AF%EF%B7%B0%EF%BF%BE%EF%BF%BF",
+    "search": "?%EF%BF%BD%F0%90%9F%BE%EF%BF%BD%EF%B7%90%EF%B7%8F%EF%B7%AF%EF%B7%B0%EF%BF%BE%EF%BF%BF",
+    "hash": ""
+  },
   "Forbidden host code points",
   {
     "input": "http://a<b",
@@ -5245,6 +5260,34 @@
     "search": "",
     "hash": ""
   },
+  {
+    "input": "/",
+    "base": "file://h/C:/a/b",
+    "href": "file://h/C:/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "h",
+    "hostname": "h",
+    "port": "",
+    "pathname": "/C:/",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/",
+    "base": "file://h/a/b",
+    "href": "file://h/",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "h",
+    "hostname": "h",
+    "port": "",
+    "pathname": "/",
+    "search": "",
+    "hash": ""
+  },
   {
     "input": "//d:",
     "base": "file:///C:/a/b",
@@ -5640,6 +5683,20 @@
     "search": "",
     "hash": ""
   },
+  {
+    "input": "C|",
+    "base": "file://host/D:/dir1/dir2/file",
+    "href": "file://host/C:",
+    "protocol": "file:",
+    "username": "",
+    "password": "",
+    "host": "host",
+    "hostname": "host",
+    "port": "",
+    "pathname": "/C:",
+    "search": "",
+    "hash": ""
+  },
   {
     "input": "C|#",
     "base": "file://host/dir/file",
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py
new file mode 100644
index 00000000000..b52f27429c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/shadow_dom.py
@@ -0,0 +1,100 @@
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+import pytest
+
+
+def element_click(session, element):
+    return session.transport.send(
+        "POST", "session/{session_id}/element/{element_id}/click".format(
+            session_id=session.session_id,
+            element_id=element.id))
+
+
+def get_checkbox_dom():
+    return inline("""
+        <style>
+            custom-checkbox-element {
+                display:block; width:20px; height:20px;
+            }
+        </style>
+        <custom-checkbox-element></custom-checkbox-element>
+        <script>
+            customElements.define('custom-checkbox-element',
+                class extends HTMLElement {
+                    constructor() {
+                            super();
+                            this.attachShadow({mode: 'open'}).innerHTML = `
+                                <div><input type="checkbox"/></div>
+                            `;
+                        }
+                });
+        </script>""")
+
+
+@pytest.mark.parametrize("click_on", ["custom_element", "checkbox_element"])
+def test_shadow_element_click(session, click_on):
+    session.url = get_checkbox_dom()
+    custom_element = session.find.css("custom-checkbox-element", all=False)
+    checkbox_element = session.execute_script("return arguments[0].shadowRoot.querySelector('input')",
+                                              args=(custom_element,))
+    is_pre_checked = session.execute_script("return arguments[0].checked",
+                                            args=(checkbox_element,))
+    assert is_pre_checked == False
+    response = element_click(session, locals()[click_on])
+    assert_success(response)
+    is_post_checked = session.execute_script("return arguments[0].checked",
+                                             args=(checkbox_element,))
+    assert is_post_checked == True
+
+
+def get_nested_shadow_checkbox_dom():
+    return inline("""
+        <style>
+            custom-nesting-element {
+                display:block; width:20px; height:20px;
+            }
+        </style>
+        <custom-nesting-element></custom-nesting-element>
+        <script>
+         customElements.define('custom-nesting-element',
+                class extends HTMLElement {
+                    constructor() {
+                            super();
+                            this.attachShadow({mode: 'open'}).innerHTML = `
+                                <style>
+                                    custom-checkbox-element {
+                                        display:block; width:20px; height:20px;
+                                    }
+                                </style>
+                                <div><custom-checkbox-element></custom-checkbox-element></div>
+                            `;
+                        }
+                });
+            customElements.define('custom-checkbox-element',
+                class extends HTMLElement {
+                    constructor() {
+                            super();
+                            this.attachShadow({mode: 'open'}).innerHTML = `
+                                <div><input type="checkbox"/></div>
+                            `;
+                        }
+                });
+        </script>""")
+
+
+@pytest.mark.parametrize("click_on", ["outer_element", "inner_element", "checkbox_element"])
+def test_nested_shadow_element_click(session, click_on):
+    session.url = get_nested_shadow_checkbox_dom()
+    outer_element = session.find.css("custom-nesting-element", all=False)
+    inner_element = session.execute_script("return arguments[0].shadowRoot.querySelector('custom-checkbox-element')",
+                                           args=(outer_element,))
+    checkbox_element = session.execute_script("return arguments[0].shadowRoot.querySelector('input')",
+                                              args=(inner_element,))
+    is_pre_checked = session.execute_script("return arguments[0].checked",
+                                            args=(checkbox_element,))
+    assert is_pre_checked == False
+    click_response = element_click(session, locals()[click_on])
+    assert_success(click_response)
+    is_post_checked = session.execute_script("return arguments[0].checked",
+                                             args=(checkbox_element,))
+    assert is_post_checked == True