auto merge of #4465 : servo/servo/revert-wpt, r=Ms2ger

52 files changed, 3 insertions, 287 deletions

diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index 66bb84c47bb..a95e3c016f9 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -31,6 +31,8 @@ skip: true
       skip: false
       [resolving-urls]
         skip: true
+  [rendering]
+    skip: true
   [semantics]
     skip: false
     [embedded-content]
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-isolate.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-isolate.html.ini
deleted file mode 100644
index 66406e86118..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-isolate.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-isolate.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-isolate-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html.ini
deleted file mode 100644
index 1442574ab82..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-pre-N-between-Rs.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-mixed.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-mixed.html.ini
deleted file mode 100644
index 83f81149457..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-pre-mixed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-pre-mixed.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html.ini
deleted file mode 100644
index 9f8d23edd01..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-textarea-N-between-Rs.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html.ini
deleted file mode 100644
index f949333aa26..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-textarea-mixed.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini
deleted file mode 100644
index 3c8cebc68bd..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-textarea-script-N-between-Rs.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html.ini
deleted file mode 100644
index 0a92412c1e6..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[dir_auto-textarea-script-mixed.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xmllang-01.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xmllang-01.html.ini
deleted file mode 100644
index ee86691a689..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xmllang-01.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[lang-xmllang-01.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/lang-xmllang-01-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xyzzy.html.ini b/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xyzzy.html.ini
deleted file mode 100644
index 823df3d573e..00000000000
--- a/tests/wpt/metadata/html/dom/elements/global-attributes/lang-xyzzy.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[lang-xyzzy.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/dom/elements/global-attributes/lang-xyzzy-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/bindings/the-select-element-0/option-label.html.ini b/tests/wpt/metadata/html/rendering/bindings/the-select-element-0/option-label.html.ini
deleted file mode 100644
index b01be9141ca..00000000000
--- a/tests/wpt/metadata/html/rendering/bindings/the-select-element-0/option-label.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[option-label.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/rendering/bindings/the-select-element-0/option-label-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml.ini b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml.ini
deleted file mode 100644
index 9823faf6770..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[img_border_percent.xhtml]
-  type: reftest
-  reftype: ==
-  refurl: /html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html.ini
deleted file mode 100644
index 86943249594..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-iframe-auto.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'iframe\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html.ini
deleted file mode 100644
index b13812d6c4e..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-iframe-fixed.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'iframe\', placeholderHeightAttr: \'100px\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html.ini
deleted file mode 100644
index 9cc0d53120c..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-iframe-percentage.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'iframe\', placeholderHeightAttr: \'100%\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html.ini
deleted file mode 100644
index 5143f4d8154..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-img-auto.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'img\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html.ini
deleted file mode 100644
index 3dd736dda61..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-img-fixed.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'img\', placeholderHeightAttr: \'100px\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html.ini
deleted file mode 100644
index 03f61242dd9..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-img-percentage.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'img\', placeholderHeightAttr: \'100%\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html.ini
deleted file mode 100644
index 33d96eb7bf9..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-object-auto.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'object\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html.ini
deleted file mode 100644
index 70a3eea4da4..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-object-fixed.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'object\', placeholderHeightAttr: \'100px\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html.ini
deleted file mode 100644
index 8dab038959d..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[svg-in-object-percentage.html]
-  type: testharness
-  expected: TIMEOUT
-  [placeholder: \'object\', placeholderHeightAttr: \'100%\', ]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini
deleted file mode 100644
index bb7ae55484a..00000000000
--- a/tests/wpt/metadata/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[svg-inline.html]
-  type: testharness
-  expected: TIMEOUT
-  [(initial values)]
-    expected: FAIL
-
-  [containerWidthStyle: \'400px\', ]
-    expected: FAIL
-
-  [containerHeightStyle: \'400px\', ]
-    expected: FAIL
-
-  [containerWidthStyle: \'400px\', containerHeightStyle: \'400px\', ]
-    expected: FAIL
-
-  [svgViewBoxAttr: \'0 0 100 200\', ]
-    expected: FAIL
-
-  [containerWidthStyle: \'400px\', svgViewBoxAttr: \'0 0 100 200\', ]
-    expected: FAIL
-
-  [containerHeightStyle: \'400px\', svgViewBoxAttr: \'0 0 100 200\', ]
-    expected: FAIL
-
-  [containerWidthStyle: \'400px\', containerHeightStyle: \'400px\', svgViewBoxAttr: \'0 0 100 200\', ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/the-input-element/image01.html.ini b/tests/wpt/metadata/html/semantics/forms/the-input-element/image01.html.ini
deleted file mode 100644
index 61c4f122b82..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/the-input-element/image01.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[image01.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/forms/the-input-element/image01-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html.ini
deleted file mode 100644
index 847b0a14070..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-li-reftest-002.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html.ini
deleted file mode 100644
index 44e490a34e8..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-rev-reftest-001.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html.ini
deleted file mode 100644
index fa7fb7e3891..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-start-reftest-001.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html.ini
deleted file mode 100644
index 9fa3af6086d..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-start-reftest-002.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html.ini
deleted file mode 100644
index beb07b038e9..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-type-reftest-001.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html.ini
deleted file mode 100644
index 351b9c58885..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-type-reftest-002.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html.ini
deleted file mode 100644
index 26d5f180c3d..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-ol-type-reftest-003.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html.ini b/tests/wpt/metadata/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html.ini
deleted file mode 100644
index ba74e7d5738..00000000000
--- a/tests/wpt/metadata/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[grouping-pre-reftest-001.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html.ini
deleted file mode 100644
index 3d68a3d0f5a..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-auto-dir-default.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html.ini
deleted file mode 100644
index 8ceef2e7481..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-missing-pdf.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini
deleted file mode 100644
index 00381dabe51..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-nested.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
deleted file mode 100644
index f3f98895a39..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-number.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html.ini
deleted file mode 100644
index 72578b893ca..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-separate.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html.ini
deleted file mode 100644
index 315f19ae92d..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-another-bdi-1.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html.ini
deleted file mode 100644
index 67aedc688a0..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-another-bdi-2.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html.ini
deleted file mode 100644
index f4409a0cc34..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-letter-following-1.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html.ini
deleted file mode 100644
index 6a86ec4c358..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-letter-following-2.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html.ini
deleted file mode 100644
index 5cde0877122..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-letter-preceding-1.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html.ini
deleted file mode 100644
index a097597f966..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-letter-preceding-2.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html.ini
deleted file mode 100644
index c9541ed778b..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-number-following-1.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html.ini
deleted file mode 100644
index d2ded5ef1d0..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-number-following-2.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html.ini
deleted file mode 100644
index a3016fb0f48..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-to-surrounding-run.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
deleted file mode 100644
index 967921d1e60..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-neutral-wrapped.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html.ini
deleted file mode 100644
index 449d42bcb57..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdi-paragraph-level-container.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html.ini
deleted file mode 100644
index 5a4ef6f3d8e..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bdo-child.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html.ini
deleted file mode 100644
index d9e1a581be7..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[bidi-001.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html.ini
deleted file mode 100644
index 8bfc6325645..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[br-bidi-in-inline-ancestors.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html.ini b/tests/wpt/metadata/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html.ini
deleted file mode 100644
index 160398681b4..00000000000
--- a/tests/wpt/metadata/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[wbr-element.html]
-  type: reftest
-  reftype: !=
-  refurl: /html/semantics/text-level-semantics/the-wbr-element/wbr-element-notref.html
-
-[wbr-element.html]
-  type: reftest
-  reftype: ==
-  refurl: /html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html
-  expected: FAIL
diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh
index 47680c6d392..d238a16f985 100755
--- a/tests/wpt/run.sh
+++ b/tests/wpt/run.sh
@@ -16,7 +16,7 @@ source $wpt_root/_virtualenv/bin/activate
 if [[ $* == *--update-manifest* ]]; then
     (python -c "import html5lib" &>/dev/null) || pip install html5lib
 fi
-(python -c "import wptrunner"  &>/dev/null) || pip install 'wptrunner==1.8'
+(python -c "import wptrunner"  &>/dev/null) || pip install 'wptrunner==1.7'
 
 python $wpt_root/run.py \
   --config $wpt_root/config.ini \