diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/__dir__.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/__dir__.ini
deleted file mode 100644
index 0224ba3ac45..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: XHTML
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html.ini
new file mode 100644
index 00000000000..7421c7b4537
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html.ini
@@ -0,0 +1,8 @@
+[node-document.html]
+ type: testharness
+ [Parsing XHTML: Node's node document must be set to that of the element to which it will be appended. Test loading XHTML document from a file]
+ expected: FAIL
+
+ [Parsing XHTML: Node's node document must be set to that of the element to which it will be appended. Test loading of XHTML document with nested templates from a file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html.ini
new file mode 100644
index 00000000000..c0215a3ac97
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html.ini
@@ -0,0 +1,8 @@
+[template-child-nodes.html]
+ type: testharness
+ [Child nodes of template element in XHTML documents must be appended to template content. Test loading XHTML document from a file]
+ expected: FAIL
+
+ [Child nodes of nested template element in XHTML documents must be appended to template content. Test loading XHTML document from a file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/__dir__.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/__dir__.ini
deleted file mode 100644
index 0224ba3ac45..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: XHTML
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html.ini
new file mode 100644
index 00000000000..6fff7134d8f
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html.ini
@@ -0,0 +1,11 @@
+[outerhtml.html]
+ type: testharness
+ [Template contents should be serialized instead of template element if serializing template element]
+ expected: FAIL
+
+ [Template contents should be serialized instead of template element if serializing template element. Test nested template]
+ expected: FAIL
+
+ [Template contents should be serialized instead of template element if serializing template element. Test serializing whole document]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/__dir__.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing-html-fragments/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.ini
new file mode 100644
index 00000000000..34f3a74e702
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-001.html]
+ type: testharness
+ [The character encoding of a page can be set using the HTTP header charset declaration.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html.ini
new file mode 100644
index 00000000000..7562bafe084
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html.ini
@@ -0,0 +1,3 @@
+[the-input-byte-stream-003.html]
+ type: testharness
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html.ini
new file mode 100644
index 00000000000..c86e1cc9d0f
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html.ini
@@ -0,0 +1,3 @@
+[the-input-byte-stream-004.html]
+ type: testharness
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.ini
new file mode 100644
index 00000000000..e029f6b90c3
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-007.html]
+ type: testharness
+ [The character encoding of the page can be set by a meta element with http-equiv and content attributes.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.ini
new file mode 100644
index 00000000000..3e416aea378
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-009.html]
+ type: testharness
+ [The character encoding of the page can be set by a meta element with charset attribute.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.ini
new file mode 100644
index 00000000000..3e64cbf9442
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-016.html]
+ type: testharness
+ [The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.ini
new file mode 100644
index 00000000000..590c133b4dc
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-018.html]
+ type: testharness
+ [The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.ini b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.ini
new file mode 100644
index 00000000000..fc582d725c1
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.ini
@@ -0,0 +1,5 @@
+[the-input-byte-stream-030.html]
+ type: testharness
+ [An encoding declaration in a meta charset attribute has a higher precedence than a following encoding declaration in a meta charset attribute.]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/__dir__.ini b/tests/wpt/metadata/html/syntax/parsing/template/__dir__.ini
deleted file mode 100644
index e15ca1ea3b3..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing/template/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/3924
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini
new file mode 100644
index 00000000000..f45ba45ce66
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html.ini
@@ -0,0 +1,8 @@
+[generating-of-implied-end-tags.html]
+ type: testharness
+ [Generating of implied end tags. Test table elements. Loading of HTML document from a file]
+ expected: FAIL
+
+ [Generating of implied end tags. Test div element. Loading of HTML document from a file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini
new file mode 100644
index 00000000000..fc735163558
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html.ini
@@ -0,0 +1,5 @@
+[ignore-body-token.html]
+ type: testharness
+ [Ignore BODY token. Test loading a HTML file with BODY tag inside template]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini
new file mode 100644
index 00000000000..38e9ede8421
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html.ini
@@ -0,0 +1,5 @@
+[ignore-frameset-token.html]
+ type: testharness
+ [Ignore frameset token. Test loading a HTML file with FRAMESET tag inside template]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini
new file mode 100644
index 00000000000..ebc02594e19
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html.ini
@@ -0,0 +1,5 @@
+[ignore-head-token.html]
+ type: testharness
+ [Ignore HEAD token. Test loading a HTML file with HEAD tag inside template]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini
new file mode 100644
index 00000000000..284cd1254b2
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html.ini
@@ -0,0 +1,5 @@
+[ignore-html-token.html]
+ type: testharness
+ [Ignore HTML token. Test loading a HTML file with HTML tag inside template]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini
new file mode 100644
index 00000000000..148ed2e3b18
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html.ini
@@ -0,0 +1,5 @@
+[start-tag-html.html]
+ type: testharness
+ [In body insertion mode: html start tag should add only absent attributes]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini
new file mode 100644
index 00000000000..e9fa8c8480c
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html.ini
@@ -0,0 +1,5 @@
+[template-end-tag-without-start-one.html]
+ type: testharness
+ [ tag in HTML body without start one should be ignored. Test HTML document loaded from file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini
new file mode 100644
index 00000000000..9d9d49e816e
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html.ini
@@ -0,0 +1,5 @@
+[end-tag-frameset.html]
+ type: testharness
+ [ tag should be ignored in "in frameset" insertion mode]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini
new file mode 100644
index 00000000000..f4621ee9cd7
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html.ini
@@ -0,0 +1,8 @@
+[generating-of-implied-end-tags.html]
+ type: testharness
+ [Generating of implied end tags. Test table elements. Load HTML document from file]
+ expected: FAIL
+
+ [Generating of implied end tags. Test div element. Load HTML document from file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini
new file mode 100644
index 00000000000..67d3b078a61
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html.ini
@@ -0,0 +1,5 @@
+[template-end-tag-without-start-one.html]
+ type: testharness
+ [ tag in HTML head without start one should be ignored. Test HTML document loaded from file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini
new file mode 100644
index 00000000000..d8b72c18c32
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html.ini
@@ -0,0 +1,8 @@
+[template-child-nodes.html]
+ type: testharness
+ [Template child nodes must be appended to template content node. Load HTML document from a file]
+ expected: FAIL
+
+ [Template child nodes must be appended to nested template content node. Load HTML document from a file]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini b/tests/wpt/metadata/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini
new file mode 100644
index 00000000000..2857af13c0b
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html.ini
@@ -0,0 +1,11 @@
+[template-owner-document.html]
+ type: testharness
+
+ [Test ownerDocument property of two elements in a template. Load HTML document from a file, current DOCUMENT has browsing context]
+ expected: FAIL
+
+ [Test ownerDocument property of the element in a template. Load HTML document from a file, current DOCUMENT has browsing context]
+ expected: FAIL
+
+ [Test ownerDocument property of the element in a nested template. Load HTML document from a file, current DOCUMENT has browsing context]
+ expected: FAIL
diff --git a/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini b/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
index ada4d550044..688f46ead8f 100644
--- a/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
+++ b/tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
@@ -3,3 +3,4 @@
expected: OK
[Style: Same-origin with correct sha256 and sha512 hash, rel='alternate stylesheet' enabled]
expected: FAIL
+