diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 6aeb176c040..afd8ffcda6d 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -396,7 +396,7 @@ class MachCommands(CommandBase):
def _test_wpt(self, android=False, **kwargs):
self.set_run_env(android)
hosts_file_path = path.join(self.context.topdir, 'tests', 'wpt', 'hosts')
- os.environ["hosts_file_path"] = hosts_file_path
+ os.environ["HOST_FILE"] = hosts_file_path
run_file = path.abspath(path.join(self.context.topdir, "tests", "wpt", "run.py"))
return self.wptrunner(run_file, **kwargs)
diff --git a/tests/wpt/metadata/webdriver/tests/delete_session/delete.py.ini b/tests/wpt/metadata/webdriver/tests/delete_session/delete.py.ini
index db1f029776c..44e37efea17 100644
--- a/tests/wpt/metadata/webdriver/tests/delete_session/delete.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/delete_session/delete.py.ini
@@ -1,7 +1,2 @@
[delete.py]
- [test_null_response_value]
- expected: FAIL
-
- [test_dismissed_beforeunload_prompt]
- expected: FAIL
-
+ disabled: Triggers setup errors in other tests
diff --git a/tests/wpt/metadata/webdriver/tests/element_send_keys/scroll_into_view.py.ini b/tests/wpt/metadata/webdriver/tests/element_send_keys/scroll_into_view.py.ini
index d4cbc4c8257..53f08deca9d 100644
--- a/tests/wpt/metadata/webdriver/tests/element_send_keys/scroll_into_view.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/element_send_keys/scroll_into_view.py.ini
@@ -1,7 +1,4 @@
[scroll_into_view.py]
- [test_element_outside_of_not_scrollable_viewport]
- expected: FAIL
-
[test_option_select_container_outside_of_scrollable_viewport]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/element_send_keys/send_keys.py.ini b/tests/wpt/metadata/webdriver/tests/element_send_keys/send_keys.py.ini
index 55422718924..4b0989c849d 100644
--- a/tests/wpt/metadata/webdriver/tests/element_send_keys/send_keys.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/element_send_keys/send_keys.py.ini
@@ -1,28 +1,4 @@
[send_keys.py]
- [test_invalid_text_type[value4\]]
- expected: FAIL
-
- [test_invalid_text_type[None\]]
- expected: FAIL
-
- [test_null_response_value]
- expected: FAIL
-
- [test_invalid_text_type[value3\]]
- expected: FAIL
-
- [test_invalid_text_type[1\]]
- expected: FAIL
-
- [test_null_parameter_value]
- expected: FAIL
-
- [test_stale_element]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
- [test_invalid_text_type[True\]]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/execute_script/properties.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/properties.py.ini
index 7311a9d9dd1..589da852eec 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/properties.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/properties.py.ini
@@ -2,12 +2,3 @@
[test_idl_attribute_element]
expected: FAIL
- [test_script_defining_property]
- expected: FAIL
-
- [test_content_attribute]
- expected: FAIL
-
- [test_idl_attribute]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/find_element_from_element/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_element_from_element/find.py.ini
index 8e088c8d4aa..98bed60f561 100644
--- a/tests/wpt/metadata/webdriver/tests/find_element_from_element/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_element_from_element/find.py.ini
@@ -59,12 +59,6 @@
[test_find_element_partial_link_text[PARTIAL LINK TEXT-LINK\]]
expected: FAIL
- [test_null_parameter_value]
- expected: FAIL
-
- [test_find_element[css selector-#linkText\]]
- expected: FAIL
-
[test_find_element_partial_link_text[partial link text-k t\]]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
index a3e6bd9473a..a0a124a2b28 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements/find.py.ini
@@ -5,9 +5,6 @@
[test_find_elements_link_text[LINK TEXT-LINK TEXT\]]
expected: FAIL
- [test_find_elements[css selector-#linkText\]]
- expected: FAIL
-
[test_htmldocument[tag name-html\]]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
index 6daa768b54f..c3100b33708 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_element/find.py.ini
@@ -1,19 +1,16 @@
[find.py]
- [test_xhtml_namespace[css selector-#linkText\]]
- expected: FAIL
-
[test_find_elements_link_text[LINK TEXT-LINK TEXT\]]
expected: FAIL
- [test_find_elements[css selector-#linkText\]]
- expected: FAIL
-
[test_find_elements_link_text[link text-link text\]]
expected: FAIL
[test_xhtml_namespace[xpath-//*[name()='a'\]\]]
expected: FAIL
+ [test_xhtml_namespace[css selector-#linkText\]]
+ expected: FAIL
+
[test_find_elements[link text-full link text\]]
expected: FAIL
@@ -50,9 +47,6 @@
[test_no_element[css selector-#wontExist\]]
expected: FAIL
- [test_null_parameter_value]
- expected: FAIL
-
[test_find_elements_partial_link_text[partial link&text-k&t\]]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_attribute/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_attribute/get.py.ini
index 144ef928802..21ecdc958e7 100644
--- a/tests/wpt/metadata/webdriver/tests/get_element_attribute/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_element_attribute/get.py.ini
@@ -35,9 +35,6 @@
[test_boolean_attribute[audio-attrs0\]]
expected: FAIL
- [test_element_stale]
- expected: FAIL
-
[test_normal]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_css_value/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_css_value/get.py.ini
index f86f4977da2..e047bc69437 100644
--- a/tests/wpt/metadata/webdriver/tests/get_element_css_value/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_element_css_value/get.py.ini
@@ -1,16 +1,7 @@
[get.py]
- [test_property_name_not_existent]
- expected: FAIL
-
[test_element_not_found]
expected: FAIL
- [test_element_stale]
- expected: FAIL
-
- [test_property_name_value]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_rect/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_rect/get.py.ini
index ff4d74a2a23..e047bc69437 100644
--- a/tests/wpt/metadata/webdriver/tests/get_element_rect/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_element_rect/get.py.ini
@@ -2,12 +2,6 @@
[test_element_not_found]
expected: FAIL
- [test_element_stale]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
- [test_basic]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_tag_name/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_tag_name/get.py.ini
index fe4e2817d17..624ec583ae8 100644
--- a/tests/wpt/metadata/webdriver/tests/get_element_tag_name/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_element_tag_name/get.py.ini
@@ -2,9 +2,6 @@
[test_element_not_found]
expected: FAIL
- [test_element_stale]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
diff --git a/tests/wpt/metadata/webdriver/tests/get_element_text/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_element_text/get.py.ini
index bcf2a659532..91db3bd49f6 100644
--- a/tests/wpt/metadata/webdriver/tests/get_element_text/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_element_text/get.py.ini
@@ -5,6 +5,3 @@
[test_no_browsing_context]
expected: ERROR
- [test_read_element_text]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/get_named_cookie/get.py.ini b/tests/wpt/metadata/webdriver/tests/get_named_cookie/get.py.ini
index b1ddb5dcfc3..275525ea8c0 100644
--- a/tests/wpt/metadata/webdriver/tests/get_named_cookie/get.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/get_named_cookie/get.py.ini
@@ -2,9 +2,6 @@
[test_no_browsing_context]
expected: ERROR
- [test_duplicated_cookie]
- expected: FAIL
-
[test_get_named_cookie]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/is_element_enabled/enabled.py.ini b/tests/wpt/metadata/webdriver/tests/is_element_enabled/enabled.py.ini
index 2f0dd2560bf..3b89f0491a2 100644
--- a/tests/wpt/metadata/webdriver/tests/is_element_enabled/enabled.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/is_element_enabled/enabled.py.ini
@@ -1,106 +1,4 @@
[enabled.py]
- [test_xhtml_form_control_enabled[input\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant[button\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant_legend[input\]]
- expected: FAIL
-
- [test_xhtml_form_control_enabled[textarea\]]
- expected: FAIL
-
- [test_form_control_disabled[textarea\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant_legend[button\]]
- expected: FAIL
-
- [test_xhtml_form_control_disabled[button\]]
- expected: FAIL
-
- [test_form_control_enabled[select\]]
- expected: FAIL
-
- [test_xhtml_form_control_disabled[textarea\]]
- expected: FAIL
-
- [test_xhtml_form_control_disabled[select\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant_legend[select\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant[input\]]
- expected: FAIL
-
- [test_xhtml_form_control_enabled[select\]]
- expected: FAIL
-
- [test_form_control_disabled[select\]]
- expected: FAIL
-
- [test_form_control_enabled[input\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant_legend[input\]]
- expected: FAIL
-
- [test_form_control_enabled[button\]]
- expected: FAIL
-
- [test_xml_always_not_enabled]
- expected: FAIL
-
- [test_fieldset_enabled_descendant[select\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant_legend[textarea\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant[textarea\]]
- expected: FAIL
-
- [test_element_stale]
- expected: FAIL
-
- [test_fieldset_enabled_descendant[input\]]
- expected: FAIL
-
- [test_form_control_enabled[textarea\]]
- expected: FAIL
-
- [test_form_control_disabled[button\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant[select\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant[button\]]
- expected: FAIL
-
- [test_xhtml_form_control_enabled[button\]]
- expected: FAIL
-
- [test_form_control_disabled[input\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant_legend[button\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant_legend[textarea\]]
- expected: FAIL
-
- [test_fieldset_disabled_descendant[textarea\]]
- expected: FAIL
-
- [test_fieldset_enabled_descendant_legend[select\]]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
- [test_xhtml_form_control_disabled[input\]]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/is_element_selected/selected.py.ini b/tests/wpt/metadata/webdriver/tests/is_element_selected/selected.py.ini
index b7177fe1960..d934be8d803 100644
--- a/tests/wpt/metadata/webdriver/tests/is_element_selected/selected.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/is_element_selected/selected.py.ini
@@ -1,19 +1,4 @@
[selected.py]
- [test_checkbox_not_selected]
- expected: FAIL
-
- [test_element_stale]
- expected: FAIL
-
- [test_element_selected]
- expected: FAIL
-
- [test_element_checked]
- expected: FAIL
-
- [test_element_not_selected]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
diff --git a/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini b/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
index 3b9d2fd022d..3d9deb34a25 100644
--- a/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/set_window_rect/set.py.ini
@@ -41,6 +41,3 @@
[test_height_width_larger_than_max]
expected: FAIL
- [test_negative_x_y]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/cross_origin.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/cross_origin.py.ini
deleted file mode 100644
index 7843483433e..00000000000
--- a/tests/wpt/metadata/webdriver/tests/switch_to_frame/cross_origin.py.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[cross_origin.py]
- [test_nested_cross_origin_iframe]
- expected: FAIL
-
- [test_cross_origin_iframe]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
index db49df7d2e7..0f50b6c34de 100644
--- a/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_frame/switch.py.ini
@@ -5,15 +5,9 @@
[test_frame_id_webelement_frame[1-bar\]]
expected: FAIL
- [test_frame_id_webelement_iframe[1-bar\]]
- expected: FAIL
-
[test_frame_id_webelement_frame[0-foo\]]
expected: FAIL
- [test_frame_id_webelement_iframe[0-foo\]]
- expected: FAIL
-
[test_frame_id_webelement_no_element_reference]
expected: FAIL
@@ -23,9 +17,6 @@
[test_frame_id_number_index[0-foo\]]
expected: FAIL
- [test_frame_id_null]
- expected: FAIL
-
[test_frame_id_webelement_stale_reference]
expected: FAIL
diff --git a/tests/wpt/metadata/webdriver/tests/switch_to_parent_frame/switch.py.ini b/tests/wpt/metadata/webdriver/tests/switch_to_parent_frame/switch.py.ini
index 4f41b0cf3ec..9299f6675f0 100644
--- a/tests/wpt/metadata/webdriver/tests/switch_to_parent_frame/switch.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/switch_to_parent_frame/switch.py.ini
@@ -1,10 +1,4 @@
[switch.py]
- [test_null_response_value]
- expected: FAIL
-
[test_no_browsing_context]
expected: ERROR
- [test_stale_element_from_iframe]
- expected: FAIL
-