diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-010.xht.ini
new file mode 100644
index 00000000000..7b08cbb6147
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-010.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-010.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-013.xht.ini
new file mode 100644
index 00000000000..651a5fef183
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-013.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-013.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-014.xht.ini
new file mode 100644
index 00000000000..c15897ef64e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-014.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-091.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-091.xht.ini
new file mode 100644
index 00000000000..5489ae1203b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-091.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-091.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-092.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-092.xht.ini
new file mode 100644
index 00000000000..a1810df685a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-092.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-092.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
new file mode 100644
index 00000000000..f07c0d17188
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-100.xht.ini
@@ -0,0 +1,2 @@
+[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
new file mode 100644
index 00000000000..07229cdbe24
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-101.xht.ini
@@ -0,0 +1,2 @@
+[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
new file mode 100644
index 00000000000..4b4ff6dd519
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-102.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-102.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-103.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-103.xht.ini
new file mode 100644
index 00000000000..1dfe923d371
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-103.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-103.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-104.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-104.xht.ini
new file mode 100644
index 00000000000..7c7575b3fe3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-104.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-104.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-112.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-112.xht.ini
new file mode 100644
index 00000000000..ce813806a01
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-112.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-112.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-002.xht.ini
new file mode 100644
index 00000000000..ec58e4a7c66
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-002.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-003.xht.ini
new file mode 100644
index 00000000000..e5e48e9d9ee
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-003.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-005.xht.ini
new file mode 100644
index 00000000000..b358a50b13a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-005.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-006.xht.ini
new file mode 100644
index 00000000000..6e0f4b3ad9d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-006.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-007.xht.ini
new file mode 100644
index 00000000000..09cc1600247
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-007.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-007.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-008.xht.ini
new file mode 100644
index 00000000000..782cb9afa75
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-008.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-008.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-009.xht.ini
new file mode 100644
index 00000000000..d88c3d50c96
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-009.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-009.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-010.xht.ini
new file mode 100644
index 00000000000..c3ac79813a2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-010.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-010.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-011.xht.ini
new file mode 100644
index 00000000000..38df823dbb6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-011.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-011.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-014.xht.ini
new file mode 100644
index 00000000000..cbc5da1e9ab
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-014.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-014.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-015.xht.ini
new file mode 100644
index 00000000000..2dcd790e658
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-applies-to-015.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-applies-to-015.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-inherited-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-inherited-001.xht.ini
new file mode 100644
index 00000000000..5ca0c554e67
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-indent-inherited-001.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-inherited-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-001.xht.ini
new file mode 100644
index 00000000000..20ec776608e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-001.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-002.xht.ini
new file mode 100644
index 00000000000..bb44e572dd2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-002.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-002.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-003.xht.ini
new file mode 100644
index 00000000000..1ce490b95db
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-005.xht.ini
new file mode 100644
index 00000000000..71ddce03d1e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-005.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-applies-to-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-applies-to-003.xht.ini
new file mode 100644
index 00000000000..167ecd4537a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/text/text-transform-applies-to-003.xht.ini
@@ -0,0 +1,2 @@
+[text-transform-applies-to-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
new file mode 100644
index 00000000000..283a5d6fbca
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
@@ -0,0 +1,13 @@
+[MediaQueryList-extends-EventTarget.html]
+  [onchange removes listener]
+    expected: FAIL
+
+  [onchange adds listener]
+    expected: FAIL
+
+  [listeners for "change" type are called]
+    expected: FAIL
+
+  [addEventListener "once" option is respected]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index 23c61ede1a1..c131078eace 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,6 +17,3 @@
   [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 6ef8bb1049f..171592fc08f 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,6 +2,3 @@
   [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
new file mode 100644
index 00000000000..239c35135e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
@@ -0,0 +1,7 @@
+[offsetTopLeft-border-box.html]
+  [container: 1]
+    expected: FAIL
+
+  [container: 0]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/selectors/is-where-shadow.html.ini b/tests/wpt/metadata-layout-2020/css/selectors/is-where-shadow.html.ini
new file mode 100644
index 00000000000..c40b2d623ae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/selectors/is-where-shadow.html.ini
@@ -0,0 +1,2 @@
+[is-where-shadow.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
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 66b6aaac96c..2020f9c6aec 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,21 +315,18 @@
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     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 */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    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
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 258fe374697..8d0261f22a0 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
+  [separate text/javascript; charset=windows-1252 text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2a63e3b7f..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f45aaafe1c5..3538891dae8 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,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -9,7 +10,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [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_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 1b74d6e073d..d913fcbb129 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,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 7a36937927c..f4f994c5d6f 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/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
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[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 b1aa0f1f1c4..23fb39e544c 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,13 +1,14 @@
 [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: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
index 58c9d7f8c0c..57744023f73 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
@@ -1,5 +1,5 @@
 [ignore-opens-during-unload.window.html]
-  expected: TIMEOUT
+  expected: CRASH
   [document.open should bail out when ignore-opens-during-unload is greater than 0 during visibilitychange event (open(parent) while unloading parent and child)]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini b/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
new file mode 100644
index 00000000000..0e57356683e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/render_state_update.https.html.ini
@@ -0,0 +1,2 @@
+[render_state_update.https.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index c01f4a55c3d..0bf3725b1ce 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -452,6 +452,15 @@
        {}
       ]
      ],
+     "hyphens": {
+      "hyphens-auto-and-contenteditable-crash.html": [
+       "e0148ddd73f813c4512b964479f4f1f715b46ce4",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "overflow-wrap": {
       "overflow-wrap-break-word-long-crash.html": [
        "e318386ded5bd3d1d61cf876fe420c8f5ada799f",
@@ -108449,7 +108458,7 @@
        ]
       ],
       "text-align-bidi-011.xht": [
-       "4f9576eb888c393769eff97d9e344270860fa6d7",
+       "32d8e819633c4392a03653387ea799d8cf27845c",
        [
         null,
         [
@@ -108475,7 +108484,7 @@
        ]
       ],
       "text-align-white-space-002.xht": [
-       "394e27f6f1646ea767c8016b98d268d5e714962e",
+       "4b2ce08ffc3d13a51862c35fc603d51cbb2456e3",
        [
         null,
         [
@@ -108501,7 +108510,7 @@
        ]
       ],
       "text-align-white-space-004.xht": [
-       "496501665e56ca0dde59d5d70098d028ae38dba5",
+       "4d8f6b6f2646cda6d47eff7511f740944951369f",
        [
         null,
         [
@@ -108527,7 +108536,7 @@
        ]
       ],
       "text-align-white-space-006.xht": [
-       "2f99d4ed7134fca006d7ac265ccb9a971f2aa7d9",
+       "0171dc8645f3acbb4624b244b9f5a59ef2e9efd6",
        [
         null,
         [
@@ -108553,7 +108562,7 @@
        ]
       ],
       "text-align-white-space-008.xht": [
-       "cd26900f06f89a2485fd878f7ad597c6e7cdcd9c",
+       "410b551580f61c449d05d5de23bec1c5136f9868",
        [
         null,
         [
@@ -108747,8 +108756,47 @@
         {}
        ]
       ],
+      "text-indent-004.xht": [
+       "b8195eff78080860335f7669cfb6bf3ef091f3c6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-005.xht": [
+       "791f62268b0802d74eb4abb1fb5f6fdfac4ae68b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-006.xht": [
+       "da3a2478b2a616c38d1ae6c890936e4b654744b0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-007.xht": [
-       "98654cbe017171848bd78b1e1e6759b76481adb4",
+       "c957a782e9bfffa0a38d892137329d7ba0089cc2",
        [
         null,
         [
@@ -108761,7 +108809,7 @@
        ]
       ],
       "text-indent-008.xht": [
-       "bdcf3da5a122e5f7fc77b853eb7a44230a053d99",
+       "cf6e1aadb9fd30ce955bf221c22bca36b78312e3",
        [
         null,
         [
@@ -108773,8 +108821,34 @@
         {}
        ]
       ],
+      "text-indent-010.xht": [
+       "ace9a11aaf1c56ff3e2e7fb98dd91d6d6def6bb3",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-010-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-011.xht": [
+       "3ddd12dc9c0960c2e7253a2a4c09a29ff9e8c824",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-011-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-012.xht": [
-       "be5edaadb82fcba861e2f91a43297a9cd377e198",
+       "3ae96bbb350fc4b275945abae083fb1e2a721079",
        [
         null,
         [
@@ -108786,8 +108860,60 @@
         {}
        ]
       ],
+      "text-indent-013.xht": [
+       "60f77d3cbc1d89bece7748d20d864fd9432e954d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-013-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-014.xht": [
+       "910ee2b0a96047eda12b63c01f50df346b5d1617",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-014-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-017.xht": [
+       "1a68e9f75f80f5625f23468bacb2b7034f7b371d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-018.xht": [
+       "c7dfd95d088d68e9c96f27512e3eaa1cd4623bb5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-019.xht": [
-       "8052aed629f5d32e2ed79faefc08fc1bcfe64cf3",
+       "010209b44ac6feaa340f940409be456429e85099",
        [
         null,
         [
@@ -108800,7 +108926,7 @@
        ]
       ],
       "text-indent-020.xht": [
-       "33fa5b2abdec604a1a7b223a3a4dbf552e5ac2b1",
+       "02b5f639bd08b418a3bdbc735e1cf6bdb98fadfb",
        [
         null,
         [
@@ -108812,8 +108938,47 @@
         {}
        ]
       ],
+      "text-indent-028.xht": [
+       "ae39829362de8c7c9d57121e71ffe7c5a80ac3ed",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-029.xht": [
+       "f22d4d4cc0949b15d16d4a85023270cc5589f159",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-030.xht": [
+       "dda2788c47787d17177cd3ca872299627d7eb97f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-031.xht": [
-       "4cd0a97182251439ba42a4b8adaba052708d40b1",
+       "174be5d97c7e5f842bb0038ffe5a315bdf019038",
        [
         null,
         [
@@ -108826,7 +108991,7 @@
        ]
       ],
       "text-indent-032.xht": [
-       "479f4b133aac0e601babd18e7a60ca093a5cf5a5",
+       "72353096575246dfbcdfa075e05530fc9cb2eee8",
        [
         null,
         [
@@ -108838,8 +109003,47 @@
         {}
        ]
       ],
+      "text-indent-040.xht": [
+       "0a7f2744cc8ea44ac659176430c9ea7a861c8973",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-041.xht": [
+       "4e6525ebcd31a43360feacfb7f6c1b95e6afa210",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-042.xht": [
+       "658496625f04895c918d47ff882b721d7ef33397",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-043.xht": [
-       "23fb78ca4572ef6ccb0cce00e37babfabed4fd85",
+       "9013b5cf6c8afb509eddce167a8d5d70f76e1466",
        [
         null,
         [
@@ -108852,7 +109056,7 @@
        ]
       ],
       "text-indent-044.xht": [
-       "5e14433b2db1a836d3da9acb81db254a0a242acd",
+       "bc2d4054482bd2667c232b089b532e5a109762fb",
        [
         null,
         [
@@ -108864,8 +109068,47 @@
         {}
        ]
       ],
+      "text-indent-052.xht": [
+       "0b2448abb03b74a3f94612ba0510526255fcc132",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-053.xht": [
+       "0acaf20f6e990b42b36f7af54e01f7fa89a14f6f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-054.xht": [
+       "c2e1c35445ac502ceeaeb465420c2bd167220f45",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-055.xht": [
-       "cc1fd09b14d74296872eceffa53913ef78e31581",
+       "485f9893d7aad1562ba2a248c6a2fdeeef9827c0",
        [
         null,
         [
@@ -108878,7 +109121,7 @@
        ]
       ],
       "text-indent-056.xht": [
-       "1efd057bac6433f66759491ffd1657b4478dbcc9",
+       "6b35739ca0d5bb8365c35060cea958054da0688b",
        [
         null,
         [
@@ -108890,8 +109133,47 @@
         {}
        ]
       ],
+      "text-indent-064.xht": [
+       "a0ec365f01a43580615433811620a37c3ee56dda",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-065.xht": [
+       "5e135c3dedae71a0c6981d068fa7a5ac1b6b0bef",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-066.xht": [
+       "dad89538ef02dc998a02f5e6b3e4188fbdba9761",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-067.xht": [
-       "51bcca28196d1405cb00b1a07a9b470ce7bb3d11",
+       "442c2bffaf8ac9c9260068b5208d423e1b1d85b4",
        [
         null,
         [
@@ -108904,7 +109186,7 @@
        ]
       ],
       "text-indent-068.xht": [
-       "20633bd1921a058b5de2dce6ce8624a3e50fd635",
+       "7831845305b7de7371fc5073170032f42063e8ac",
        [
         null,
         [
@@ -108916,8 +109198,47 @@
         {}
        ]
       ],
+      "text-indent-076.xht": [
+       "e066b6eac4821694dbb9f5b0f5aa0ad3727f701d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-077.xht": [
+       "ff0f8a78adbfd0993b19f01e7d2f792a151b1922",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-078.xht": [
+       "162f1e709962b28fcfe73642c2b887df7f33ec83",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-079.xht": [
-       "f81bfe8421b1f2cf7a3a5c5366c9bbf097c1221a",
+       "cbd6b76210a6cf0d67f267bad4872f7cc9a74816",
        [
         null,
         [
@@ -108930,7 +109251,189 @@
        ]
       ],
       "text-indent-080.xht": [
-       "69b8e9262e9ac59f1b663e2a3a7dd77e199716eb",
+       "5ebef879708a771834509bfc4763a67d6f6e00df",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/reference/pass_if_box_ahem.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-088.xht": [
+       "069cd99f457de461024c89d668b8e9f8d25b0f43",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-089.xht": [
+       "c3c632b2759791996ab81382e8fb9e58f88d92f3",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-090.xht": [
+       "7352c9313f7b2d2a1c44115486eb83be0cd1210e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-091.xht": [
+       "cac90dd7087bbb316f669be95f7b2aef523fc007",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-091-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-092.xht": [
+       "2e3d04f4d508de7c523ae9f66640a41b81f2e893",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-091-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-100.xht": [
+       "7c498d2b5f9da57f9ad77bcb65405fce2bebe7b2",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-101.xht": [
+       "5007ff643d87a8db5473752730a08c327ccc160e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-102.xht": [
+       "b187c79f524b755a7f7ae7491832df90f863fb36",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-103.xht": [
+       "66b93897c07534168f8da4fd575e3d2e1a59a1aa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-103-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-104.xht": [
+       "10938498ecd3c2530e9251dc09b32677a17e0ebc",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-103-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-109.xht": [
+       "02d2b83f8dd4975c8a2df8c4c4888f81af9017e1",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-110.xht": [
+       "4592207f7b39f036a4553bf4f22508bcdd70949b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-111.xht": [
+       "e887d34afcb9d6132794ad400aa6d07ba433631e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-112.xht": [
+       "4babc6dc796885e2c89f900dfda3f7797cb47889",
        [
         null,
         [
@@ -108956,7 +109459,7 @@
        ]
       ],
       "text-indent-113.xht": [
-       "459ffc7f6f722850ad1eb2a173c861a2c62a69fa",
+       "e4d14f7c0717cf9acafdc261f278d2060b5a7f17",
        [
         null,
         [
@@ -108982,7 +109485,7 @@
        ]
       ],
       "text-indent-114.xht": [
-       "ec598d17ffd2f9237c12a31c3c382a1bb8ac079c",
+       "06e60676a93dbf67d720580b5f6cff8b9e5412ec",
        [
         null,
         [
@@ -109021,7 +109524,7 @@
        ]
       ],
       "text-indent-115.xht": [
-       "881eb77a859a7038757a21523e0ec3f70b8ae194",
+       "bfe55ae13b3e1271d39ed7ba58a6a760d822a433",
        [
         null,
         [
@@ -109033,8 +109536,203 @@
         {}
        ]
       ],
+      "text-indent-applies-to-001.xht": [
+       "df859edb04d3ca42ea722a97304aada925f3177b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-002.xht": [
+       "04e97ccddd6aa58a41928f05a76e2a2dd1e00aa8",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-003.xht": [
+       "d913cfa433e7ceb51c0087f4b80aca84d53a5986",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-005.xht": [
+       "3016e795f55ab0ab3dc29d26db7125c66e51cefa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-006.xht": [
+       "4dbb6e02fd74f3875d906a4785282fe3c79d7c1e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-007.xht": [
+       "cbbb41290a60c46a53239dce83cf3b6dcd355ca4",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-007-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-008.xht": [
+       "c55d6a21369d91af13e421d11215bc575082930b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-009.xht": [
+       "bc561f2ab1a088041c58cb5cc70901a7f9fb2ff7",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-010.xht": [
+       "1c4ee225ff127e766166a5eb2b2927a3c3b320a9",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-011.xht": [
+       "2e888c99d80d3cfb22fcba94ae4f7e841cc906d9",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-012.xht": [
+       "491023c57223dfb774e32ab1d357fe034df12981",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-012-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-013.xht": [
+       "71b98469de4670a49cc5c48dc2fb093914b5bc5f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-012-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-014.xht": [
+       "70b372f6c59e0095e7a3b3a74d2688fd5f9c1cee",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-applies-to-015.xht": [
+       "aaf45bd4efe69cd20eaa294146ecc293152c1ded",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-applies-to-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-inherited-001.xht": [
+       "352080f04bd3371ba23c38f16d241e506304b94f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-inherited-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-intrinsic-001.xht": [
-       "426d28a5c4de71d551b4a7f1a03f1e71b3ffc24d",
+       "841f8ffd8de21305d84420c08003f18990ae5302",
        [
         null,
         [
@@ -109047,7 +109745,7 @@
        ]
       ],
       "text-indent-intrinsic-002.xht": [
-       "4fdc7ba8e50af4a6d054afb0ddd5b71d63645a68",
+       "b42b60030615b48980a650da24b673012a9c2603",
        [
         null,
         [
@@ -109060,7 +109758,7 @@
        ]
       ],
       "text-indent-intrinsic-003.xht": [
-       "3ef24a6f3575b0186fcdc5260a65e697c9432ca5",
+       "e67bc7f73c7a2dd8374b0f6cf5f050f6a680c42e",
        [
         null,
         [
@@ -109073,7 +109771,7 @@
        ]
       ],
       "text-indent-intrinsic-004.xht": [
-       "17e405745d7ea2edfc950c16faa2656b4f805512",
+       "172025120f578b9decc1182ce98978422ea87e86",
        [
         null,
         [
@@ -109086,7 +109784,7 @@
        ]
       ],
       "text-indent-on-blank-line-rtl-left-align.html": [
-       "232065c52b744298ec441e0502f70287e4b13bb2",
+       "af7e1cc0145cef0e7e98218bbaaf8280a8a4ed7a",
        [
         null,
         [
@@ -109099,7 +109797,7 @@
        ]
       ],
       "text-indent-overflow-001.xht": [
-       "4e77ac7e31b448477bc26ece1195a5d15847ccae",
+       "c4e7a5279247c03ee7032808b48c94f66c9601bc",
        [
         null,
         [
@@ -109112,7 +109810,7 @@
        ]
       ],
       "text-indent-overflow-004.xht": [
-       "3dc30944981dde666b0f9378a56359823bfac3f4",
+       "e53728af700b52cb42671edd8ed0401d69e60aea",
        [
         null,
         [
@@ -109125,7 +109823,7 @@
        ]
       ],
       "text-indent-percent-001.xht": [
-       "98fce2f9eb7cde6d13315d7cded5d5b2b32405be",
+       "a3430eaef5f88c41f4594f48e9da19887be8812b",
        [
         null,
         [
@@ -109137,6 +109835,32 @@
         {}
        ]
       ],
+      "text-indent-rtl-001.xht": [
+       "dfc9193bfdb22a2b9986e4f2db736dc4d393eb79",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-rtl-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-indent-rtl-002.xht": [
+       "f8b72b3fd1c4c846ee16c0a51c839b452961d71c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-indent-rtl-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-indent-wrap-001-notref-block-margin.xht": [
        "fdae290bc6f14ef01605e57a10ed25d3874d7ee3",
        [
@@ -109177,7 +109901,7 @@
        ]
       ],
       "text-indent-wrap-001.xht": [
-       "31c226631ae847f6898126ff65fb6cb47a08e0a6",
+       "2bfee883848e80a885b93396f3d63b1d38f1937f",
        [
         null,
         [
@@ -109189,8 +109913,73 @@
         {}
        ]
       ],
+      "text-transform-001.xht": [
+       "c847e4d413137f795c73df3f1fd55a3ebb13c5cb",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-002.xht": [
+       "dcde372b1377d493fea9b550bd2c3f1506fb40f0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-002-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-003.xht": [
+       "775a552e3b7b58cc2f8f9caa05d1cb84fcdcdda0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-004.xht": [
+       "d24d7f24257c2e70181f850ea749fde0d08e01b1",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-004-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-transform-005.xht": [
+       "9a2734f9a8897abbd957302b8e63271101f023b0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-transform-applies-to-001.xht": [
-       "a55fddb0c2dcc14c8211dd2c8bdd899553f4fe43",
+       "180c41c58e83e13957c25fc545ce5e0539c0c21a",
        [
         null,
         [
@@ -109203,7 +109992,7 @@
        ]
       ],
       "text-transform-applies-to-002.xht": [
-       "a44f297a3d9d90d0b6a84d8cc48246081ec06b0a",
+       "48b9052a8dc14be4fc00185c5abfa63461e1e8d4",
        [
         null,
         [
@@ -109215,8 +110004,21 @@
         {}
        ]
       ],
+      "text-transform-applies-to-003.xht": [
+       "39165172b2dfdb36171855daa4e46149c2a50ee4",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/text/text-transform-applies-to-003-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-transform-applies-to-005.xht": [
-       "af28c5cffb5affa1349f980d27ed26cce917259e",
+       "e47f05bf02ed21c4f236fadac523d585440de7b0",
        [
         null,
         [
@@ -109229,7 +110031,7 @@
        ]
       ],
       "text-transform-applies-to-006.xht": [
-       "3c2a2bb1703dd7233f32bad840ebfea321db33a6",
+       "5a8677c383d6270c0d3f83516b583f718a43677f",
        [
         null,
         [
@@ -109242,7 +110044,7 @@
        ]
       ],
       "text-transform-applies-to-007.xht": [
-       "cef475e44ca9c9be4f14435df2ef325ad2bc7331",
+       "42632b1e213c8f35963a741c654ded5b644e30cb",
        [
         null,
         [
@@ -109255,7 +110057,7 @@
        ]
       ],
       "text-transform-applies-to-008.xht": [
-       "f8c32f6fc2ac34637d18affa86c8684db1393d64",
+       "75305aec54de9a1abbdecdcf569537190e281538",
        [
         null,
         [
@@ -109268,7 +110070,7 @@
        ]
       ],
       "text-transform-applies-to-009.xht": [
-       "731e945863aeb10efe725625bb679b292eaa2a37",
+       "7f66884ea889261919a8a3a9b4029f102e8d8995",
        [
         null,
         [
@@ -109281,7 +110083,7 @@
        ]
       ],
       "text-transform-applies-to-010.xht": [
-       "82cd1c19e9f898683cdcca31529edfa8c12d050e",
+       "6836ccbd4f076925d72e0673ebaa491ee17745f7",
        [
         null,
         [
@@ -109294,7 +110096,7 @@
        ]
       ],
       "text-transform-applies-to-011.xht": [
-       "cf2d13f814e0f3d78b651fc2fd2d7d74639b58f2",
+       "3a7af008072e149b85b810f84db460940540c296",
        [
         null,
         [
@@ -109307,7 +110109,7 @@
        ]
       ],
       "text-transform-applies-to-012.xht": [
-       "c9ab831120db510c7f6257856420d8ed31a72aaf",
+       "50807e10d060d9b1dccd2b7161b650186d241059",
        [
         null,
         [
@@ -109320,7 +110122,7 @@
        ]
       ],
       "text-transform-applies-to-013.xht": [
-       "ad593d799e1b4b8a30149a10b340cc145d10c54f",
+       "93168fc98d0df8771640ea417c1e972c461ffb94",
        [
         null,
         [
@@ -109333,7 +110135,7 @@
        ]
       ],
       "text-transform-applies-to-014.xht": [
-       "4acd6eaa9a21072768f5cb1442dc54a3165ebb0b",
+       "f080f25148e2a5743246fa6f418a6ffe110493b0",
        [
         null,
         [
@@ -109346,7 +110148,7 @@
        ]
       ],
       "text-transform-applies-to-015.xht": [
-       "764ef683ac9dd5c8d2400679b3b8e8bb4c4cbdb7",
+       "ffc9cee4d461fd47726a405fe46f311e308c6a77",
        [
         null,
         [
@@ -291148,10 +291950,62 @@
        "6b44915705366ccf698fb854a4c700a3e732ddac",
        []
       ],
+      "text-indent-004-ref.xht": [
+       "8a2a55f87f7430667b34139b7d873aa738f29916",
+       []
+      ],
+      "text-indent-010-ref.xht": [
+       "6827888edebefdafc0b729f5bce572c58b5c864d",
+       []
+      ],
+      "text-indent-011-ref.xht": [
+       "e4951ae39974181c2e62b7680c1f727c9b23f1d4",
+       []
+      ],
       "text-indent-012-ref.xht": [
        "9162d8abab2768bda21ad42cd8daa92a68d56dfc",
        []
       ],
+      "text-indent-013-ref.xht": [
+       "883cd6578586a48bd0ccb2036caa3c04bd2d31f0",
+       []
+      ],
+      "text-indent-014-ref.xht": [
+       "d06337d34abfa52d9879ccd238beddab2e9459ef",
+       []
+      ],
+      "text-indent-091-ref.xht": [
+       "5b087a93b6b8ae4edf6aa3005e84e9957c94da33",
+       []
+      ],
+      "text-indent-103-ref.xht": [
+       "a2fa38c9532cb667c9e9f8aca0df0e89e0815591",
+       []
+      ],
+      "text-indent-applies-to-001-ref.xht": [
+       "e4776c085c9b0b98357c36bcf509e211b107653f",
+       []
+      ],
+      "text-indent-applies-to-002-ref.xht": [
+       "1aa29648dc5a3ec46c4bfea749e90330f15b1d8f",
+       []
+      ],
+      "text-indent-applies-to-003-ref.xht": [
+       "b708f014d74ec63f2b1d1eae815bf5a7871578c7",
+       []
+      ],
+      "text-indent-applies-to-007-ref.xht": [
+       "71c902b9a6ff28a54a5a6cb1b06b7060c08058f8",
+       []
+      ],
+      "text-indent-applies-to-012-ref.xht": [
+       "1932202bbba4066349ea328ad9ab82072ee3b3b0",
+       []
+      ],
+      "text-indent-inherited-001-ref.xht": [
+       "884001b5090d0b620aa2eccd30045a4007962431",
+       []
+      ],
       "text-indent-intrinsic-001-ref.xht": [
        "ef3f6ed278a8e7ad5bf7b96d755136a06281aa2d",
        []
@@ -291176,6 +292030,34 @@
        "335ed62bbbbc32f846c97f8bcb2d5ae8512c4a7c",
        []
       ],
+      "text-indent-rtl-001-ref.xht": [
+       "075e289094481e0cd31d749f8ba42ed60423cc5d",
+       []
+      ],
+      "text-indent-rtl-002-ref.xht": [
+       "8b9aeacf34436c545d0d087db04fef0170825962",
+       []
+      ],
+      "text-transform-001-ref.xht": [
+       "f34e7044897f7f48e204a7b8c75bd051c227a8c9",
+       []
+      ],
+      "text-transform-002-ref.xht": [
+       "76002b82601411ccca0ebea1384f57eff74bea22",
+       []
+      ],
+      "text-transform-003-ref.xht": [
+       "9c39fbed2bd46d13f8d711ec816637c6927749dd",
+       []
+      ],
+      "text-transform-004-ref.xht": [
+       "46378563f87126e5d195185e782ea2c3530259aa",
+       []
+      ],
+      "text-transform-applies-to-003-ref.xht": [
+       "1a172ca66d5019dbc89c072e3b77ee633af0113a",
+       []
+      ],
       "text-transform-capitalize-001-ref.xht": [
        "2408b13443ffeb58c8f7dbfd0eb620f0632d0a76",
        []
@@ -405255,7 +406137,7 @@
       ]
      ],
      "marker-intrinsic-contribution-001.html": [
-      "3f9ca076f87826e17492b889670d3916301540f2",
+      "db492e3156281c6550380db6bf5e4ad6ac128de4",
       [
        null,
        {}
@@ -419208,6 +420090,13 @@
        {}
       ]
      ],
+     "is-where-shadow.html": [
+      "1b25bb63f168a5da7ba3a9d9b871ebda9c9c032e",
+      [
+       null,
+       {}
+      ]
+     ],
      "missing-right-token.html": [
       "8fe33a95795354117177f78eae7f1081ef0b1947",
       [
@@ -560416,161 +561305,161 @@
        ]
       ],
       "text-align-001.xht": [
-       "1b82ab9ccb38ad94f0935309dae057cabc7eed22",
+       "bc75b4f0b571d48553cafaef2ebc2793bb0608e8",
        [
         null,
         {}
        ]
       ],
       "text-align-002.xht": [
-       "0935dbd5ac9847545db63a19b5ae1fb813bd09ac",
+       "eeb58e66ee7df82e9082e4604ae00875c39000a6",
        [
         null,
         {}
        ]
       ],
       "text-align-003.xht": [
-       "776151de2e0ebf03386ef931222bea1706ecf931",
+       "94e74f749d31caa6aa99b9e7050fafbd4828c98f",
        [
         null,
         {}
        ]
       ],
       "text-align-004.xht": [
-       "9352de77cd27c953030d855030982aac6ef36157",
+       "28b539c57f41be1a80fc6b639bb4117ed71ea6de",
        [
         null,
         {}
        ]
       ],
       "text-align-005.xht": [
-       "9fb9a3023fc6b15f591dcf17c7e1c5fda4437886",
+       "9fbe334e4d864bdbb557b86a9bf766bad3672399",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-001.xht": [
-       "542f3e9716b87800b85bf305e35b3b3e17d01569",
+       "394d088b74f914f91f7935f5f386c412eddb992e",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-002.xht": [
-       "86002ae82a19e13e7766f2fe5730c924580c8a62",
+       "a5193a16733b7feec7110a9fd8efea81c4b138c0",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-003.xht": [
-       "52c6d0dad145fb496e274719ac6ac10c1d8dd628",
+       "95ac7faca2fcf06360470ea72eb492792903c55f",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-005.xht": [
-       "5cbe44bbd8d9cb4da036d8ee78a2686c33196b85",
+       "fadc3efb90a470a5a09720374cd52cf6a9be8ac6",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-006.xht": [
-       "963d258a52664f2eb69b4d73f8aebeaa396fa3df",
+       "202f51c2b28530fe6f018baf05a99f6fdded67a3",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-007.xht": [
-       "2f204986bc5ae273459b3c489a9b4fe6d8f0778e",
+       "4c228c8a2c29285a415a34572d30252b377aaf44",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-008.xht": [
-       "135ed08e590131b3a9adcc4c2f4838635254ebda",
+       "82cb04a735651437c629d0013b1da59d10c89ee8",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-009.xht": [
-       "92f563d70927f6244f34165a5320bf567b443149",
+       "c320b2ed4f421fd83f078efdfb459a25379dc1ef",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-010.xht": [
-       "35f0b8e8c927e5e03112ee8984988b00ebfd4934",
+       "4d6972f925c7a2cb53e5756f5f0dff27f426cf98",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-011.xht": [
-       "1c7b1310b7c3f59fb5147332bdd63aa499fdf7bf",
+       "5eeb2ad8d25aab8573d0a601c13da41778673160",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-012.xht": [
-       "d269a5f83c077dd036156089a6c8a5ceeca3339d",
+       "07a6b7a0a021b3f55e2601e7072584778d147c53",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-013.xht": [
-       "c2625fe33a3f9da611faaf0f51a3eaa840413d21",
+       "5aabfae82e1ee102f103d83cbc8289ffac9d04eb",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-014.xht": [
-       "f357a1c5fbc667b4a947b1b9c74eba6a8b734898",
+       "0cbfaf8846179b0e81d9bb2539069f02d3df9154",
        [
         null,
         {}
        ]
       ],
       "text-align-applies-to-015.xht": [
-       "f74d25bd100639e45c7ae0243edc503ac674a079",
+       "db8743a45f7029c09963398a979ee4b6d4ba2c96",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-001.xht": [
-       "d092f08578ac5c9404208a24a68c0776bf7e7132",
+       "1fa046d664fb60a20bf227da3cbbe1851d7fefd3",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-002.xht": [
-       "2c5795f11c8c7f22867cb2ce74a819abf43150a0",
+       "1f6fd605593c425c89f33ab6469365fb5e83badb",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-003.xht": [
-       "d80cd9d5032105b01eae186b3d820e087b514413",
+       "a8b0e027ff60f2334e52297b48b97da9df3a8595",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-004.xht": [
-       "807733c33e2b30250a28a29af3aae988c83da455",
+       "be974e547d7f0342c4cca824f0cf14b8bad03e3f",
        [
         null,
         {}
@@ -560584,56 +561473,56 @@
        ]
       ],
       "text-align-bidi-006.xht": [
-       "5aa350aac8c90feeb63e45c5ed50134709146926",
+       "e285ecfdeb9c0fc546092991c10285346780ba24",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-007.xht": [
-       "3360b9829fa61f5e854cef18945b62a29736f607",
+       "2493ad69f6be41e63e480bd8c04f25990de4d9ca",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-008.xht": [
-       "18048b6dfa8c6ec544e73d74ede63d37aef9e326",
+       "16db1af8adba5b31dc2ed10882c6191e3a4ed45d",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-009.xht": [
-       "3d173bc057765c7875ae119cfbcd335dd1ab6a5b",
+       "9f161bfc4704ef15be52086e533faddaa0e4723d",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-010.xht": [
-       "8e701732e6f04fd4227c74afbe2ec6ee65eade0e",
+       "33473e628775a0cc09c479d00dc4746135c845b9",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-012.xht": [
-       "9f24edbc05e0eb20cf60343908f813d65d06e6a2",
+       "0477087cbd563be49caa5467fc412bc854755270",
        [
         null,
         {}
        ]
       ],
       "text-align-bidi-013.xht": [
-       "f2ea53a4c55edfb841fc1d12141e23802c466d7b",
+       "f92421ec47389f0c7d99afe3ced33a4b3ad69107",
        [
         null,
         {}
        ]
       ],
       "text-align-inherit-001.xht": [
-       "424dee9fd887326b041ef2a5be88a14d0fa338e4",
+       "aa7e439fbfbf1ac50aea7db34ce8c11ea08275fb",
        [
         null,
         {}
@@ -561143,55 +562032,6 @@
         {}
        ]
       ],
-      "text-indent-004.xht": [
-       "f07a4a7759e398deb0a304224bb369e93d9f3a74",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-005.xht": [
-       "9c4941c15376f8bbc09c32cf687798770d9f9a07",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-006.xht": [
-       "889dcbe2532c2a0348dddcb4cde07889ab2926f9",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-010.xht": [
-       "ab4e2839cfd39a06fc267fa26b20f5ced94e0cbf",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-011.xht": [
-       "89de24ddcec8086670c64e15eacd6b586e96c119",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-013.xht": [
-       "3733deea16a8160602c44ad6f2128658f295cc18",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-014.xht": [
-       "528f746ade2927bec69bd8a455409d46d76ef909",
-       [
-        null,
-        {}
-       ]
-      ],
       "text-indent-016.xht": [
        "12434f53f1b61a082162ad213fa2ab1b4639f122",
        [
@@ -561199,393 +562039,15 @@
         {}
        ]
       ],
-      "text-indent-017.xht": [
-       "74055fd89f11b540479636d5e68d1c016fd2994d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-018.xht": [
-       "90535883c4a489097bff6304bf10136c817c8e97",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-028.xht": [
-       "6bbbbb505ea1c38dbacba4c612a092ad4fa7f025",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-029.xht": [
-       "152cb225a382ddda2184f6d2008dc8537329e487",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-030.xht": [
-       "f014da608138b6137362a2abf89058051516bff8",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-040.xht": [
-       "e2be2abc29ac99168d98fbed55281b759c60df0d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-041.xht": [
-       "2d88a23decf205072061aadb1bbadc10edbfd017",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-042.xht": [
-       "fee261140c3029a339915094c2a4a33ee95a777c",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-052.xht": [
-       "ce6a6a25d58f356df5dd005dc12f29923e8f108f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-053.xht": [
-       "456f9beb37534bc23b5adee56bd2b66dd9b9e8c5",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-054.xht": [
-       "0d8586c0559e9bb2c04d28544f725e2bcbdade40",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-064.xht": [
-       "97880251bbf99667c9db4b5cd8e5ffcbf3594096",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-065.xht": [
-       "1c378f30d1dbf481f684babfbd732d1b70513586",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-066.xht": [
-       "ceb189766fddade6f8a45ebf140556dc1c67eb8f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-076.xht": [
-       "d52efad87b80ce8e3a30a0ba966d0a146436139f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-077.xht": [
-       "9f73ffbdb3d175045827e98597cbafc991689854",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-078.xht": [
-       "1ca0c52671d05ffe4fc4563d0c47810dd0fd63ed",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-088.xht": [
-       "40d0055ee5cda71c84e05598648c4df23ea1d314",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-089.xht": [
-       "67e13359350303782bfee1cdadb893328f70f450",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-090.xht": [
-       "108582cda2626dd7d04351a4c57da6e03026ecf5",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-091.xht": [
-       "265ca69eb7e1df9d8077eb4027793e103bf1497c",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-092.xht": [
-       "21d0f50df7bbd525fdb93ab7c5eb90af8c41e564",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-100.xht": [
-       "b18d6c9f5af2932bd9782bcefa88733270945db8",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-101.xht": [
-       "09da8b6f898f69e49d003e174072a21eb83685a0",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-102.xht": [
-       "fe18d9f9728a8c247f2d1849cbb499df0013d778",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-103.xht": [
-       "bfdd2e1d24e867c307721a6e3477e28e83bb5ae4",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-104.xht": [
-       "327e83084da0b4299c8aff530670fec306b85bb2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-109.xht": [
-       "a3912226a7d950091ae9d7e5a364ca5daee89032",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-110.xht": [
-       "8352d10a11e2467c0b560a29d34a4af88cf81730",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-111.xht": [
-       "778d9a14da785cb9f983300eeb9f09b7ffaf212a",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-112.xht": [
-       "175661d579890424981e1bba07400bfe675cb96e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-001.xht": [
-       "68cf27d355f84f26a47d89cf2fcaffcd215a5b34",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-002.xht": [
-       "94f40462daf45e7dfe9ceb412dc00d6861514f10",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-003.xht": [
-       "74d7820fffe5420ae8998cb304ea6596ad55ba2e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-005.xht": [
-       "bf8ce5f3aeb3c952356684935387bfbd9609391c",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-006.xht": [
-       "733880ac4ee1ad2f848b8069888aed0af606dc30",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-007.xht": [
-       "64d5f934f301d5441568e79dde7d5f9b2ec13d5d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-008.xht": [
-       "54e8f84614a0e1b42f0f0ff7e97da6de9e20348f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-009.xht": [
-       "c8e8e98cb294d64a94b6f9444e03d754cb07d564",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-010.xht": [
-       "bdf72d838cec46171c271820e5c84826bb29b94e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-011.xht": [
-       "2348c4f59ed574e4398102bd4232c40898b48ce7",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-012.xht": [
-       "70e074316d251a906b7ae62245ea5451759f4499",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-013.xht": [
-       "757238a2ec2f168efcad3cbe29c2996e966c6297",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-014.xht": [
-       "d2a6881e82a044bb6f591333aab45c71611ad2fc",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-applies-to-015.xht": [
-       "c26dbe52a6b2278c3d0eac2d484acf2fc5fa3d3f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-inherited-001.xht": [
-       "92380e2d60badefaea3e79ab1033df8573f4d618",
-       [
-        null,
-        {}
-       ]
-      ],
       "text-indent-overflow-002.xht": [
-       "4bc465abd46302cdab31c86a8fe8cfc289abbe8b",
+       "ef4ac42d2a8b271de1153636a33525da1cb793a2",
        [
         null,
         {}
        ]
       ],
       "text-indent-overflow-003.xht": [
-       "6f2cc60723f0c356340dd8fdee45edf98e7f3b22",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-rtl-001.xht": [
-       "12287bb390f5f6f0cc624bf42761afba4d8d70d6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-indent-rtl-002.xht": [
-       "30ee7e8906e63932b4209dd3210dfb28f017e6a8",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-001.xht": [
-       "0db18b8ce47884b8f9e27abffa2c935bb069baec",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-002.xht": [
-       "6ae80af64f85563e71509fd41688c06e0e4178bd",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-003.xht": [
-       "b7d286309497ff879b2f316777be10bf2c7ca143",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-004.xht": [
-       "1142d09e5896b6071f7c033344bf4cf025c37224",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-005.xht": [
-       "3a96dff35c94916ae17c9290135f2bbc91258bc0",
-       [
-        null,
-        {}
-       ]
-      ],
-      "text-transform-applies-to-003.xht": [
-       "6bc7aa682f293c816b933009535b2dcf89e04957",
+       "79b3cb4bc330b9ab8dcfc3e60ccdee4a0a8787b3",
        [
         null,
         {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-014.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-014.xht.ini
new file mode 100644
index 00000000000..c15897ef64e
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-014.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-014.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
new file mode 100644
index 00000000000..f07c0d17188
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-100.xht.ini
@@ -0,0 +1,2 @@
+[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
new file mode 100644
index 00000000000..07229cdbe24
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-101.xht.ini
@@ -0,0 +1,2 @@
+[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
new file mode 100644
index 00000000000..4b4ff6dd519
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-102.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-102.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-103.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-103.xht.ini
new file mode 100644
index 00000000000..c97d054de3c
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-103.xht.ini
@@ -0,0 +1,3 @@
+[text-indent-103.xht]
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/text-indent-104.xht.ini b/tests/wpt/metadata/css/CSS2/text/text-indent-104.xht.ini
new file mode 100644
index 00000000000..770bb556b33
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/text/text-indent-104.xht.ini
@@ -0,0 +1,3 @@
+[text-indent-104.xht]
+  expected:
+    if os == "linux": FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 5733d536fd3..85e94926cb3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,6 +21,3 @@
   [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 6ef8bb1049f..171592fc08f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,6 +2,3 @@
   [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
new file mode 100644
index 00000000000..239c35135e4
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
@@ -0,0 +1,7 @@
+[offsetTopLeft-border-box.html]
+  [container: 1]
+    expected: FAIL
+
+  [container: 0]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/selectors/is-where-shadow.html.ini b/tests/wpt/metadata/css/selectors/is-where-shadow.html.ini
new file mode 100644
index 00000000000..c40b2d623ae
--- /dev/null
+++ b/tests/wpt/metadata/css/selectors/is-where-shadow.html.ini
@@ -0,0 +1,2 @@
+[is-where-shadow.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
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 77e89517bdd..2a9c7d293f3 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,21 +315,18 @@
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     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 */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    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
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 258fe374697..8d0261f22a0 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript ]
+  [separate text/javascript; charset=windows-1252 text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 6b68e9094e4..d1ca01ebc5f 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,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -9,7 +10,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [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_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3f7e3e9544f..9df1ac56f2a 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,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index dc856a3d5a3..e440b1e38c6 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[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 a057142bbc5..510ea619a7d 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,5 +1,6 @@
 [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
 
@@ -7,11 +8,11 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
index 69bd952d756..910c88d3e81 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/ignore-opens-during-unload.window.js.ini
@@ -1,5 +1,5 @@
 [ignore-opens-during-unload.window.html]
-  expected: TIMEOUT
+  expected: CRASH
   [ignore-opens-during-unload]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webxr/render_state_update.https.html.ini b/tests/wpt/metadata/webxr/render_state_update.https.html.ini
new file mode 100644
index 00000000000..0e57356683e
--- /dev/null
+++ b/tests/wpt/metadata/webxr/render_state_update.https.html.ini
@@ -0,0 +1,2 @@
+[render_state_update.https.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.xht
index 1b82ab9ccb3..bc75b4f0b57 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-001.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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property set to 'left' on a block element aligns the text to the left." />
         <style type="text/css">
@@ -19,4 +20,4 @@
         <p>Test passes if the words "Filler Text" below are aligned to the left, inside the blue box.</p>
         <div>Filler Text</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-002.xht
index 0935dbd5ac9..eeb58e66ee7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property set to 'right' on a block element aligns the text to the right." />
         <style type="text/css">
@@ -19,4 +20,4 @@
         <p>Test passes if the words "Filler Text" below are aligned to the right, inside the blue box.</p>
         <div>Filler Text</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-003.xht
index 776151de2e0..94e74f749d3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property set to 'center' on a block element aligns the text in the center." />
         <style type="text/css">
@@ -19,4 +20,4 @@
         <p>Test passes if the words "Filler Text" below are aligned in the center, inside the blue box.</p>
         <div>Filler Text</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.xht
index 9352de77cd2..28b539c57f4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-004.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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Text-align justify on a block element aligns the text on both the left and right sides." />
         <style type="text/css">
@@ -20,4 +21,4 @@
         <p>Test passes if the words "Filler Text" are justified and spaced out on the first two lines of text inside the blue box. The final line of text does not have to be justified but can be based on user agent implementation.</p>
         <div>Filler Text Filler Text Filler Text Filler Text Filler Text Filler Text</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-005.xht
index 9fb9a3023fc..9fbe334e4d8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property set to a value of 'inherit' correctly inherits its value from the parent element." />
         <style type="text/css">
@@ -28,4 +29,4 @@
         <p>Test passes if the words "Filler Text" below are aligned to the right, inside the blue box.</p>
         <div>Filler Text</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.xht
index 542f3e9716b..394d088b74f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-001.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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is not applied to 'display: inline' element." />
         <style type="text/css">
@@ -27,4 +28,4 @@
             <div id="test">Filler Text Filler Text Filler Text Filler Text</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-002.xht
index 86002ae82a1..a5193a16733 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: block' elements." />
         <style type="text/css">
@@ -22,4 +23,4 @@
             <span>Filler Text Filler Text Filler Text Filler Text</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-003.xht
index 52c6d0dad14..95ac7faca2f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: list-item' elements." />
         <style type="text/css">
@@ -26,4 +27,4 @@
             <span>Filler Text Filler Text Filler Text Filler Text</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-005.xht
index 5cbe44bbd8d..fadc3efb90a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: inline-block' elements." />
         <style type="text/css">
@@ -23,4 +24,4 @@
             <span>Filler Text Filler Text Filler Text Filler Text</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-006.xht
index 963d258a526..202f51c2b28 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table' elements." />
         <style type="text/css">
@@ -33,4 +34,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-007.xht
index 2f204986bc5..4c228c8a2c2 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: inline-table' elements." />
         <style type="text/css">
@@ -33,4 +34,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-008.xht
index 135ed08e590..82cb04a7356 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-row-group' elements." />
         <style type="text/css">
@@ -39,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-009.xht
index 92f563d7092..c320b2ed4f4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-header-group' elements." />
         <style type="text/css">
@@ -39,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-010.xht
index 35f0b8e8c92..4d6972f925c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-footer-group' elements." />
         <style type="text/css">
@@ -39,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.xht
index 1c7b1310b7c..5eeb2ad8d25 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-011.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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-row' elements." />
         <style type="text/css">
@@ -33,4 +34,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-012.xht
index d269a5f83c0..07a6b7a0a02 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is not applied to a 'display: table-column-group' element." />
         <style type="text/css">
@@ -38,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-013.xht
index c2625fe33a3..5aabfae82e1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is not applied to a 'display: table-column' element." />
         <style type="text/css">
@@ -38,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-014.xht
index f357a1c5fbc..0cbfaf88461 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-cell' elements." />
         <style type="text/css">
@@ -34,4 +35,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-015.xht
index f74d25bd100..db8743a45f7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-applies-to-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-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-text-align" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-align' property is applied to 'display: table-caption' elements." />
         <style type="text/css">
@@ -38,4 +39,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht
index d092f08578a..1fa046d664f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-001.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align property should override the default text-align change caused by a switch of direction"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht
index 2c5795f11c8..1f6fd605593 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-002.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align property should override the default text-align change caused by a switch of direction"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht
index d80cd9d5032..a8b0e027ff6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-003.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align property should override the default text-align change caused by a switch of direction"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht
index 807733c33e2..be974e547d7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-004.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align property should override the default text-align change caused by a switch of direction"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht
index 5aa350aac8c..e285ecfdeb9 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-006.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align property should override the default text-align change caused by a switch of direction"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht
index 3360b9829fa..2493ad69f6b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-007.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align should override default text-align in rtl context"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht
index 18048b6dfa8..16db1af8adb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-008.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Text-align should override default text-align in rtl context"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht
index 3d173bc0577..9f161bfc470 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-009.xht
@@ -4,6 +4,7 @@
     <title>CSS Test: text-align: justify - implicit rtl text</title>
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Implicit rtl text should be justified by text-align: justify"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht
index 8e701732e6f..33473e62877 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-010.xht
@@ -5,6 +5,7 @@
     <link rel="author" title="Eira Monstad, Opera Software ASA" href="mailto:public-testsuites@opera.com"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop"/>
     <link rel="help" href="http://www.w3.org/TR/CSS21/visuren.html#propdef-direction"/>
+    <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
     <meta name="flags" content=""/>
     <meta name="assert" content="Joined text should be justified by text-align: justify"/>
     <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht
index 4f9576eb888..32d8e819633 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-011.xht
@@ -6,6 +6,7 @@
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/align/001.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
   <link rel="match" href="text-align-bidi-011-ref.xht" />
 
   <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht
index 9f24edbc05e..0477087cbd5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-012.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/align/002.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
   <style type="text/css">
    p { color: blue; }
    .test { margin: 1em; border: solid; width: 15em; font: 2em/1 monospace; text-align: justify; direction: rtl; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht
index f2ea53a4c55..f92421ec473 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-bidi-013.xht
@@ -5,6 +5,7 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/align/003.html" type="text/html"/>
   <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
   <style type="text/css">
    p { color: blue; }
    .test { margin: 1em; border: solid; width: 15em; font: 2em/1 monospace; text-align: justify; direction: rtl; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht
index 424dee9fd88..aa7e439fbfb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-inherit-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Text-align inheritance on block level elements (spec example)</title>
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
+        <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-align-property"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Ensure that block level elements inherit text-align values of parent elements." />
         <style type="text/css">
@@ -21,4 +22,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht
index 394e27f6f16..4b2ce08ffc3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-002.xht
@@ -5,7 +5,9 @@
         <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-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
-		<link rel="match" href="text-align-white-space-002-ref.xht" />
+        <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/#white-space-property"/>
+        <link rel="match" href="text-align-white-space-002-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre-line', 'text-align' remains 'justified'." />
@@ -47,4 +49,4 @@
             <div id="test">XXX XXX XXX XXX XXX XXX XXX XXX</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht
index 496501665e5..4d8f6b6f264 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-004.xht
@@ -5,7 +5,9 @@
         <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-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
-		<link rel="match" href="text-align-white-space-004-ref.xht" />
+        <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/#white-space-property"/>
+        <link rel="match" href="text-align-white-space-004-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'nowrap', text-align is computed to 'justify'." />
@@ -44,4 +46,4 @@
             <div id="test">xxxx xxxx xxxx</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht
index 2f99d4ed713..0171dc8645f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-006.xht
@@ -5,7 +5,9 @@
         <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-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
-		<link rel="match" href="text-align-white-space-002-ref.xht" />
+        <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/#white-space-property"/>
+        <link rel="match" href="text-align-white-space-002-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'pre-line', 'text-align' remains 'justified'." />
@@ -48,4 +50,4 @@
             <div id="test">XXX XXX XXX XXX XXX XXX XXX XXX</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht
index cd26900f06f..410b551580f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-align-white-space-008.xht
@@ -5,7 +5,9 @@
         <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-06-28 -->
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#alignment-prop" />
-		<link rel="match" href="text-align-white-space-008-ref.xht" />
+        <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/#white-space-property"/>
+        <link rel="match" href="text-align-white-space-008-ref.xht" />
 
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Setting 'text-align' to 'justify' and 'white-space' to 'nowrap', text-align is computed to 'justify'." />
@@ -47,4 +49,4 @@
             <div id="test">xxxx xxxx xxxx</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004-ref.xht
new file mode 100644
index 00000000000..8a2a55f87f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004-ref.xht
@@ -0,0 +1,19 @@
+<!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 is one black box on this page (with no jagged edges).</p>
+        <div>X</div>
+        <div id="test">X</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.xht
index f07a4a7759e..b8195eff780 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-004.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="The 'text-indent' property sets a negative zero length value in pixels." />
         <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-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-005.xht
index 9c4941c1537..791f62268b0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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 0px adds 0px 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-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-006.xht
index 889dcbe2532..da3a2478b2a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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 +0px adds 0px 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-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-007.xht
index 98654cbe017..c957a782e9b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 96px adds 96px in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-008.xht
index bdcf3da5a12..cf6e1aadb9f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +96px adds 96px in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010-ref.xht
new file mode 100644
index 00000000000..6827888edeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010-ref.xht
@@ -0,0 +1,12 @@
+<!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 { color: red; width: 10em; }
+  </style>
+ </head>
+ <body>
+  <p>You should not see any text below.</p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht
index ab4e2839cfd..ace9a11aaf1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-010.xht
@@ -5,6 +5,8 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/indent/001.html" type="text/html"/>
   <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-010-ref.xht" />
   <style type="text/css">
    div { color: red; width: 10em; }
    .a { text-indent: -100em; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011-ref.xht
new file mode 100644
index 00000000000..e4951ae3997
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011-ref.xht
@@ -0,0 +1,13 @@
+<!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" lang="en">
+ <head>
+  <title>test reference</title>
+  <style type="text/css">
+    .wide { width: 16em; font: 30px/0 monospace; color: blue; text-indent: 8em; margin: 2em 0; }
+  </style>
+ </head>
+ <body>
+   <p>The word PASS must be written below.</p>
+   <div class="wide">PASS</div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht
index 89de24ddcec..3ddd12dc9c0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-011.xht
@@ -5,13 +5,15 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/001.html" type="text/html"/>
   <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-011-ref.xht" />
   <style type="text/css">
     .wide { width: 16em; font: 30px/0 monospace; color: blue; text-indent: 8em; margin: 2em 0; }
-    .narrow { width: 4em; text-indent: 50%; }
+    .narrow { width: 4em; text-indent: 200%; }
   </style>
  </head>
  <body>
    <p>The word PASS must be written below.</p>
-   <div class="wide">PA<div class="narrow">&nbsp;&nbsp;SS</div></div>
+   <div class="wide">&nbsp;&nbsp;SS<div class="narrow">PA</div></div>
  </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht
index be5edaadb82..3ae96bbb350 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-012.xht
@@ -6,6 +6,7 @@
   <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2012-06-28 -->
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/002.html" type="text/html"/>
   <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-012-ref.xht" />
 
   <meta name="flags" content="ahem" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013-ref.xht
new file mode 100644
index 00000000000..883cd657858
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013-ref.xht
@@ -0,0 +1,15 @@
+<!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" lang="en">
+ <head>
+  <title>test reference</title>
+  <style type="text/css">
+   .indent { margin-left: 20em; color: black; }
+   .float { position: absolute; margin-left: -10em; width: 10em; }
+   .float span { background: black; }
+  </style>
+ </head>
+ <body>
+  <p>The word "PASS" should appear clearly on the next line (ignore the black bar).</p>
+  <div class="indent"><span class="float"><span>XXXXXXXX</span></span>PASS</div>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht
index 3733deea16a..60f77d3cbc1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-013.xht
@@ -5,6 +5,8 @@
   <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch"/>
   <link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/003.html" type="text/html"/>
   <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-013-ref.xht" />
   <style type="text/css">
    .indent { text-indent: 10em; color: black; }
    .float { float: left; width: 10em; }
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014-ref.xht
new file mode 100644
index 00000000000..d06337d34ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014-ref.xht
@@ -0,0 +1,31 @@
+<!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>
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style type="text/css"><![CDATA[
+    .container {
+      font: 20px/1 Ahem;
+      border: solid orange;
+      width: 12em;
+    }
+  ]]></style>
+</head>
+<body>
+  <p>There must be a 4-square checkerboard pattern in the orange box below
+    and no red present.</p>
+  <div class="container">
+    <div class="outer">
+      <div>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;BlockA<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;BlockA<br />
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;BlockA<br />
+        BlockB<br />
+        BlockB<br />
+        BlockB
+      </div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht
index 528f746ade2..910ee2b0a96 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-014.xht
@@ -5,6 +5,8 @@
   <title>CSS Test: text-indent on anonymous blocks</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#indentation-prop"/>
+  <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
+  <link rel="match" href="text-indent-014-ref.xht"/>
   <meta name="flags" content=""/>
   <meta name="assert" content="text-indent affects only the first line of
     a block container if that line is also the first formatted line of an
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.xht
index 74055fd89f1..1a68e9f75f8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-017.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 0pt 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-018.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-018.xht
index 90535883c4a..c7dfd95d088 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-018.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-018.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 +0pt 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-019.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-019.xht
index 8052aed629f..010209b44ac 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-019.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-019.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 72pt adds 72pt in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.xht
index 33fa5b2abde..02b5f639bd0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-020.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +72pt adds 72pt in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.xht
index 6bbbbb505ea..ae39829362d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-028.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 pc adds 0pc 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-029.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-029.xht
index 152cb225a38..f22d4d4cc09 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-029.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-029.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 0pc adds 0pc 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-030.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-030.xht
index f014da60813..dda2788c477 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-030.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-030.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 +0pc adds 0pc 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-031.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-031.xht
index 4cd0a971822..174be5d97c7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-031.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-031.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 6pc adds 6pc in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.xht
index 479f4b133aa..72353096575 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-032.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +6pc adds 6pc in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.xht
index e2be2abc29a..0a7f2744cc8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-040.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 cm adds 0cm 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-041.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-041.xht
index 2d88a23decf..4e6525ebcd3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-041.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-041.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 0cm adds 0cm 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-042.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-042.xht
index fee261140c3..658496625f0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-042.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-042.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 +0cm adds 0cm 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-043.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-043.xht
index 23fb78ca457..9013b5cf6c8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-043.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-043.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 2.54cm adds 2.54cm in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.xht
index 5e14433b2db..bc2d4054482 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-044.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +2.54cm adds 2.54cm in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.xht
index ce6a6a25d58..0b2448abb03 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-052.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 mm adds 0mm 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-053.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-053.xht
index 456f9beb375..0acaf20f6e9 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-053.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-053.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 0mm adds 0mm 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-054.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-054.xht
index 0d8586c0559..c2e1c35445a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-054.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-054.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 +0mm adds 0mm 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-055.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-055.xht
index cc1fd09b14d..485f9893d7a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-055.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-055.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 25.4mm adds 25.4mm in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.xht
index 1efd057bac6..6b35739ca0d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-056.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +25.4mm adds 25.4mm in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.xht
index 97880251bbf..a0ec365f01a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-064.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 in adds 0in 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-065.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-065.xht
index 1c378f30d1d..5e135c3deda 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-065.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-065.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 0in adds 0in 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-066.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-066.xht
index ceb189766fd..dad89538ef0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-066.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-066.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 +0in adds 0in 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-067.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-067.xht
index 51bcca28196..442c2bffaf8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-067.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-067.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 1in adds 1in in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.xht
index 20633bd1921..7831845305b 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-068.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +1in adds 1in in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.xht
index d52efad87b8..e066b6eac48 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-076.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 em adds 0em 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-077.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-077.xht
index 9f73ffbdb3d..ff0f8a78adb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-077.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-077.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 0em adds 0em 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-078.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-078.xht
index 1ca0c52671d..162f1e70996 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-078.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-078.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 +0em adds 0em 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-079.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-079.xht
index f81bfe8421b..cbd6b76210a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-079.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-079.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 6em adds 6em in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.xht
index 69b8e9262e9..5ebef879708 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-080.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-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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +6em adds 6em in front of the text." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.xht
index 40d0055ee5c..069cd99f457 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-088.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="The 'text-indent' property sets a negative zero length value in 'ex' units." />
         <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-089.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-089.xht
index 67e13359350..c3c632b2759 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-089.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-089.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 0ex adds 0ex 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-090.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-090.xht
index 108582cda26..7352c9313f7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-090.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-090.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 +0ex adds 0ex 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-091-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091-ref.xht
new file mode 100644
index 00000000000..5b087a93b6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091-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>
+        <meta name="flags" content="ahem" />
+        <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+        <style type="text/css">
+            #parent
+            {
+                font: 16px/1em Ahem;
+            }
+            #reference
+            {
+                margin-left: 12ex;
+            }
+            #test
+            {
+                margin-left: 12ex;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is one black box on this page (with no jagged edges).</p>
+        <div id="parent">
+            <div id="reference">xx</div>
+            <div id="test">xx</div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.xht
index 265ca69eb7e..cac90dd7087 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-091.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-091-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent 12ex adds 12ex in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -30,4 +32,4 @@
             <div id="test">xx</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.xht
index 21d0f50df7b..2e3d04f4d50 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-092.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-091-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +12ex adds 12ex in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -30,4 +32,4 @@
             <div id="test">xx</div>
         </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 b18d6c9f5af..7c498d2b5f9 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
@@ -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="The 'text-indent' property sets a negative zero length value in percentages." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -27,4 +29,4 @@
             <div id="test">X</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
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 09da8b6f898..5007ff643d8 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
@@ -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="The 'text-indent' property sets a zero length value in percentages." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -27,4 +29,4 @@
             <div id="test">X</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
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 fe18d9f9728..b187c79f524 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
@@ -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="The 'text-indent' property sets a positive zero length value in percentages." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -27,4 +29,4 @@
             <div id="test">X</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103-ref.xht
new file mode 100644
index 00000000000..a2fa38c9532
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103-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">
+            #parent
+            {
+                font: 16px/1em Ahem;
+                position: relative;
+                width: 400px;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div id="parent">
+            X
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht
index bfdd2e1d24e..66b93897c07 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-103.xht
@@ -5,8 +5,10 @@
         <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-103-ref.xht"/>
         <meta name="flags" content="ahem" />
-        <meta name="assert" content="Ensure that text-indent 50% adds 50% of its containing block's width in front of the text." />
+        <meta name="assert" content="Ensure that text-indent 50% adds 50% of the containing block's width in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             #parent
@@ -27,6 +29,7 @@
             {
                 text-indent: 50%;
                 margin-left: -50%;
+                margin-right: 50%;
             }
         </style>
     </head>
@@ -37,4 +40,4 @@
             <div id="test">X</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.xht
index 327e83084da..10938498ecd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-104.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-103-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent +50% adds 50% of its containing block's width in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -27,6 +29,7 @@
             {
                 text-indent: +50%;
                 margin-left: -50%;
+                margin-right: 50%;
             }
         </style>
     </head>
@@ -37,4 +40,4 @@
             <div id="test">X</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.xht
index a3912226a7d..02d2b83f8dd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-109.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-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 adds 0 in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -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-110.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-110.xht
index 8352d10a11e..4592207f7b3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-110.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-110.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-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 adds 0 in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -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-111.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-111.xht
index 778d9a14da7..e887d34afcb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-111.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-111.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-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 adds 0px in front of the text." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
         <style type="text/css">
             div
             {
-                font: 24px/1em Ahem;
+                font: 16px/1em Ahem;
             }
             #test
             {
@@ -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-112.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-112.xht
index 175661d5798..4babc6dc796 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-112.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-112.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="../reference/pass_if_box_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="Ensure that text-indent with inherit uses its parent's value for text-indent." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -29,8 +31,8 @@
     <body>
         <p>Test passes if there is one black box on this page (with no jagged edges).</p>
         <div id="parent">
-            <div id="reference">X</div>
-            <div id="test">X</div>
+            <div id="reference">xx</div>
+            <div id="test">xx</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht
index 459ffc7f6f7..e4d14f7c071 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-113.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-113-ref-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht
index ec598d17ffd..06e60676a93 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-114.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-114-ref.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
@@ -13,4 +14,4 @@ p { text-indent: 0px }
 <p>text</p>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht
index 881eb77a859..bfe55ae13b3 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-115.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-115-ref-block-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
@@ -14,4 +15,4 @@ span { background: yellow }
 <p><span>text</span></p>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001-ref.xht
new file mode 100644
index 00000000000..e4776c085c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001-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>
+        <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
+            {
+                display: inline;
+            }
+            #div2
+            {
+                background: blue;
+                height: 1em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is directly above the blue box. (Note that the two boxes do not need to be touching.)</p>
+        <div id="div1">XXXXX</div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001.xht
index 68cf27d355f..df859edb04d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is not applied to 'display: inline' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -31,4 +33,4 @@
         <div id="div1">XXXXX</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/text-indent-applies-to-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002-ref.xht
new file mode 100644
index 00000000000..1aa29648dc5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002-ref.xht
@@ -0,0 +1,33 @@
+<!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;
+            }
+            span
+            {
+                display: block;
+                margin-left: 10em;
+            }
+            #div1
+            {
+                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. (Note that the two boxes do not need to be touching.)</p>
+        <div>
+            <span>XXXXX</span>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002.xht
index 94f40462daf..04e97ccddd6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: block' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,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/text-indent-applies-to-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003-ref.xht
new file mode 100644
index 00000000000..b708f014d74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003-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;
+            }
+            div div
+            {
+                display: list-item;
+                margin-left: 1em;
+                padding-left: 2em;
+            }
+            #div1
+            {
+                background: blue;
+                height: 1em;
+                margin-left: 3em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box is directly above the blue box and there is a marker bullet on the left-hand side of the black box. (Note that the two boxes do not need to be touching.)</p>
+        <div>
+            <div>XXXXX</div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003.xht
index 74d7820fffe..d913cfa433e 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-003-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to display: list-item elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -35,4 +37,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/text-indent-applies-to-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-005.xht
index bf8ce5f3aeb..3016e795f55 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: inline-block' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,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/text-indent-applies-to-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-006.xht
index 733880ac4ee..4dbb6e02fd7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -44,4 +46,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/text-indent-applies-to-007-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007-ref.xht
new file mode 100644
index 00000000000..71c902b9a6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007-ref.xht
@@ -0,0 +1,43 @@
+<!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;
+                margin-left: 10em;
+            }
+            #row
+            {
+                display: table-row;
+            }
+            #cell
+            {
+                display: table-cell;
+            }
+            #div1
+            {
+                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. (Note that the two boxes do not need to be touching.)</p>
+        <div id="table">
+            <div id="row">
+                <div id="cell">XXXXX</div>
+            </div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007.xht
index 64d5f934f30..cbbb41290a6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-007-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: inline-table' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -44,4 +46,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/text-indent-applies-to-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-008.xht
index 54e8f84614a..c55d6a21369 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table-row-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -50,4 +52,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/text-indent-applies-to-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-009.xht
index c8e8e98cb29..bc561f2ab1a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table-header-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -50,4 +52,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/text-indent-applies-to-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-010.xht
index bdf72d838ce..1c4ee225ff1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table-footer-group' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -50,4 +52,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/text-indent-applies-to-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-011.xht
index 2348c4f59ed..2e888c99d80 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table-row' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -44,4 +46,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/text-indent-applies-to-012-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012-ref.xht
new file mode 100644
index 00000000000..1932202bbba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012-ref.xht
@@ -0,0 +1,47 @@
+<!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;
+                width: 100%;
+            }
+            #test
+            {
+                display: table-column-group;
+            }
+            #row
+            {
+                display: table-row;
+            }
+            #cell
+            {
+                display: table-cell;
+            }
+            #div1
+            {
+                background: blue;
+                height: 1em;
+                width: 6em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is directly above the blue box. (Note that the two boxes do not need to be touching.)</p>
+        <div id="table">
+            <div id="test"></div>
+            <div id="row">
+                <div id="cell">XXXXXX</div>
+            </div>
+        </div>
+        <div id="div1"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012.xht
index 70e074316d2..491023c5722 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-012-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is not applied to 'display: table-column-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/text-indent-applies-to-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-013.xht
index 757238a2ec2..71b98469de4 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-012-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is not applied to 'display: table-column' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -50,4 +52,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/text-indent-applies-to-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-014.xht
index d2a6881e82a..70b372f6c59 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied to 'display: table-cell' elements." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -45,4 +47,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/text-indent-applies-to-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-015.xht
index c26dbe52a6b..aaf45bd4efe 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-applies-to-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-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-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-applies-to-002-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is applied 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/text-indent-inherited-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001-ref.xht
new file mode 100644
index 00000000000..884001b5090
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001-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;
+                margin-left: 10em;
+            }
+            div div
+            {
+                display: inline-block;
+            }
+            #div2
+            {
+                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>XXXXX</div>
+        </div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht
index 92380e2d60b..352080f04bd 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-inherited-001.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Text-indent and inline-block level inheritance</title>
         <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-inherited-001-ref.xht" />
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property is inherited by inline-block level elements resulting in a double indent." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -34,4 +36,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/text-indent-intrinsic-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001.xht
index 426d28a5c4d..841f8ffd8de 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-001.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-intrinsic-001-ref.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
@@ -45,4 +46,4 @@ span {
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht
index 4fdc7ba8e50..b42b6003061 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-002.xht
@@ -2,6 +2,7 @@
 <title>CSS Test: Test for intrinsic widths and text-indent (intrinsic-pref)</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
 <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
 <link rel="match" href="text-indent-intrinsic-002-ref.xht"/>
 <meta name="flags" content="" />
@@ -45,4 +46,4 @@ span {
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht
index 3ef24a6f357..e67bc7f73c7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-003.xht
@@ -2,6 +2,7 @@
 <title>CSS Test: Test for intrinsic widths and negative text-indent (negative-intrinsic-min)</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
 <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
 <link rel="match" href="text-indent-intrinsic-003-ref.xht"/>
 <meta name="flags" content="" />
@@ -40,4 +41,4 @@ span {
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht
index 17e405745d7..172025120f5 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-intrinsic-004.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-intrinsic-004-ref.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
@@ -40,4 +41,4 @@ span {
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html
index 232065c52b7..af7e1cc0145 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-on-blank-line-rtl-left-align.html
@@ -2,6 +2,7 @@
 <title>Text-indent on blank line in RTL container with text-align:left</title>
 <link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
 <link rel="help" href="https://www.w3.org/TR/CSS22/text.html#propdef-text-indent" title="16.1 Indentation: the 'text-indent' property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
 <link rel="match" href="text-indent-on-blank-line-rtl-left-align-ref.html">
 <p>There should be a hotpink square in the bottom left corner of a larger blue square.</p>
 <div style="text-align:left; direction:rtl; text-indent:300px; line-height:100px; width:200px; background:blue;">
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht
index 4e77ac7e31b..c4e7a527924 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-001.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Text-indent with negative value with overflow hidden</title>
         <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="../reference/no-red-on-blank-page-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-indent' property with negative value follows the overflow hidden assignment." />
@@ -26,4 +27,4 @@
             <div>XXXXX</div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</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 4bc465abd46..ef4ac42d2a8 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
@@ -4,6 +4,7 @@
         <title>CSS Test: Text-indent with negative value with 'overflow' set to 'visible'</title>
         <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"/>
         <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" />
@@ -34,4 +35,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/text-indent-overflow-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-003.xht
index 6f2cc60723f..79b3cb4bc33 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
@@ -4,6 +4,7 @@
         <title>CSS Test: Text-indent with value larger than the available width with 'overflow' set to 'visible'</title>
         <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"/>
         <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" />
@@ -35,4 +36,4 @@
             <div id="div3"></div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht
index 3dc30944981..e53728af700 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-overflow-004.xht
@@ -4,6 +4,7 @@
         <title>CSS Test: Text-indent with value larger than the available width with 'overflow' set to 'hidden'</title>
         <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="../reference/no-red-on-blank-page-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-indent' property with value exceeding the available width of the element follows the 'overflow: hidden' assignment." />
@@ -21,4 +22,4 @@
         <p>Test passes if there is no red visible on the page.</p>
         <div>XXXXX</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht
index 98fce2f9eb7..a3430eaef5f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-percent-001.xht
@@ -3,6 +3,7 @@
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.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-percent-001-ref.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
@@ -16,4 +17,4 @@ p { width: 300px; text-indent: 10%; }
 </div>
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001-ref.xht
new file mode 100644
index 00000000000..075e2890944
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-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">
+            #div1
+            {
+                direction: rtl;
+                font-family: Ahem;
+                line-height: 1em;
+                margin-right: 5em;
+            }
+            #div2
+            {
+                background: blue;
+                height: 1em;
+                float: right;
+                margin-right: 5em;
+                width: 5em;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the black box below is directly above the blue box.</p>
+        <div id="div1">XXXXX</div>
+        <div id="div2"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht
index 12287bb390f..dfc9193bfdb 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-001.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Text-indent with 'direction' set to 'rtl'</title>
         <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-rtl-001-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property on an element with 'direction: rtl' indents from the right instead of left." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -30,4 +32,4 @@
         <div id="div1">XXXXX</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/text-indent-rtl-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002-ref.xht
new file mode 100644
index 00000000000..8b9aeacf344
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002-ref.xht
@@ -0,0 +1,37 @@
+<!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
+            {
+                direction: rtl;
+                width: 40em;
+            }
+            #div2
+            {
+                font-family: Ahem;
+                line-height: 1em;
+                margin-right: -5em;
+                width: 30em;
+            }
+            #div3
+            {
+                background: blue;
+                height: 1em;
+                float: right;
+                margin-right: -5em;
+                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-rtl-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002.xht
index 30ee7e8906e..f8b72b3fd1c 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-rtl-002.xht
@@ -4,6 +4,8 @@
         <title>CSS Test: Text-indent with negative value</title>
         <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-rtl-002-ref.xht"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'text-indent' property with negative values with direction rtl indent to the right." />
         <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -37,4 +39,4 @@
             <div id="div3"></div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
index 31c226631ae..2bfee883848 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-indent-wrap-001.xht
@@ -2,6 +2,7 @@
 <title>CSS Test: text-indent test (multiple-line)</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property"/>
 <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
 <link rel="match" href="text-indent-wrap-001-ref-inline-margin.xht"/>
 <meta name="flags" content="" />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001-ref.xht
new file mode 100644
index 00000000000..f34e7044897
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001-ref.xht
@@ -0,0 +1,11 @@
+<!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 lines of "Filler Text" below have the same (upper/lower) case for each letter.</p>
+        <div>Filler Text Filler Text FILLER TEXT FILLER TEXT FiLlEr TExT</div>
+        <div>Filler Text Filler Text FILLER TEXT FILLER TEXT FiLlEr TExT</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001.xht
index 0db18b8ce47..c847e4d4131 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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-001-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property set to 'capitalize' on an element makes the first character of every word uppercase." />
         <style type="text/css">
@@ -19,4 +21,4 @@
         <div>Filler Text Filler Text FILLER TEXT FILLER TEXT FiLlEr TExT</div>
         <div id="test">filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002-ref.xht
new file mode 100644
index 00000000000..76002b82601
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002-ref.xht
@@ -0,0 +1,10 @@
+<!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 line of "Filler Text" and all of the characters of the text are all in lowercase.</p>
+        <div>filler text filler text filler text filler text filler text</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002.xht
index 6ae80af64f8..dcde372b137 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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-002-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property set to 'lowercase' on an element makes every letter lowercase." />
         <style type="text/css">
@@ -18,4 +20,4 @@
         <p>Test passes if the line of "Filler Text" and all of the characters of the text are all in lowercase.</p>
         <div>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003-ref.xht
new file mode 100644
index 00000000000..9c39fbed2bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003-ref.xht
@@ -0,0 +1,10 @@
+<!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 line of "Filler Text" and all of the characters of the text are all in uppercase.</p>
+        <div>FILLER TEXT FILLER TEXT FILLER TEXT FILLER TEXT FILLER TEXT</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003.xht
index b7d28630949..775a552e3b7 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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-003-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property set to 'uppercase' on an element makes every letter uppercase." />
         <style type="text/css">
@@ -18,4 +20,4 @@
         <p>Test passes if the line of "Filler Text" and all of the characters of the text are all in uppercase.</p>
         <div>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004-ref.xht
new file mode 100644
index 00000000000..46378563f87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004-ref.xht
@@ -0,0 +1,11 @@
+<!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 lines of "Filler Text" below have the same (upper/lower) case for each letter.</p>
+        <div>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
+        <div>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.xht
index 1142d09e589..d24d7f24257 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-004.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-transform" />
         <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-004-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property set to 'none' on an element makes no changes to the text." />
         <style type="text/css">
@@ -20,4 +22,4 @@
         <div>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
         <div id="test">filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-005.xht
index 3a96dff35c9..9a2734f9a88 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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-003-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property set to 'inherit' on an element inherits its parent element's 'text-transform' value." />
         <style type="text/css">
@@ -25,4 +27,4 @@
             <span>filler text Filler Text FILLER TEXT fILLER tEXT FiLlEr tExT</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.xht
index a55fddb0c2d..180c41c58e8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-001.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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: inline' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-002.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-002.xht
index a44f297a3d9..48b9052a8dc 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-002.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: block' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003-ref.xht
new file mode 100644
index 00000000000..1a172ca66d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003-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>
+        <style type="text/css">
+            div
+            {
+                margin-left: 1em;
+            }
+            span
+            {
+                display: list-item;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if the letter "F" in the words "Filler Text" below is in upper-case and there is a marker bullet on the left-hand side of the "Filler Text".</p>
+        <div>
+            <span>Filler Text</span>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003.xht
index 6bc7aa682f2..39165172b2d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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-applies-to-003-ref.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: list-item' elements." />
         <style type="text/css">
@@ -25,4 +27,4 @@
             <span>filler text</span>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-005.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-005.xht
index af28c5cffb5..e47f05bf02e 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property"/>
         <link rel="match" href="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: inline-block' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-006.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-006.xht
index 3c2a2bb1703..5a8677c383d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-007.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-007.xht
index cef475e44ca..42632b1e213 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: inline-table' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-008.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-008.xht
index f8c32f6fc2a..75305aec54d 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-row-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-009.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-009.xht
index 731e945863a..7f66884ea88 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-009.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-header-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-010.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-010.xht
index 82cd1c19e9f..6836ccbd4f0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-010.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-footer-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.xht
index cf2d13f814e..3a7af008072 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-011.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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-row' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-012.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-012.xht
index c9ab831120d..50807e10d06 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-012.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Verifies that text-transform is not applied to 'display: table-column-group' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-013.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-013.xht
index ad593d799e1..93168fc98d0 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-013.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Verifies that text-transform is not applied to 'display: table-column' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-014.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-014.xht
index 4acd6eaa9a2..f080f25148e 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-014.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-cell' elements." />
diff --git a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-015.xht b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-015.xht
index 764ef683ac9..ffc9cee4d46 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-applies-to-015.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/text/text-transform-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-text-transform" />
         <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="../../reference/pass_if_letter_uppercase.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: table-caption' elements." />
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html
index 3f9ca076f87..db492e31562 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-intrinsic-contribution-001.html
@@ -56,11 +56,15 @@ function check(item, msg) {
   }, msg);
 }
 
-for (let item of document.querySelectorAll(".outside > li")) {
-  check(item, `Intrinsic contribution of outside ${item.className} marker`);
-}
+setup({ explicit_done: true });
 
-for (let item of document.querySelectorAll(".inside > li")) {
-  check(item, `Intrinsic contribution of inside ${item.className} marker`);
-}
+document.fonts.ready.then(() => {
+  for (let item of document.querySelectorAll(".outside > li")) {
+    check(item, `Intrinsic contribution of outside ${item.className} marker`);
+  }
+  for (let item of document.querySelectorAll(".inside > li")) {
+    check(item, `Intrinsic contribution of inside ${item.className} marker`);
+  }
+  done();
+});
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html
new file mode 100644
index 00000000000..e0148ddd73f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/hyphens/hyphens-auto-and-contenteditable-crash.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<title>CSS Text Test: Hyphenation in a contenteditable with a x20+x9+x20 trailing space sequence, makes chrome to crash</title>
+<link rel="help" href="https://crbug.com/1133254">
+<style>
+    span {
+        display: table-row;
+        hyphens: auto;
+    }
+</style>
+<div contenteditable=plaintext-only>
+    <span>XXX	 </span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/selectors/is-where-shadow.html b/tests/wpt/web-platform-tests/css/selectors/is-where-shadow.html
new file mode 100644
index 00000000000..1b25bb63f16
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/selectors/is-where-shadow.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<title>:is() inside shadow pseudos</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#matches">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#host-selector">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#slotted-pseudo">
+<div class="parent1"><div id="host1" class=a><p class=e>::slotted</p></div></div>
+<div class="parent2"><div id="host2" class=b><p class=d>::slotted</p></div></div>
+<div class="parent3"><div id="host3" class=c><p class=f>::slotted</p></div></div>
+</div>
+<script>
+  let shadow1 = host1.attachShadow({ mode: 'open' });
+  let shadow2 = host2.attachShadow({ mode: 'open' });
+  let shadow3 = host3.attachShadow({ mode: 'open' });
+
+  const html = `
+    <style>
+      * { color: blue; }
+      :host(:is(.a, .b)) b { color: green; }
+      :host-context(:is(.parent1, .parent2)) i { color: green; }
+      ::slotted(:is(.e, .f)) { color: green; }
+
+      /* The following should not match: */
+      :host(:is(.z)) b { color: red; }
+      :host(:is(.a + .b)) b { color: red; }
+      :host-context(:is(.z)) i { color: red; }
+      :host-context(:is(.parent1 .parent2)) i { color: red; }
+      ::slotted(:is(.z)) { color: red; }
+      ::slotted(:is(.a > .b)) { color: red; }
+    </style>
+    <b>:host</b>
+    <i>:host-context</i>
+    <slot></slot>
+  `;
+
+  shadow1.innerHTML = html;
+  shadow2.innerHTML = html;
+  shadow3.innerHTML = html;
+
+  const getComputedColor = e => getComputedStyle(e).color;
+  const green = 'rgb(0, 128, 0)';
+  const blue = 'rgb(0, 0, 255)';
+
+  test(function() {
+    assert_equals(getComputedColor(shadow1.querySelector('b')), green);
+    assert_equals(getComputedColor(shadow2.querySelector('b')), green);
+    assert_equals(getComputedColor(shadow3.querySelector('b')), blue);
+  }, ':is() inside :host()');
+
+  test(function() {
+    assert_equals(getComputedColor(shadow1.querySelector('i')), green);
+    assert_equals(getComputedColor(shadow2.querySelector('i')), green);
+    assert_equals(getComputedColor(shadow3.querySelector('i')), blue);
+  }, ':is() inside :host-context()');
+
+  test(function() {
+    assert_equals(getComputedColor(document.querySelector('.e')), green);
+    assert_equals(getComputedColor(document.querySelector('.d')), blue);
+    assert_equals(getComputedColor(document.querySelector('.f')), green);
+  }, ':is() inside ::slotted()');
+</script>