From 48ac95c1711ba001c83476bff6c257e613a7ff62 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Wed, 15 Apr 2015 16:00:41 +0200
Subject: [PATCH] Move content tests into the Servo wpt tree (fixes #5686).

---
 tests/content/test_DOMParser.html             |  11 -
 tests/content/test_Event.html                 |  16 -
 tests/content/test_MouseEvent.html            |  16 -
 tests/content/test_blob.html                  |  43 --
 tests/content/test_body_listener.html         |  19 -
 tests/content/test_characterdata.html         |  44 --
 tests/content/test_click_prevent.html         |  18 -
 tests/content/test_collections.html           | 143 -----
 tests/content/test_create_element.html        |  18 -
 tests/content/test_documentElement.html       |  12 -
 .../content/test_document_activeElement.html  |  18 -
 tests/content/test_document_body.html         |  71 ---
 tests/content/test_document_characterSet.html |  19 -
 .../test_document_characterSet_default.html   |  13 -
 .../test_document_characterSet_invalid.html   |  13 -
 .../test_document_compatMode_loose.html       |  12 -
 .../test_document_compatMode_strict.html      |  12 -
 tests/content/test_document_contenttype.html  |  20 -
 .../test_document_datalist_options.html       |  19 -
 tests/content/test_document_defaultView.html  |  10 -
 .../test_document_getElementsByName.html      |  14 -
 tests/content/test_document_head.html         |  45 --
 .../content/test_document_implementation.html |  79 ---
 tests/content/test_document_readystate.html   |  16 -
 .../content/test_document_set_node_value.html |  18 -
 .../test_document_title_nontextchildren.html  |   8 -
 tests/content/test_document_url.html          |  30 --
 tests/content/test_domtokenlist.html          |  43 --
 tests/content/test_element_attribute.html     |  64 ---
 tests/content/test_element_classList.html     |  19 -
 tests/content/test_element_matches.html       |  16 -
 tests/content/test_empty_clientrect.html      |  17 -
 tests/content/test_event_dispatch.html        |  49 --
 .../content/test_event_dispatch_dynamic.html  |  20 -
 tests/content/test_event_dispatch_order.html  |  41 --
 .../test_event_handler_syntax_error.html      |  21 -
 tests/content/test_focus_blur.html            |  25 -
 tests/content/test_getBoundingClientRect.html |  34 --
 tests/content/test_global.html                |  12 -
 .../test_htmlfieldsetelement_elements.html    |  44 --
 .../content/test_iframe_contentDocument.html  |  27 -
 tests/content/test_img_width_height.html      |  33 --
 tests/content/test_inline_event_handler.html  |  10 -
 tests/content/test_lenient_this.html          |  26 -
 tests/content/test_load_event.html            |  36 --
 tests/content/test_navigator.html             |  20 -
 .../test_node_compareDocumentPosition.html    |  35 --
 tests/content/test_node_contains.html         |  23 -
 tests/content/test_node_insertBefore.html     |  23 -
 tests/content/test_node_isEqualNode.html      |  37 --
 tests/content/test_node_normalize.html        |  33 --
 tests/content/test_node_replaceChild.html     |  50 --
 .../test_parentNode_querySelector.html        |  69 ---
 tests/content/test_parentnodes.html           |  23 -
 tests/content/test_proxy_setter.html          |  13 -
 tests/content/test_textcontent.html           |  16 -
 tests/content/test_title.html                 |  11 -
 tests/content/test_trace_null.html            |   6 -
 tests/content/test_union.html                 |  24 -
 tests/content/test_window.html                |  12 -
 tests/content/test_window_performance.html    |  27 -
 tests/content/test_window_setInterval.html    |  20 -
 tests/content/test_windowproxy.html           |  23 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 487 +++++++++++++++++-
 .../enabled_disabled_selectors.html.ini       |   5 +
 .../mozilla/meta/mozilla/windowproxy.html.ini |   5 +
 .../wpt/mozilla/tests/mozilla/DOMParser.html  |  14 +
 tests/wpt/mozilla/tests/mozilla/Event.html    |  19 +
 .../wpt/mozilla/tests/mozilla/MouseEvent.html |  19 +
 tests/wpt/mozilla/tests/mozilla/blob.html     |  46 ++
 .../mozilla/tests/mozilla/body_listener.html  |  20 +
 .../mozilla/tests/mozilla/caption.html}       |  13 +-
 .../mozilla/tests/mozilla/characterdata.html  |  47 ++
 .../mozilla/tests/mozilla/click_prevent.html  |  17 +
 .../mozilla/tests/mozilla/collections.html    | 149 ++++++
 .../tests/mozilla/createElement_script.html}  |  10 +-
 .../mozilla/tests/mozilla/create_element.html |  21 +
 .../tests/mozilla/documentElement.html        |  15 +
 .../tests/mozilla/document_activeElement.html |  21 +
 .../mozilla/tests/mozilla/document_body.html  |  66 +++
 .../tests/mozilla/document_characterSet.html  |  19 +
 .../document_characterSet_default.html        |  12 +
 .../document_characterSet_invalid.html        |  13 +
 .../mozilla/document_compatMode_loose.html    |  12 +
 .../mozilla/document_compatMode_strict.html   |  12 +
 .../tests/mozilla/document_contenttype.html   |  19 +
 .../mozilla/document_datalist_options.html    |  22 +
 .../tests/mozilla/document_defaultView.html   |  13 +
 .../mozilla/document_getElementById.html}     |   7 +-
 .../mozilla/document_getElementsByName.html   |  17 +
 .../mozilla/tests/mozilla/document_head.html  |  43 ++
 .../tests/mozilla/document_images_cache.html} |  13 +-
 .../mozilla/document_implementation.html      |  76 +++
 .../tests/mozilla/document_links_cache.html}  |  23 +-
 .../tests/mozilla/document_readystate.html    |  21 +
 .../mozilla/document_set_node_value.html      |  21 +
 .../document_title_nontextchildren.html       |  11 +
 .../mozilla/tests/mozilla/document_url.html   |  28 +
 .../mozilla/tests/mozilla/domtokenlist.html   |  46 ++
 .../tests/mozilla/element_attribute.html      |  67 +++
 .../tests/mozilla/element_attributes.html}    |  11 +-
 .../tests/mozilla/element_classList.html      |  22 +
 .../tests/mozilla/element_className.html}     |  23 +-
 .../tests/mozilla/element_matches.html        |  19 +
 .../tests/mozilla/empty_clientrect.html       |  20 +
 .../mozilla/enabled_disabled_selectors.html}  |  48 +-
 .../mozilla/tests/mozilla/event_dispatch.html |  52 ++
 .../tests/mozilla/event_dispatch_dynamic.html |  23 +
 .../tests/mozilla/event_dispatch_order.html   |  44 ++
 .../mozilla/event_handler_syntax_error.html   |  24 +
 .../tests/mozilla/event_listener.html}        |  13 +-
 .../wpt/mozilla/tests/mozilla/focus_blur.html |  28 +
 .../tests/mozilla/getBoundingClientRect.html  |  37 ++
 .../tests/mozilla/getPropertyPriority.html}   |   7 +-
 tests/wpt/mozilla/tests/mozilla/global.html   |  16 +
 .../tests/mozilla/htmlcollection.html}        |  96 ++--
 .../mozilla/htmlfieldsetelement_elements.html |  47 ++
 .../tests/mozilla/htmlspacechars.html}        |   9 +-
 .../tests/mozilla/iframe_contentDocument.html |  28 +
 .../tests/mozilla/img_width_height.html       |  33 ++
 .../tests/mozilla/inline_event_handler.html   |  11 +
 .../mozilla/tests/mozilla/innerHTML.html}     |   7 +-
 .../mozilla/tests/mozilla/interfaces.html}    |  44 +-
 .../mozilla/tests/mozilla/lenient_this.html   |  22 +
 .../wpt/mozilla/tests/mozilla/load_event.html |  32 ++
 .../wpt/mozilla/tests/mozilla/navigator.html  |  23 +
 .../tests/mozilla/node_cloneNode.html}        |  81 ++-
 .../mozilla/node_compareDocumentPosition.html |  36 ++
 .../mozilla/tests/mozilla/node_contains.html  |  23 +
 .../tests/mozilla/node_insertBefore.html      |  23 +
 .../tests/mozilla/node_isEqualNode.html       |  36 ++
 .../mozilla/tests/mozilla/node_normalize.html |  35 ++
 .../tests/mozilla/node_replaceChild.html      |  48 ++
 .../mozilla/parentNode_querySelector.html     |  71 +++
 .../mozilla/parentNode_querySelectorAll.html} |  35 +-
 .../mozilla/tests/mozilla/parentnodes.html    |  26 +
 .../mozilla/tests/mozilla/proxy_setter.html   |  16 +
 .../iframe_contentDocument_inner.html         |   0
 .../mozilla/tests/mozilla/script_type.html}   |  16 +-
 .../mozilla/tests/mozilla/storage.html}       |   5 +-
 .../mozilla/tests/mozilla}/test.jpg           | Bin
 .../mozilla/tests/mozilla}/test.png           | Bin
 .../mozilla/tests/mozilla/textcontent.html    |  19 +
 tests/wpt/mozilla/tests/mozilla/title.html    |  14 +
 .../wpt/mozilla/tests/mozilla/trace_null.html |   9 +
 tests/wpt/mozilla/tests/mozilla/union.html    |  24 +
 tests/wpt/mozilla/tests/mozilla/window.html   |  15 +
 .../tests/mozilla/window_performance.html     |  30 ++
 .../tests/mozilla/window_setInterval.html     |  22 +
 .../mozilla/tests/mozilla/windowproxy.html    |  28 +
 150 files changed, 2617 insertions(+), 1962 deletions(-)
 delete mode 100644 tests/content/test_DOMParser.html
 delete mode 100644 tests/content/test_Event.html
 delete mode 100644 tests/content/test_MouseEvent.html
 delete mode 100644 tests/content/test_blob.html
 delete mode 100644 tests/content/test_body_listener.html
 delete mode 100644 tests/content/test_characterdata.html
 delete mode 100644 tests/content/test_click_prevent.html
 delete mode 100644 tests/content/test_collections.html
 delete mode 100644 tests/content/test_create_element.html
 delete mode 100644 tests/content/test_documentElement.html
 delete mode 100644 tests/content/test_document_activeElement.html
 delete mode 100644 tests/content/test_document_body.html
 delete mode 100644 tests/content/test_document_characterSet.html
 delete mode 100644 tests/content/test_document_characterSet_default.html
 delete mode 100644 tests/content/test_document_characterSet_invalid.html
 delete mode 100644 tests/content/test_document_compatMode_loose.html
 delete mode 100644 tests/content/test_document_compatMode_strict.html
 delete mode 100644 tests/content/test_document_contenttype.html
 delete mode 100644 tests/content/test_document_datalist_options.html
 delete mode 100644 tests/content/test_document_defaultView.html
 delete mode 100644 tests/content/test_document_getElementsByName.html
 delete mode 100644 tests/content/test_document_head.html
 delete mode 100644 tests/content/test_document_implementation.html
 delete mode 100644 tests/content/test_document_readystate.html
 delete mode 100644 tests/content/test_document_set_node_value.html
 delete mode 100644 tests/content/test_document_title_nontextchildren.html
 delete mode 100644 tests/content/test_document_url.html
 delete mode 100644 tests/content/test_domtokenlist.html
 delete mode 100644 tests/content/test_element_attribute.html
 delete mode 100644 tests/content/test_element_classList.html
 delete mode 100644 tests/content/test_element_matches.html
 delete mode 100644 tests/content/test_empty_clientrect.html
 delete mode 100644 tests/content/test_event_dispatch.html
 delete mode 100644 tests/content/test_event_dispatch_dynamic.html
 delete mode 100644 tests/content/test_event_dispatch_order.html
 delete mode 100644 tests/content/test_event_handler_syntax_error.html
 delete mode 100644 tests/content/test_focus_blur.html
 delete mode 100644 tests/content/test_getBoundingClientRect.html
 delete mode 100644 tests/content/test_global.html
 delete mode 100644 tests/content/test_htmlfieldsetelement_elements.html
 delete mode 100644 tests/content/test_iframe_contentDocument.html
 delete mode 100644 tests/content/test_img_width_height.html
 delete mode 100644 tests/content/test_inline_event_handler.html
 delete mode 100644 tests/content/test_lenient_this.html
 delete mode 100644 tests/content/test_load_event.html
 delete mode 100644 tests/content/test_navigator.html
 delete mode 100644 tests/content/test_node_compareDocumentPosition.html
 delete mode 100644 tests/content/test_node_contains.html
 delete mode 100644 tests/content/test_node_insertBefore.html
 delete mode 100644 tests/content/test_node_isEqualNode.html
 delete mode 100644 tests/content/test_node_normalize.html
 delete mode 100644 tests/content/test_node_replaceChild.html
 delete mode 100644 tests/content/test_parentNode_querySelector.html
 delete mode 100644 tests/content/test_parentnodes.html
 delete mode 100644 tests/content/test_proxy_setter.html
 delete mode 100644 tests/content/test_textcontent.html
 delete mode 100644 tests/content/test_title.html
 delete mode 100644 tests/content/test_trace_null.html
 delete mode 100644 tests/content/test_union.html
 delete mode 100644 tests/content/test_window.html
 delete mode 100644 tests/content/test_window_performance.html
 delete mode 100644 tests/content/test_window_setInterval.html
 delete mode 100644 tests/content/test_windowproxy.html
 create mode 100644 tests/wpt/mozilla/meta/mozilla/enabled_disabled_selectors.html.ini
 create mode 100644 tests/wpt/mozilla/meta/mozilla/windowproxy.html.ini
 create mode 100644 tests/wpt/mozilla/tests/mozilla/DOMParser.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/Event.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/MouseEvent.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/blob.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/body_listener.html
 rename tests/{content/test_caption.html => wpt/mozilla/tests/mozilla/caption.html} (58%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/characterdata.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/click_prevent.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/collections.html
 rename tests/{content/test_createElement_script.html => wpt/mozilla/tests/mozilla/createElement_script.html} (57%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/create_element.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/documentElement.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_activeElement.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_body.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_characterSet.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_characterSet_default.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_characterSet_invalid.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_compatMode_loose.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_compatMode_strict.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_contenttype.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_datalist_options.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_defaultView.html
 rename tests/{content/test_document_getElementById.html => wpt/mozilla/tests/mozilla/document_getElementById.html} (77%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_getElementsByName.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_head.html
 rename tests/{content/test_document_images_cache.html => wpt/mozilla/tests/mozilla/document_images_cache.html} (56%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_implementation.html
 rename tests/{content/test_document_links_cache.html => wpt/mozilla/tests/mozilla/document_links_cache.html} (58%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_readystate.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_set_node_value.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_title_nontextchildren.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/document_url.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/domtokenlist.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/element_attribute.html
 rename tests/{content/test_element_attributes.html => wpt/mozilla/tests/mozilla/element_attributes.html} (50%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/element_classList.html
 rename tests/{content/test_element_className.html => wpt/mozilla/tests/mozilla/element_className.html} (52%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/element_matches.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/empty_clientrect.html
 rename tests/{content/test_enabled_disabled_selectors.html => wpt/mozilla/tests/mozilla/enabled_disabled_selectors.html} (81%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/event_dispatch.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/event_dispatch_dynamic.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/event_dispatch_order.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/event_handler_syntax_error.html
 rename tests/{content/test_event_listener.html => wpt/mozilla/tests/mozilla/event_listener.html} (76%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/focus_blur.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
 rename tests/{content/test_getPropertyPriority.html => wpt/mozilla/tests/mozilla/getPropertyPriority.html} (76%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/global.html
 rename tests/{content/test_htmlcollection.html => wpt/mozilla/tests/mozilla/htmlcollection.html} (50%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/htmlfieldsetelement_elements.html
 rename tests/{content/test_htmlspacechars.html => wpt/mozilla/tests/mozilla/htmlspacechars.html} (68%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/img_width_height.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/inline_event_handler.html
 rename tests/{content/test_innerHTML.html => wpt/mozilla/tests/mozilla/innerHTML.html} (55%)
 rename tests/{content/test_interfaces.html => wpt/mozilla/tests/mozilla/interfaces.html} (78%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/lenient_this.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/load_event.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/navigator.html
 rename tests/{content/test_node_cloneNode.html => wpt/mozilla/tests/mozilla/node_cloneNode.html} (86%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_compareDocumentPosition.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_contains.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_insertBefore.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_isEqualNode.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_normalize.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/node_replaceChild.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/parentNode_querySelector.html
 rename tests/{content/test_parentNode_querySelectorAll.html => wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html} (59%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/parentnodes.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/proxy_setter.html
 rename tests/{content => wpt/mozilla/tests/mozilla}/resources/iframe_contentDocument_inner.html (100%)
 rename tests/{content/test_script_type.html => wpt/mozilla/tests/mozilla/script_type.html} (86%)
 rename tests/{content/test_storage.html => wpt/mozilla/tests/mozilla/storage.html} (62%)
 rename tests/{content => wpt/mozilla/tests/mozilla}/test.jpg (100%)
 rename tests/{content => wpt/mozilla/tests/mozilla}/test.png (100%)
 create mode 100644 tests/wpt/mozilla/tests/mozilla/textcontent.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/title.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/trace_null.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/union.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/window.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/window_performance.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/window_setInterval.html
 create mode 100644 tests/wpt/mozilla/tests/mozilla/windowproxy.html

diff --git a/tests/content/test_DOMParser.html b/tests/content/test_DOMParser.html
deleted file mode 100644
index 1928863d8d5..00000000000
--- a/tests/content/test_DOMParser.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-is_function(DOMParser, "DOMParser");
-let parser = new DOMParser();
-is_a(parser, DOMParser);
-is_a(parser.parseFromString("", "text/html"), Document);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_Event.html b/tests/content/test_Event.html
deleted file mode 100644
index 267983f59ef..00000000000
--- a/tests/content/test_Event.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-is_function(Event, "Event");
-
-let ev = new Event("foopy", {cancelable: true});
-is_a(ev, Event);
-
-is(ev.type, 'foopy');
-is(ev.defaultPrevented, false);
-ev.preventDefault();
-is(ev.defaultPrevented, true);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_MouseEvent.html b/tests/content/test_MouseEvent.html
deleted file mode 100644
index 89173bbe6cc..00000000000
--- a/tests/content/test_MouseEvent.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-is_function(MouseEvent, "MouseEvent");
-
-let ev = new MouseEvent("press", {bubbles: true, screenX: 150, detail: 100});
-
-is_a(ev, Event);
-is_a(ev, UIEvent);
-is_a(ev, MouseEvent);
-is(ev.screenX, 150);
-is(ev.detail, 100);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_blob.html b/tests/content/test_blob.html
deleted file mode 100644
index a9d5d69098d..00000000000
--- a/tests/content/test_blob.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-  <head>
-    <script src="harness.js"></script>
-    <script>
-      var testData = ['<a id="a"><b id="b">hey!</b></a>'];
-      var b = new Blob(testData); // the blob
-      is(b.size, 32);
-      is(b.type, "");
-
-      var bs = b.slice(0, 5);
-      is(bs.size, 5);
-      is(b.type, "");
-
-      var bc = new Blob(testData, {type:"text/plain"}); // the blob
-      is(bc.size, 32);
-      is(bc.type, "text/plain");
-
-      var bss = new Blob(testData, {type:" text/plain "}); // spaces
-      is(bss.size, 32);
-      is(bss.type, " text/plain ");
-
-      var bcs = bc.slice(0, 7);
-      is(bcs.size, 7);
-      is(bcs.type, "");
-
-      var bcsc = bc.slice(0, 7, "text/xml");
-      is(bcsc.size, 7);
-      is(bcsc.type, "text/xml");
-
-      var bu = new Blob(testData, {type:"TEXT/PLAIN"}); // the blob
-      is(bu.size, 32);
-      is(bu.type, "text/plain");
-
-      var bj = new Blob(testData, {type:"☃"}); // the blob
-      is(bj.size, 32);
-      is(bj.type, "");
-
-      var bjs = bj.slice(0, 7, "☃");
-      is(bjs.size, 7);
-      is(bjs.type, "");
-    </script>
-  </head>
-</html>
diff --git a/tests/content/test_body_listener.html b/tests/content/test_body_listener.html
deleted file mode 100644
index 03dd253c47d..00000000000
--- a/tests/content/test_body_listener.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-  waitForExplicitFinish();
-  function check_onload(listener) {
-    is(listener, window);
-    var ev = new Event('click', {bubbles: true, cancelable: true});
-    document.body.dispatchEvent(ev);
-  }
-  function check_onclick(listener) {
-    is(listener, document.body);
-    finish();
-  }
-</script>
-</head>
-<body onload="check_onload(this)" onclick="check_onclick(this)">
-</body>
-</html>
diff --git a/tests/content/test_characterdata.html b/tests/content/test_characterdata.html
deleted file mode 100644
index 7fde5c5f28b..00000000000
--- a/tests/content/test_characterdata.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-  <head>
-    <script src="harness.js"></script>
-  </head>
-  <body>
-    <p>This is the character data</p>
-  </body>
-  <script>
-    var a = document.getElementsByTagName('p')[0].childNodes[0];
-    is(a.data, "This is the character data");
-    // append test utf8
-    a.appendData(", append more 資料，測試資料");
-    is(a.data, "This is the character data, append more 資料，測試資料");
-
-    // length test utf8
-    is(a.length, 47);
-
-    // insert test non-utf8
-    a.insertData(26, " test");
-    is(a.data, "This is the character data test, append more 資料，測試資料");
-    // insert test utf8
-    a.insertData(48, "更多");
-    is(a.data, "This is the character data test, append more 資料，更多測試資料");
-
-    // delete test non-utf8
-    a.deleteData(40, 5);
-    is(a.data, "This is the character data test, append 資料，更多測試資料");
-    // delete test utf8
-    a.deleteData(45, 2);
-    is(a.data, "This is the character data test, append 資料，更多資料");
-
-    // replace test non-utf8
-    a.replaceData(33, 6, "other");
-    is(a.data, "This is the character data test, other 資料，更多資料");
-    // replace test non-utf8
-    a.replaceData(44, 2, "文字");
-    is(a.data, "This is the character data test, other 資料，更多文字");
-
-    // substring test non-utf8
-    is(a.substringData(12, 4), "char");
-    // substring test utf8
-    is(a.substringData(39, 2), "資料");
-  </script>
-</html>
diff --git a/tests/content/test_click_prevent.html b/tests/content/test_click_prevent.html
deleted file mode 100644
index 1636080e0af..00000000000
--- a/tests/content/test_click_prevent.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-<script src="./harness.js"></script>
-<a id="foo" href="/nonexistent">test link</a>
-<script>
-var link = document.getElementById('foo');
-link.addEventListener('click', function(ev) {
-  ev.preventDefault();
-});
-var ev = new Event('click', {bubbles: true, cancelable: true});
-link.dispatchEvent(ev);
-setTimeout(function() {
-  is(true, true, "load probably would have occurred by now");
-  finish();
-}, 500);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_collections.html b/tests/content/test_collections.html
deleted file mode 100644
index ce32d838664..00000000000
--- a/tests/content/test_collections.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<html>
-<head>
-<meta charset="utf-8">
-<title>test_binding
-    page  </title>
-<base href="./"></base>
-<script src="harness.js"></script>
-</head>
-<body>
-
-<div id="first" name="test">fffff<br><br><br><br>fffffffffffffffff</div>
-<div id="second">ggg</div>
-<span id="third" name="test">hhhhhhhh</span>
-<div id="fourth">iiiiiiiiiiiiiiiiiii</div>
-<a href="http://www.mozilla.org"></a>
-<img src="test.jpg"/>
-<embed></embed>
-<form>
-  <fieldset>
-    <legend>legend</legend>
-    <label for="">label<input type="text" value="input" /></label>
-  </fieldset>
-</form>
-<hr />
-<canvas/>
-<p>pppppppppp</p>
-<q>qqqqqqqqqqqqqqqqqqqqqqqqqqq</q>
-<progress max="100" value="80">80%</progress>
-<applet></applet>
-<input type="text" value="input"/>
-<iframe></iframe>
-<ol type="1">
-  <li>li</li>
-</ol>
-<table>
-  <caption>sample table</caption>
-  <colgroup>
-    <col/>
-  </colgroup>
-  <tbody>
-    <tr><th>head</th></tr>
-    <tr><td>data</td></tr>
-  </tbody>
-</table>
-<section>section</section>
-<aside>aside</aside>
-<b>b</b>
-<i>i</i>
-<small>small</small>
-<textarea>textarea</textarea>
-<time datetime="2014-02-14">Valentines day</time>
-<area></area>
-<data></data>
-<dialog></dialog>
-<template></template>
-<pre>pre</pre>
-<audio>
-  <source src="horse.ogg" type="audio/ogg">
-  <source src="horse.mp3" type="audio/mpeg">
-</audio>
-<video src="">
-  <track></track>
-</video>
-
-<foo-á>hi</foo-á>
-
-<script>
-function check_collection(obj, num, classes, name) {
-    is_a(obj, HTMLCollection);
-    is(obj.length, num);
-    is(obj[obj.length], undefined);
-
-    if (classes === undefined)
-        return;
-
-    classes = [Element, HTMLElement].concat(classes);
-
-    for (var i=0; i<obj.length; i++) {
-        is_not(obj[i], undefined);
-        is(obj[i].tagName, name);
-        for (var j=0; j<classes.length; j++) {
-            is_a(obj[i], classes[j]);
-        }
-    }
-}
-
-function check_tag(tagname, num, classes, tagname_upper) {
-    if (tagname_upper === undefined)
-        tagname_upper = tagname.toUpperCase();
-    check_collection(document.getElementsByTagName(tagname), num, classes, tagname_upper);
-}
-
-check_collection(document.links,   1, [HTMLAnchorElement], "A");
-check_collection(document.images,  1, [HTMLImageElement],  "IMG");
-check_collection(document.embeds,  1, [HTMLEmbedElement],  "EMBED");
-check_collection(document.plugins, 1, [HTMLEmbedElement],  "EMBED");
-check_collection(document.scripts, 2, [HTMLScriptElement], "SCRIPT");
-check_collection(document.applets, 1, [HTMLAppletElement], "APPLET");
-check_collection(document.forms,   1, [HTMLFormElement],   "FORM");
-
-check_collection(document.getElementsByTagName("nosuchtag"), 0);
-
-check_tag("section",  1, []);
-check_tag("aside",    1, []);
-check_tag("b",        1, []);
-check_tag("i",        1, []);
-check_tag("small",    1, []);
-check_tag("head",     1, [HTMLHeadElement]);
-check_tag("div",      3, [HTMLDivElement]);
-check_tag("iframe",   1, [HTMLIFrameElement]);
-check_tag("body",     1, [HTMLBodyElement]);
-check_tag("area",     1, [HTMLAreaElement]);
-check_tag("base",     1, [HTMLBaseElement]);
-check_tag("data",     1, [HTMLDataElement]);
-check_tag("dialog",   1, [HTMLDialogElement]);
-check_tag("ol",       1, [HTMLOListElement]);
-check_tag("canvas",   1, [HTMLCanvasElement]);
-check_tag("source",   2, [HTMLSourceElement]);
-check_tag("time",     1, [HTMLTimeElement]);
-check_tag("caption",  1, [HTMLTableCaptionElement]);
-check_tag("textarea", 1, [HTMLTextAreaElement]);
-check_tag("q",        1, [HTMLQuoteElement]);
-check_tag("th",       1, [HTMLTableCellElement, HTMLTableHeaderCellElement]);
-check_tag("td",       1, [HTMLTableCellElement, HTMLTableDataCellElement]);
-check_tag("col",      1, [HTMLTableColElement]);
-check_tag("colgroup", 1, [HTMLTableColElement]);
-check_tag("input",    2, [HTMLInputElement]);
-check_tag("li",       1, [HTMLLIElement]);
-check_tag("progress", 1, [HTMLProgressElement]);
-check_tag("template", 1, [HTMLTemplateElement]);
-check_tag("pre",      1, [HTMLPreElement]);
-check_tag("legend",   1, [HTMLLegendElement]);
-check_tag("label",    1, [HTMLLabelElement]);
-check_tag("track",    1, [HTMLTrackElement]);
-check_tag("audio",    1, [HTMLMediaElement, HTMLAudioElement]);
-check_tag("video",    1, [HTMLMediaElement, HTMLVideoElement]);
-
-// Test non-ASCII tag names.  Uppercasing is ASCII-only per spec:
-// http://dom.spec.whatwg.org/#dom-element-tagname
-check_tag("foo-á", 1, [HTMLUnknownElement], "FOO-á");
-</script>
-</body>
-</html>
diff --git a/tests/content/test_create_element.html b/tests/content/test_create_element.html
deleted file mode 100644
index ede3e21814b..00000000000
--- a/tests/content/test_create_element.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-  <script>
-    var elem = document.createElement("foo");
-    is(elem.tagName, "FOO");
-    var elem = document.createElement("p");
-    is_a(elem, HTMLParagraphElement);
-    var elem = document.createElement("sPAn");
-    is_a(elem, HTMLSpanElement);
-    var text = document.createTextNode("hello");
-    is_a(text, Text);
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_documentElement.html b/tests/content/test_documentElement.html
deleted file mode 100644
index 4bb858e931e..00000000000
--- a/tests/content/test_documentElement.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-is_a(window, Window);
-is_a(document.documentElement, HTMLHtmlElement);
-is_a(document.documentElement.firstChild, HTMLHeadElement);
-is(document.documentElement.nextSibling, null);
-is_a(document, Document);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_document_activeElement.html b/tests/content/test_document_activeElement.html
deleted file mode 100644
index fee51456282..00000000000
--- a/tests/content/test_document_activeElement.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-    <head >
-        <title></title>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <input id="foo" type="text"></input>
-        <script>
-            is_not(document.activeElement, null, "test_1.1, document.activeElement");
-            is(document.activeElement, document.body, "test_1.2, document.activeElement");
-
-            document.getElementById('foo').focus();
-            is_not(document.activeElement, null, "test_2.1, document.activeElement");
-            is(document.activeElement, document.getElementById("foo"), "test_2.2, document.activeElement");
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_document_body.html b/tests/content/test_document_body.html
deleted file mode 100644
index ebe60a2ad93..00000000000
--- a/tests/content/test_document_body.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-    <head>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <script>
-            // test1: existing document's body
-            {
-                is_not(document.body, null, "test1-0, existing document's body");
-                is_a(document.body, HTMLBodyElement, "test1-1, exising document's body");
-                is(document.body && document.body.tagName, "BODY", "test1-2, existing document's body");
-            }
-
-            // test2: replace document's body with new body
-            {
-                let new_body = document.createElement("body");
-                is_not(new_body, null, "test2-0, replace document's body with new body");
-                document.body = new_body;
-                is(new_body, document.body, "test2-1, replace document's body with new body");
-            }
-
-            // test3: replace document's body with new frameset
-            {
-                let new_frameset = document.createElement("frameset");
-                is_not(new_frameset, null, "test2-0, replace document's body with new frameset");
-                document.body = new_frameset;
-                is(new_frameset, document.body, "test2-1, replace document's body with new frameset");
-            }
-
-            // test4: append an invalid element to a new document
-            {
-                let new_document = new Document();
-                new_document.appendChild(new_document.createElement("html"));
-                let new_div = new_document.createElement("div");
-
-                is_not(new_div, null, "test4-0, append an invalid element to a new document");
-
-                should_throw(function() {
-                    new_document.body = new_div;
-                });
-                is(new_document.body, null, "test4-1, append an invalid element to a new document");
-            }
-
-            // test5: append body to a new document
-            {
-                let new_document = document.implementation.createHTMLDocument();
-                let new_body = new_document.createElement("body");
-
-                is_not(new_body, null, "test5-0, append body to a new document");
-                is_a(new_body, HTMLBodyElement, "test5-1, append body to a new document");
-                is(new_body && new_body.tagName, "BODY", "test5-2, append body to a new document");
-
-                new_document.body = new_body;
-                is(new_document.body, new_body, "test5-3, append body to a new document");
-            }
-
-            // test6: append frameset to a new document
-            {
-                let new_document = document.implementation.createHTMLDocument();
-                let new_frameset = new_document.createElement("frameset");
-
-                is_not(new_frameset, null, "test6-0, append frameset to a new document");
-                is_a(new_frameset, HTMLFrameSetElement, "test6-1, append frameset to a new document");
-                is(new_frameset && new_frameset.tagName, "FRAMESET", "test6-2, append frameset to a new document");
-
-                new_document.body = new_frameset;
-                is(new_document.body, new_frameset, "test6-3, append frameset to a new document");
-            }
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_document_characterSet.html b/tests/content/test_document_characterSet.html
deleted file mode 100644
index 4e150c682e8..00000000000
--- a/tests/content/test_document_characterSet.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<meta charset="UTF-8">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: characterSet
-            {
-                is(document.characterSet, "UTF-8", "test1-0, characterSet");
-
-                var xmldoc = new Document;
-                is(xmldoc.characterSet, "UTF-8", "test2-1, characterSet");
-
-                var htmldoc = document.implementation.createHTMLDocument("title");
-                is(htmldoc.characterSet, "UTF-8", "test2-2, characterSet");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_characterSet_default.html b/tests/content/test_document_characterSet_default.html
deleted file mode 100644
index 2c234636519..00000000000
--- a/tests/content/test_document_characterSet_default.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: default characterSet
-            {
-                // FIXME: https://github.com/mozilla-servo/libhubbub/issues/5
-                is(document.characterSet, "UTF-8", "test1-0, default characterSet");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_characterSet_invalid.html b/tests/content/test_document_characterSet_invalid.html
deleted file mode 100644
index 15ab99519c2..00000000000
--- a/tests/content/test_document_characterSet_invalid.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<meta charset="unknown-charset">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: unknown charset
-            {
-                is(document.characterSet, "UTF-8", "test1-0, unknown charset");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_compatMode_loose.html b/tests/content/test_document_compatMode_loose.html
deleted file mode 100644
index da538636bb8..00000000000
--- a/tests/content/test_document_compatMode_loose.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: Loose HTML
-            {
-                is(document.compatMode, "BackCompat", "test1-0, Loose HTML");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_compatMode_strict.html b/tests/content/test_document_compatMode_strict.html
deleted file mode 100644
index b28816cc60f..00000000000
--- a/tests/content/test_document_compatMode_strict.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: Strict HTML
-            {
-                is(document.compatMode, "CSS1Compat", "test1-0, Strict HTML");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_contenttype.html b/tests/content/test_document_contenttype.html
deleted file mode 100644
index 73bf7f0217a..00000000000
--- a/tests/content/test_document_contenttype.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: HTML document
-            {
-                is_a(document, Document, "test1-0, HTML document");
-                is(document.contentType, "text/html", "test1-1, HTML document");
-            }
-
-            // test2: XML document
-            {
-                var doc = new Document;
-                is_a(doc, Document, "test2-0, XML document");
-                is(doc.contentType, "application/xml", "test2-1, XML document");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_datalist_options.html b/tests/content/test_document_datalist_options.html
deleted file mode 100644
index 140a253a761..00000000000
--- a/tests/content/test_document_datalist_options.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-  <head>
-    <script src="harness.js"></script>
-  </head>
-  <datalist id="id">
-    <option value="A">
-    <option value="B">
-    <p>P</p>
-    <div>DIV</div>
-    <option value="C">
-  </datalist>
-  <script>
-    var datalist = document.getElementById("id");
-    is(datalist.options.length, 3);
-    is_a(datalist.options[0], HTMLOptionElement);
-    is_a(datalist.options[1], HTMLOptionElement);
-    is_a(datalist.options[2], HTMLOptionElement);
-  </script>
-</html>
diff --git a/tests/content/test_document_defaultView.html b/tests/content/test_document_defaultView.html
deleted file mode 100644
index e5f6d36a433..00000000000
--- a/tests/content/test_document_defaultView.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-    <head>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <script>
-            is(document.defaultView, window);
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_document_getElementsByName.html b/tests/content/test_document_getElementsByName.html
deleted file mode 100644
index 6d45ed6c8bf..00000000000
--- a/tests/content/test_document_getElementsByName.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head >
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-  <div name="foo"></div>
-  <script>
-    let nameList = document.getElementsByName("foo");
-    is_a(nameList, NodeList);
-    is_not_a(nameList, HTMLCollection);
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_document_head.html b/tests/content/test_document_head.html
deleted file mode 100644
index 00cff0c885e..00000000000
--- a/tests/content/test_document_head.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-    <head>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <script>
-            // test1: existing document's head
-            {
-                is_not(document.head, null, "test1-0, existing document's head");
-                is_a(document.head, HTMLHeadElement, "test1-1, exising document's head");
-                is(document.head && document.head.tagName, "HEAD", "test1-2, existing document's head");
-            }
-
-            // test2: append head to a new document
-            {
-                let new_document = new Document();
-                new_document.appendChild(new_document.createElement("html"));
-                let new_head = new_document.createElement("head");
-
-                is_not(new_head, null, "test2-0, append head to a new document");
-                is_a(new_head, HTMLHeadElement, "test2-1, append head to a new document");
-                is(new_head && new_head.tagName, "head", "test2-2, append head to a new document");
-
-                // Document::head is read-only.
-                new_document.head = new_head;
-                is(new_document.head, null, "test2-3, append head to a new document");
-
-                new_document.documentElement.appendChild(new_head);
-                is(new_document.head, new_head, "test2-4, append head to a new document");
-            }
-
-            // test3: head's parent should be document element
-            {
-                let new_document = new Document();
-                let html = new_document.createElement("html");
-                let foo = new_document.createElement("foo");
-                let head = new_document.createElement("head");
-                new_document.appendChild(html);
-                html.appendChild(foo);
-                foo.appendChild(head);
-                is(new_document.head, null, "test3-0, head's parent should be document element");
-            }
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_document_implementation.html b/tests/content/test_document_implementation.html
deleted file mode 100644
index ac51b18f875..00000000000
--- a/tests/content/test_document_implementation.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: basic test
-            {
-                is_not(document.implementation, null, "test1-0, basic test");
-                is_a(document.implementation, DOMImplementation, "test1-1, basic test");
-
-                var implementation = document.implementation;
-                is(document.implementation, implementation, "test1-2, basic test");
-            }
-
-            // test2: createDocumentType
-            {
-                is(document.doctype, null, "test2-0, createDocumentType");
-
-                var doctype = document.implementation.createDocumentType("html", null, null);
-                is_a(doctype && doctype, DocumentType, "test2-1, createDocumentType");
-
-                doctype = document.implementation.createDocumentType("html:html", null, null);
-                is_a(doctype && doctype, DocumentType, "test2-2, createDocumentType");
-            }
-
-            // test3: createHTMLDocument
-            {
-                var htmldoc = document.implementation.createHTMLDocument("example title");
-                is_not(htmldoc, null, "test3-0, createHTMLDocument");
-                is_a(htmldoc, Document, "test3-1, createHTMLDocument");
-                is(htmldoc.childNodes.length, 2, "test3-3, createHTMLDocument");
-
-                is_a(htmldoc.doctype && htmldoc.doctype, DocumentType, "test3-4, createHTMLDocument");
-                is(htmldoc.doctype.name, "html", "test3-5, createHTMLDocument");
-
-                is_a(htmldoc.documentElement && htmldoc.documentElement, HTMLHtmlElement, "test3-6, createHTMLDocument");
-                is(htmldoc.documentElement.childNodes.length, 2, "test3-7, createHTMLDocument");
-                is(htmldoc.documentElement.tagName, "HTML", "test3-8, createHTMLDocument");
-
-                is_a(htmldoc.head && htmldoc.head, HTMLHeadElement, "test3-9, createHTMLDocument");
-                is(htmldoc.head.tagName, "HEAD", "test3-10, createHTMLDocument");
-                is(htmldoc.head, htmldoc.documentElement.childNodes[0], "test3-11, createHTMLDocument");
-                is(htmldoc.head.childNodes.length, 1, "test3-12, createHTMLDocument");
-
-                is_a(htmldoc.head.childNodes[0], HTMLTitleElement, "test3-13, createHTMLDocument");
-                is(htmldoc.head.childNodes[0].tagName, "TITLE", "test3-14, createHTMLDocument");
-                is(htmldoc.title, "example title", "test3-15, createHTMLDocument");
-
-                is_a(htmldoc.body && htmldoc.body, HTMLBodyElement, "test3-16, createHTMLDocument");
-                is(htmldoc.body.tagName, "BODY", "test3-17, createHTMLDocument");
-                is(htmldoc.body, htmldoc.documentElement.childNodes[1], "test3-18, createHTMLDocument");
-                is(htmldoc.body.childNodes.length, 0, "test3-19, createHTMLDocument");
-            }
-
-            // test4: createDocument
-            {
-                var doc = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', null);
-                is_not(doc, null, "test4-0, createDocument");
-                is_a(doc, Document, "test4-1, createDocument");
-                is(doc.childNodes.length, 1, "test4-2, createDocument");
-                is(doc.doctype, null, "test4-3, createDocument");
-                is_a(doc.documentElement, HTMLHtmlElement, "test4-4, createDocument");
-
-                var doctype = document.implementation.createDocumentType("html", null, null);
-                doc = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', doctype);
-                is(doc.childNodes.length, 2, "test4-5, createDocument");
-                is(doc.doctype, doctype, "test4-6, createDocument");
-                is_a(doc.documentElement, HTMLHtmlElement, "test4-7, createDocument");
-
-                doctype = document.implementation.createDocumentType(
-                    'svg:svg', '-//W3C//DTD SVG 1.1//EN',
-                    'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd');
-                doc = document.implementation.createDocument('http://www.w3.org/2000/svg', 'svg:svg', doctype);
-                is(doc.childNodes.length, 2, "test4-8, createDocument");
-                is(doc.doctype, doctype, "test4-9, createDocument");
-                is_a(doc.documentElement, Element, "test4-10, createDocument");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_readystate.html b/tests/content/test_document_readystate.html
deleted file mode 100644
index bf0066908f7..00000000000
--- a/tests/content/test_document_readystate.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-  <script src="harness.js"></script>
-</head>
-<body onload="is(document.readyState, 'complete'); is(gNumChanges, 2); finish()">
-  <script>
-    waitForExplicitFinish();
-
-    gNumChanges = 0;
-    document.addEventListener('readystatechange', function() {
-      gNumChanges++;
-    }, true);
-    is(document.readyState, "loading");
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_document_set_node_value.html b/tests/content/test_document_set_node_value.html
deleted file mode 100644
index 6aeb79bc5f7..00000000000
--- a/tests/content/test_document_set_node_value.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <script src="harness.js"></script>
-  <body>
-    <div id="div" class="div-class">A</div>
-    <p>P</p>
-    <script>
-      is(document.nodeValue, null);
-      var div = document.getElementById("div");
-      is(div.nodeValue, null);
-      is(div.firstChild.nodeValue, "A");
-      div.firstChild.nodeValue = "B";
-      is(div.firstChild.nodeValue, "B");
-      var commentNode = document.createComment("comment node");
-      is(commentNode.nodeValue, "comment node");
-    </script>
-  </body>
-</html>
diff --git a/tests/content/test_document_title_nontextchildren.html b/tests/content/test_document_title_nontextchildren.html
deleted file mode 100644
index 20a74d4587d..00000000000
--- a/tests/content/test_document_title_nontextchildren.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<title>x</title>
-<script src="harness.js"></script>
-<script>
-document.head.firstChild.appendChild(document.createElement("foo"));
-is(document.title, "x");
-</script>
-</html>
diff --git a/tests/content/test_document_url.html b/tests/content/test_document_url.html
deleted file mode 100644
index cb3aca2b0f1..00000000000
--- a/tests/content/test_document_url.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title></title>
-        <script src="harness.js"></script>
-        <script>
-            // test1: URL & documentURI
-            {
-                is_not(document.URL, null, "test1-0, URL & documentURI");
-                is_not(document.documentURI, null, "test1-1, URL & documentURI");
-                is(document.URL, document.documentURI, "test1-2, URL & documentURI");
-            }
-
-            // test2: new document
-            {
-                var doc = new Document();
-                is(doc.URL, "about:blank", "test2-0, new document");
-            }
-
-            // test3: current document
-            {
-                var url = document.URL.split("/");
-                is(url[0], "file:", "test3-0, current document");
-                is(url[url.length-1], "test_document_url.html", "test3-1, current document");
-            }
-        </script>
-    </head>
-    <body>
-    </body>
-</html>
diff --git a/tests/content/test_domtokenlist.html b/tests/content/test_domtokenlist.html
deleted file mode 100644
index 98877ddf840..00000000000
--- a/tests/content/test_domtokenlist.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            var div = document.createElement("div");
-            var classList = div.classList;
-
-            is(classList.length, 0);
-            is(classList.item(0), null);
-            should_throw(function () {
-                classList.contains("");
-            });
-            should_throw(function () {
-                classList.contains(" ");
-            });
-
-            var list = ["foo", " foo", "foo ", " foo ", "   foo   "];
-            for(var i = 0; i < list.length; i++) {
-                div.className = list[i];
-                is(div.className, list[i]);
-                is(classList.length, 1);
-                is(classList.item(0), "foo");
-                is(classList.item(1), null);
-                is(classList.contains("foo"), true);
-                is(classList.contains("bar"), false);
-            }
-
-            list = ["foo bar", " foo bar", " foo bar ", "   foo   bar   "];
-            for(var i = 0; i < list.length; i++) {
-                div.className = list[i];
-                is(div.className, list[i]);
-                is(classList.length, 2);
-                is(classList.item(0), "foo");
-                is(classList.item(1), "bar");
-                is(classList.item(2), null);
-                is(classList.contains("foo"), true);
-                is(classList.contains("bar"), true);
-                is(classList.contains("baz"), false);
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_element_attribute.html b/tests/content/test_element_attribute.html
deleted file mode 100644
index 3715c4e091d..00000000000
--- a/tests/content/test_element_attribute.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head id="foo">
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-  <div id="test" foo="bar"></div>
-  <script>
-    let test = document.getElementById("test");
-
-    {
-      let r1 = test.getAttribute("id");
-      is(r1, "test", "test1-0, Element.getAttribute().");
-      let r2 = test.getAttribute("foo");
-      is(r2, "bar", "test1-1, Element.getAttribute().");
-    }
-
-    {
-      let NAME  = "hoge";
-      let VALUE = "fuga";
-      test.setAttribute(NAME, VALUE);
-      let r = test.getAttribute(NAME);
-      is(r, VALUE, "test2. Element.setAttribute().");
-    }
-
-    {
-      let NAME = "foo";
-      let VALUE = "mozilla";
-      test.setAttribute(NAME, VALUE);
-      let r = test.getAttribute(NAME);
-      is(r, VALUE, "test3, attribute update by Element.setAttribute().")
-    }
-
-    {
-      test.setAttribute("id", "bar");
-      test.removeAttribute("id");
-
-      let r1 = test.hasAttribute("id");
-      is(r1, false, "test4-0, Element.removeAttribute().");
-      let r2 = test.getAttribute("id");
-      is(r2, null, "test4-1, Element.removeAttribute().");
-    }
-
-    {
-      test.setAttribute("xml:lang", "en");
-
-      let r1 = test.hasAttribute("xml:lang");
-      is(r1, true, "test5-0, Element.setAttribute('xml:lang').");
-      let r2 = test.getAttribute("xml:lang");
-      is_not(r2, null, "test5-1, Element.setAttribute('xml:lang').");
-    }
-
-    should_throw(function () {
-      test.setAttributeNS("http://example.com", "xmlns", "foo");
-    });
-    should_throw(function () {
-      test.setAttributeNS("http://www.w3.org/2000/xmlns/", "attr", "value");
-    });
-    should_throw(function () {
-      test.setAttributeNS("http://www.w3.org/2000/xmlns/", "prefix:attr", "value");
-    });
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_element_classList.html b/tests/content/test_element_classList.html
deleted file mode 100644
index 8d61414017b..00000000000
--- a/tests/content/test_element_classList.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Remove this and update WPT metadata once DOMTokenList.toggle (#3138) is implemented. -->
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            let div = document.createElement("div");
-            div.className = "foo bar";
-
-            let classList = div.classList;
-            div.className = "";
-
-            is(classList.item(0), null, "classList.item(0) must return null when all classes have been removed");
-            is(classList[0], undefined, "classList[0] must be undefined when all classes have been removed");
-        </script>
-    </head>
-    <body>
-    </body>
-</html>
diff --git a/tests/content/test_element_matches.html b/tests/content/test_element_matches.html
deleted file mode 100644
index 50847e4dcc2..00000000000
--- a/tests/content/test_element_matches.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body>
-  <div id="foo"></div>
-
-  <script>
-    let test = document.getElementById("foo");
-
-    is(test.matches("#foo"), true, "test-1");
-    is(test.matches("#not-foo"), false, "test-2");
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_empty_clientrect.html b/tests/content/test_empty_clientrect.html
deleted file mode 100644
index af319a14528..00000000000
--- a/tests/content/test_empty_clientrect.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-var rect = window.document.head.getBoundingClientRect();
-var rects = window.document.head.getClientRects();
-is_a(rect, DOMRect);
-is(rect.top, 0);
-is(rect.bottom, 0);
-is(rect.left, 0);
-is(rect.right, 0);
-is(rect.width, 0);
-is(rect.height, 0);
-is(rects.length, 0);
-</script>
-</head>
-</html>
diff --git a/tests/content/test_event_dispatch.html b/tests/content/test_event_dispatch.html
deleted file mode 100644
index 0ace43d8f28..00000000000
--- a/tests/content/test_event_dispatch.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body>
-<span>Paragraph containing <div>event listener</div>.</span>
-<script>
-  var bodyTimes = 0;
-  function bodyListener(ev) {
-    bodyTimes++;
-    is(ev.currentTarget, document.getElementsByTagName('body')[0]);
-    is(ev.target, document.getElementsByTagName('div')[0]);
-    if (bodyTimes == 1) {
-      is(ev.eventPhase, ev.CAPTURING_PHASE);
-    } else if (bodyTimes == 2) {
-      is(ev.eventPhase, ev.BUBBLING_PHASE);
-    }
-  }
-
-  var spanTimes = 0;
-  function spanListener(ev) {
-    is(ev.currentTarget, document.getElementsByTagName('span')[0]);
-    is(ev.target, document.getElementsByTagName('div')[0]);
-    is(ev.eventPhase, ev.BUBBLING_PHASE);
-    spanTimes++;
-  }
-
-  var divTimes = 0;
-  function divListener(ev) {
-    var self = document.getElementsByTagName('div')[0];
-    is(ev.currentTarget, self);
-    is(ev.target, self);
-    is(ev.eventPhase, ev.AT_TARGET);
-    divTimes++;
-  }
-
-  document.getElementsByTagName('body')[0].addEventListener("foopy", bodyListener, true);
-  document.getElementsByTagName('body')[0].addEventListener("foopy", bodyListener, false);
-  document.getElementsByTagName('span')[0].addEventListener("foopy", spanListener, false);
-  document.getElementsByTagName('div')[0].addEventListener("foopy", divListener, false);
-  var ev = new Event('foopy', {bubbles: true});
-  is(ev.bubbles, true);
-  document.getElementsByTagName('div')[0].dispatchEvent(ev);
-  is(bodyTimes, 2, 'body listener should be called multiple times');
-  is(divTimes, 1, 'target listener should be called once');
-  is(spanTimes, 1, 'span listener should be called while bubbling');
-</script>
-</body>
-</html>
diff --git a/tests/content/test_event_dispatch_dynamic.html b/tests/content/test_event_dispatch_dynamic.html
deleted file mode 100644
index a7daddd4afc..00000000000
--- a/tests/content/test_event_dispatch_dynamic.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<script src="harness.js"></script>
-<b><b><b></b></b></b>
-<script>
-var sawmiddle = -1;
-var sawouter = -1;
-var step = 0;
-var outerb = document.getElementsByTagName('b')[0];
-var middleb = outerb.firstChild;
-var innerb = middleb.firstChild;
-outerb.addEventListener("x", function() {
-  middleb.addEventListener("x", function() {
-    sawmiddle = step++;
-  }, true);
-  sawouter = step++;
-}, true);
-innerb.dispatchEvent(new Event("x"));
-is(sawmiddle, 1);
-is(sawouter, 0);
-</script>
diff --git a/tests/content/test_event_dispatch_order.html b/tests/content/test_event_dispatch_order.html
deleted file mode 100644
index 8092a6eeefd..00000000000
--- a/tests/content/test_event_dispatch_order.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body>
-<div id="foo"></div>
-<script>
-  var sawBubble = false;
-  var sawCapture = false;
-  var sawBubbleTwice = false;
-  function handler(ev) {
-    is(ev.eventPhase, ev.AT_TARGET);
-    is(sawBubble, false);
-    is(sawCapture, false);
-    sawBubble = true;
-  }
-  function handler2(ev) {
-    is(ev.eventPhase, ev.AT_TARGET);
-    is(sawBubble, true);
-    is(sawCapture, false);
-    sawCapture = true;
-  }
-  function handler3(ev) {
-    is(ev.eventPhase, ev.AT_TARGET);
-    is(sawBubble, true);
-    is(sawCapture, true);
-    sawBubbleTwice = true;
-  }
-
-  var target = document.getElementById('foo');
-  target.addEventListener('foopy', handler, false);
-  target.addEventListener('foopy', handler2, true);
-  target.addEventListener('foopy', handler3, false);
-  var ev = new Event('foopy', {bubbles: true});
-  target.dispatchEvent(ev);
-  is(sawBubble, true);
-  is(sawCapture, true);
-  is(sawBubbleTwice, true);
-</script>
-</body>
-</html>
diff --git a/tests/content/test_event_handler_syntax_error.html b/tests/content/test_event_handler_syntax_error.html
deleted file mode 100644
index 3c58a6b4b80..00000000000
--- a/tests/content/test_event_handler_syntax_error.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title></title>
-  <meta charset="UTF-8">
-  <script src="harness.js"></script>
-</head>
-<body>
-  <a id="a" onclick="{">link</a>
-  <script>
-    var a = document.getElementById("a");
-    is(a.onclick, null, "invalid onclick attribute");
-
-    document.body.setAttribute("onx", "{");
-    document.body.setAttribute("ony", "}");
-
-    is(document.body.getAttribute("onx"), "{");
-    is(document.body.getAttribute("ony"), "}");
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_focus_blur.html b/tests/content/test_focus_blur.html
deleted file mode 100644
index 8c91f2a14a8..00000000000
--- a/tests/content/test_focus_blur.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <script src="harness.js"></script>
-</head>
-<body>
-  <input id="a">
-  <input id="b">
-  <script>
-    var a = document.getElementById("a");
-    var b = document.getElementById("b");
-
-    is(document.activeElement, document.body);
-    a.focus();
-    is(document.activeElement, a);
-    b.focus();
-    is(document.activeElement, b);
-    a.blur();
-    is(document.activeElement, b);
-    b.blur();
-    is(document.activeElement, document.body);
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_getBoundingClientRect.html b/tests/content/test_getBoundingClientRect.html
deleted file mode 100644
index 4e751db844f..00000000000
--- a/tests/content/test_getBoundingClientRect.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<style>
-div {
-    position: relative;
-    top:  100px;
-    left: 100px;
-    width: 100px;
-    height: 100px;
-}
-</style>
-</head>
-<body>
-    <div>my div</div>
-    <script>
-      is_function(DOMRect,     "DOMRect");
-
-      var elems = document.getElementsByTagName('div');
-      var rect = elems[0].getBoundingClientRect();
-      is_a(rect, DOMRect);
-
-      geq(rect.top,    100);
-      geq(rect.bottom, 200);
-      geq(rect.left,   100);
-      geq(rect.right,  200);
-
-      is(rect.width, 100);
-      is(rect.height, 100);
-      is(rect.width,  rect.right  - rect.left);
-      is(rect.height, rect.bottom - rect.top);
-    </script>
-</body>
-</html>
diff --git a/tests/content/test_global.html b/tests/content/test_global.html
deleted file mode 100644
index b3a0c2dbbba..00000000000
--- a/tests/content/test_global.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<script>
-is(window, window.window);
-is(window, this);
-for (var key in this) {
-  is(this[key], window[key]);
-}
-</script>
-</head>
-</html>
diff --git a/tests/content/test_htmlfieldsetelement_elements.html b/tests/content/test_htmlfieldsetelement_elements.html
deleted file mode 100644
index 45174bf86c5..00000000000
--- a/tests/content/test_htmlfieldsetelement_elements.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-  <script src="harness.js"></script>
-  <fieldset id="fs">
-    <legend>Display</legend>
-    <input type=radio name=a>
-    <fieldset>
-      <button>Click!</button>
-    </fieldset>
-    <keygen name="key">
-    <textarea>
-      A
-    </textarea>
-    <select>
-      <option value="1"> A </option>
-      <option value="2" selected> B </option>
-    </select>
-    <form onsubmit="return false" oninput="o.value = a.valueAsNumber + b.valueAsNumber">
-      <input name=a type=number step=any> +
-      <input name=b type=number step=any> =
-      <output name=c for="a b"></output>
-    </form>
-    <figure>
-      <object type="application/x-java-applet">
-        <param name="code" value="MyJavaClass">
-        <p>You do not have Java available, or it is disabled.</p>
-      </object>
-      <figcaption>My Java Clock</figcaption>
-    </figure>
-  </fieldset>
-  <script>
-    var fs = document.getElementById("fs");
-    is(fs.elements.length, 10);
-    is_a(fs.elements[0], HTMLInputElement);
-    is_a(fs.elements[1], HTMLFieldSetElement);
-    is_a(fs.elements[2], HTMLButtonElement);
-    is_a(fs.elements[3], HTMLUnknownElement);
-    is_a(fs.elements[4], HTMLTextAreaElement);
-    is_a(fs.elements[5], HTMLSelectElement);
-    is_a(fs.elements[6], HTMLInputElement);
-    is_a(fs.elements[7], HTMLInputElement);
-    is_a(fs.elements[8], HTMLOutputElement);
-    is_a(fs.elements[9], HTMLObjectElement);
-  </script>
-</html>
diff --git a/tests/content/test_iframe_contentDocument.html b/tests/content/test_iframe_contentDocument.html
deleted file mode 100644
index 93e5c9c8c62..00000000000
--- a/tests/content/test_iframe_contentDocument.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<meta charset="utf8" />
-<script src="harness.js"></script>
-<title>Iframe contentDocument test.</title>
-</head>
-<body>
-<iframe src="resources/iframe_contentDocument_inner.html" id="iframe"></iframe>
-<script>
-waitForExplicitFinish();
-
-var timeout = 100;
-var iframe = document.getElementById('iframe');
-function test_contentWindow() {
-  if (!iframe.contentWindow) {
-    // Iframe not loaded yet, try again.
-    // No load event for iframe, insert bug number here.
-    setTimeout(test_contentWindow, timeout);
-    return;
-  }
-  is(iframe.contentDocument.getElementById('test').textContent, 'value');
-  finish();
-}
-test_contentWindow();
-</script>
-</body>
-</html>
diff --git a/tests/content/test_img_width_height.html b/tests/content/test_img_width_height.html
deleted file mode 100644
index 4c1c8e25076..00000000000
--- a/tests/content/test_img_width_height.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-  <img src="test.png"/>
-<script>
-// Testing get/set of image width/height properties
-waitForExplicitFinish();
-
-var img = window.document.getElementsByTagName("img")[0];
-
-function wait_for_img_load(f) {
-	if (img.width != 0) {
-		f();
-	} else {
-		window.setTimeout(function() { wait_for_img_load(f) }, 1);
-	}
-}
-
-wait_for_img_load(function() {
-	is(img.width, 500);
-	is(img.height, 378);
-	img.width = 200;
-	img.height = 100;
-	is(img.width, 200);
-	is(img.height, 100);
-	finish();
-});
-</script>
-</body>
-</html>
diff --git a/tests/content/test_inline_event_handler.html b/tests/content/test_inline_event_handler.html
deleted file mode 100644
index 53ba610f074..00000000000
--- a/tests/content/test_inline_event_handler.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body onload="is_a(event, Event); finish()">
-<script>
-  waitForExplicitFinish();
-</script>
-</body>
-</html>
diff --git a/tests/content/test_lenient_this.html b/tests/content/test_lenient_this.html
deleted file mode 100644
index 7e7d27b4300..00000000000
--- a/tests/content/test_lenient_this.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            var handler = function () { };
-            document.onreadystatechange = handler;
-            var obj = {};
-
-            // test1: basic test
-            {
-                var val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(document);
-                is(val, handler, "test1-0, basic test");
-            }
-
-            // test2: Should not throw for attribute marked "[LenientThis]"
-            {
-              should_not_throw(function () {
-                var val  = null;
-                val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(obj);
-                is(val, undefined, "test2-0, calling getter returns undefined");
-                is(Document.prototype.onreadystatechange, undefined, "test2-1, property access returns undefined");
-              });
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_load_event.html b/tests/content/test_load_event.html
deleted file mode 100644
index bbf07d699cb..00000000000
--- a/tests/content/test_load_event.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body>
-<script>
-  waitForExplicitFinish();
-
-  var onloads = 0;
-  function check(ev) {
-    is_a(ev, Event);
-    ev.preventDefault();
-    is(ev.defaultPrevented, false);
-    is(ev.target, document);
-    is(ev.currentTarget, window);
-    if (onloads == 2) {
-      finish();
-    }
-  }
-
-  window.onload = function(ev) {
-    _fail("this inline handler should be overwritten");
-  }
-  window.onload = function(ev) {
-    onloads++;
-    is(onloads, 1);
-    check(ev);
-  }
-  addEventListener("load", function(ev) {
-    onloads++;
-    is(onloads, 2);
-    check(ev);
-  });
-</script>
-</body>
-</html>
diff --git a/tests/content/test_navigator.html b/tests/content/test_navigator.html
deleted file mode 100644
index 72cd17ab8f1..00000000000
--- a/tests/content/test_navigator.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-<script>
-is(window.navigator, window.navigator);
-is_a(window.navigator, Navigator);
-
-var nav = window.navigator;
-is(nav.product, "Gecko");
-is(nav.taintEnabled(), false);
-is(nav.appName, "Netscape");
-is(nav.appCodeName, "Mozilla");
-is(nav.platform, "");
-is(nav.appVersion, "4.0");
-</script>
-</body>
-</html>
diff --git a/tests/content/test_node_compareDocumentPosition.html b/tests/content/test_node_compareDocumentPosition.html
deleted file mode 100644
index 843d8095262..00000000000
--- a/tests/content/test_node_compareDocumentPosition.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-                {
-                        var elem = document.createElement("div");
-                        var other = document.createElement("div");
-                        is(elem.compareDocumentPosition(elem),0);
-
-                        var nonTree = elem.compareDocumentPosition(other);
-                        var prefix = Node.DOCUMENT_POSITION_DISCONNECTED + Node.DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
-                        is(nonTree == prefix + Node.DOCUMENT_POSITION_FOLLOWING || nonTree == prefix + Node.DOCUMENT_POSITION_PRECEDING,
-                           true);
-
-                        elem.appendChild(other);
-                        is(elem.compareDocumentPosition(other), Node.DOCUMENT_POSITION_CONTAINED_BY + Node.DOCUMENT_POSITION_FOLLOWING);
-                        is(other.compareDocumentPosition(elem), Node.DOCUMENT_POSITION_CONTAINS + Node.DOCUMENT_POSITION_PRECEDING);
-
-                        var another = document.createElement("div");
-                        other.appendChild(another);
-                        is(elem.compareDocumentPosition(another), Node.DOCUMENT_POSITION_CONTAINED_BY + Node.DOCUMENT_POSITION_FOLLOWING);
-                        is(another.compareDocumentPosition(elem), Node.DOCUMENT_POSITION_CONTAINS + Node.DOCUMENT_POSITION_PRECEDING);
-
-                        var follower = document.createElement("div");
-                        elem.appendChild(follower);
-                        var preceder = document.createElement("div");
-                        another.appendChild(preceder);
-                        is(another.compareDocumentPosition(follower), Node.DOCUMENT_POSITION_FOLLOWING);
-                        is(follower.compareDocumentPosition(another), Node.DOCUMENT_POSITION_PRECEDING);
-                        is(follower.compareDocumentPosition(preceder), Node.DOCUMENT_POSITION_PRECEDING);
-                }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_node_contains.html b/tests/content/test_node_contains.html
deleted file mode 100644
index 568edf96ebb..00000000000
--- a/tests/content/test_node_contains.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: Node.contains
-            {
-                var parent = document.createElement("div");
-                var child = document.createElement("div");
-                var child_of_child = document.createElement("div");
-                var other = document.createElement("div");
-
-                child.appendChild(child_of_child);
-                parent.appendChild(child);
-
-                is(parent.contains(parent), true, "test1-0, Node.contains");
-                is(parent.contains(child), true, "test1-1, Node.contains");
-                is(parent.contains(child_of_child), true, "test1-2, Node.contains");
-                is(parent.contains(other), false, "test1-3, Node.contains");
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_node_insertBefore.html b/tests/content/test_node_insertBefore.html
deleted file mode 100644
index 1a280b1bb7b..00000000000
--- a/tests/content/test_node_insertBefore.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Node.insertBefore</title>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <script type="text/javascript">
-            // test1: insertBefore
-            {
-                var root = document.createElement("div");
-                var after = document.createElement("div");
-                var before = document.createElement("div");
-
-                root.appendChild(after);
-
-                is(root.insertBefore(before, after), before, "test1-0, insertBefore");
-                is(root.childNodes[0], before, "test1-1, insertBefore");
-                is(root.childNodes[1], after, "test1-2, insertBefore");
-            }
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_node_isEqualNode.html b/tests/content/test_node_isEqualNode.html
deleted file mode 100644
index feaeeb2f78a..00000000000
--- a/tests/content/test_node_isEqualNode.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: simple checks
-            {
-                var elem = document.createElement("div");
-                var other = document.createElement("div");
-                is(elem.isEqualNode(elem), true);
-                is(elem.isEqualNode(other), true);
-                is(other.isEqualNode(elem), true);
-                is(elem.isEqualNode(document), false);
-            }
-
-            // test2: non-element children
-            {
-                var parent_elem = document.createElement("div");
-                var child_elem = document.createElement("div");
-                parent_elem.appendChild(child_elem);
-
-                var other_parent = document.createElement("div");
-                var other_child = document.createElement("div");
-                other_parent.appendChild(other_child);
-
-                is(parent_elem.isEqualNode(other_parent), true);
-                is(child_elem.isEqualNode(other_child), true);
-
-                var child_text = document.createTextNode("lorem ipsum");
-                child_elem.appendChild(child_text);
-
-                is(parent_elem.isEqualNode(other_parent), false);
-                is(child_elem.isEqualNode(other_child), false);
-            }
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_node_normalize.html b/tests/content/test_node_normalize.html
deleted file mode 100644
index 27f1ccedd5f..00000000000
--- a/tests/content/test_node_normalize.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src="harness.js"></script>
-  </head>
-  <body>
-    <script>
-      // test1: Node.normalize
-      var parent1 = document.createElement("div");
-      var child1 = document.createTextNode("aaa");
-      var child2 = document.createTextNode("");
-      var child3 = document.createTextNode("bb");
-
-      var parent2 = document.createElement("div");
-
-      parent1.appendChild(child1);
-      parent1.appendChild(child2);
-      parent1.appendChild(child3);
-
-      parent2.appendChild(document.createTextNode(""));
-
-      parent1.normalize();
-      parent2.normalize();
-
-      is(Array.prototype.map.call(parent1.childNodes, function(el) {return el.length}).indexOf(0), -1, "Node.normalize removes empty text nodes");
-      is(parent1.childNodes.length, 1, "Node.normalize merges text nodes in one");
-      is(parent1.childNodes[0].length, 5, "test 1-2, Node.normalize merges text nodes values");
-      is(parent2.childNodes.length, 0, "Node.normalize removes empty text nodes even if there is only one text node");
-      is(child2.textContent, "", "Node.normalize doesn't change removed children original content")
-      is(child3.textContent, "bb", "Node.normalize doesn't change removed children original content")
-    </script>
-  </body>
-</html>
diff --git a/tests/content/test_node_replaceChild.html b/tests/content/test_node_replaceChild.html
deleted file mode 100644
index 1ca01e501e7..00000000000
--- a/tests/content/test_node_replaceChild.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <script>
-            // test1: 1-to-1
-            {
-                var root = document.createElement("div");
-                var elem = document.createElement("div");
-                var foo = document.createTextNode("foo");
-                var bar = document.createTextNode("bar");
-
-                elem.appendChild(bar);
-                is(elem.replaceChild(bar, bar), bar, "test1-0, 1-to-1");
-                is(elem.childNodes[0], bar, "test1-1, 1-to-1");
-
-                root.appendChild(foo);
-                is(root.replaceChild(bar, foo), foo, "test1-2, 1-to-1");
-                is(elem.childNodes.length, 0, "test1-3, 1-to-1");
-                is(root.childNodes[0], bar, "test1-4, 1-to-1");
-
-                elem.appendChild(foo);
-                is(root.replaceChild(elem, bar), bar, "test1-5, 1-to-1");
-                is(root.childNodes[0].childNodes[0], foo, "test1-6, 1-to-1");
-            }
-
-            // test2: doctype
-            {
-                var doc_doctype = document.doctype;
-                var new_doctype = document.implementation.createDocumentType("html", null, null);
-
-                is_not(doc_doctype, new_doctype, "test2-0, doctype");
-                is(document.replaceChild(new_doctype, doc_doctype), doc_doctype, "test2-1, doctype");
-                is(document.doctype, new_doctype, "test2-2, doctype");
-            }
-
-            // test3: documentElement
-            {
-                var doc_elem = document.documentElement;
-                var new_elem = document.createElement("html");
-
-                is_not(doc_elem, new_elem, "test3-0, documentElement");
-                is(document.replaceChild(new_elem, doc_elem), doc_elem, "test3-1, documentElement");
-                is(document.documentElement, new_elem, "test3-2, documentElement");
-            }
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_parentNode_querySelector.html b/tests/content/test_parentNode_querySelector.html
deleted file mode 100644
index 9ab4eb3b1cf..00000000000
--- a/tests/content/test_parentNode_querySelector.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <script src="harness.js"></script>
-    </head>
-    <body>
-        <div id="foo"></div>
-        <div id="foo\bar"></div>
-        <div id="foo:bar"></div>
-        <div id="bar" class="myClass"></p>
-        <script>
-            { // document.querySelector
-                let div = document.getElementById("foo");
-                is(document.querySelector("#foo"), div);
-
-                div = document.getElementById("foo\\bar");
-                is(document.querySelector("#foo\\\\bar"), div);
-
-                div = document.getElementById("foo:bar");
-                is(document.querySelector("#foo\\:bar"), div);
-
-                div = document.getElementById("bar");
-                is(document.querySelector("div.myClass"), div);
-                is(document.querySelector("div:nth-of-type(4)"), div);
-            }
-            { // element.querySelector
-                let body = document.body;
-                let div = document.getElementById("foo");
-                is(body.querySelector("#foo"), div);
-
-                div = document.getElementById("foo\\bar");
-                is(body.querySelector("#foo\\\\bar"), div);
-
-                div = document.getElementById("foo:bar");
-                is(body.querySelector("#foo\\:bar"), div);
-
-                div = document.getElementById("bar");
-                is(body.querySelector("div.myClass"), div);
-                is(body.querySelector("div:nth-of-type(4)"), div);
-            }
-
-            { // docfrag.querySelector
-                let docfrag = document.createDocumentFragment();
-
-                let div = document.createElement("div");
-                div.id = "foo";
-                div.className = "myClass";
-
-                let child = document.createElement("div");
-                div.appendChild(child);
-                docfrag.appendChild(div);
-
-                let p = document.createElement("p");
-                p.id = "bar";
-                p.className = "myClass";
-                docfrag.appendChild(p);
-
-                is(docfrag.querySelector("#foo"), div);
-                is(docfrag.querySelector("div.myClass"), div);
-
-                is(docfrag.querySelector("#bar"), p);
-                is(docfrag.querySelector("p.myClass"), p);
-
-                is(docfrag.querySelector(".myClass"), div);
-                is(docfrag.querySelector("div > div"), child);
-            }
-        </script>
-    </body>
-</html>
diff --git a/tests/content/test_parentnodes.html b/tests/content/test_parentnodes.html
deleted file mode 100644
index 51f0f3d1148..00000000000
--- a/tests/content/test_parentnodes.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-  <div id="div1"></div>
-  <script>
-    is_a(document.documentElement.parentNode, Document);
-    is(document.documentElement.parentElement, null);
-
-    var elem = document.createElement("p");
-    is(elem.parentNode, null);
-    is(elem.parentElement, null);
-    
-    var child = document.createElement("p");
-    elem.appendChild(child);
-
-    is(child.parentNode, elem);
-    is(child.parentElement, elem);
-  </script>
-</body>
-</html>
diff --git a/tests/content/test_proxy_setter.html b/tests/content/test_proxy_setter.html
deleted file mode 100644
index a8bab0f3bd1..00000000000
--- a/tests/content/test_proxy_setter.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-<script>
-is(window.document.title, '');
-window.document.title = 'foo';
-is(window.document.title, 'foo');
-</script>
-</body>
-</html>
diff --git a/tests/content/test_textcontent.html b/tests/content/test_textcontent.html
deleted file mode 100644
index 16c2c614d3e..00000000000
--- a/tests/content/test_textcontent.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-</head>
-<body>
-<div>this is
- text content</div>
-<script>
-  var div = document.getElementsByTagName('div')[0];
-  is(div.textContent, "this is\n text content");
-  var newContent = "new text con\ntent";
-  div.textContent = newContent;
-  is(div.textContent, newContent);
-</script>
-</body>
-</html>
diff --git a/tests/content/test_title.html b/tests/content/test_title.html
deleted file mode 100644
index 117e86134df..00000000000
--- a/tests/content/test_title.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<title>starting title</title>
-<script src="harness.js"></script>
-<script>
-is(document.title, "starting title");
-document.title = "new title";
-is(document.title, "new title");
-</script>
-</head>
-</html>
diff --git a/tests/content/test_trace_null.html b/tests/content/test_trace_null.html
deleted file mode 100644
index 332f158e2a1..00000000000
--- a/tests/content/test_trace_null.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- crashtest -->
-<script src=harness.js></script>
-<script>
-new CustomEvent("foo", { detail: null });
-gc();
-</script>
diff --git a/tests/content/test_union.html b/tests/content/test_union.html
deleted file mode 100644
index f5fa1e933ca..00000000000
--- a/tests/content/test_union.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-<script src="harness.js"></script>
-<select id="sel"></select>
-<script>
-  var div = document.createElement('div');
-  var optgroup = document.createElement('optgroup');
-  var sel = document.getElementById('sel');
-
-  should_not_throw(function() {
-    var opt = document.createElement('option');
-    sel.add(opt);
-    sel.add(optgroup);
-    sel.add(opt, div);
-    sel.add(optgroup, div);
-    sel.add(opt, 5);
-    sel.add(optgroup, 5);
-  });
-
-  should_throw(function() { sel.add(div) });
-  should_not_throw(function() { sel.add(optgroup, function() {}) });
-</script>
-</head>
-</html>
diff --git a/tests/content/test_window.html b/tests/content/test_window.html
deleted file mode 100644
index 0f3cc72b274..00000000000
--- a/tests/content/test_window.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-<script>
-is(window, window.self);
-is_a(window.self, Window);
-</script>
-</body>
-</html>
diff --git a/tests/content/test_window_performance.html b/tests/content/test_window_performance.html
deleted file mode 100644
index 968ca1cde3e..00000000000
--- a/tests/content/test_window_performance.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-  <title></title>
-  <script src="harness.js"></script>
-</head>
-<body>
-<script>
-  is_not(window.performance, undefined);
-  is_a(window.performance, Performance);
-
-  is_not(window.performance.timing, undefined);
-  is_a(window.performance.timing, PerformanceTiming);
-
-  gt(window.performance.timing.navigationStart, 0);
-
-  var last = window.performance.now();
-  gt(last, 0);
-
-  // Check that window.performance.now() is monotonically increasing
-  for (var i = 0; i < 100; i++) {
-    var next = window.performance.now();
-    gt(next, last);
-    last = next;
-  }
-</script>
-</body>
-</html>
diff --git a/tests/content/test_window_setInterval.html b/tests/content/test_window_setInterval.html
deleted file mode 100644
index 6fb3ddeb6ba..00000000000
--- a/tests/content/test_window_setInterval.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-  <head>
-    <script src="harness.js"></script>
-  </head>
-  <body>
-    <script>
-      var x = 0;
-      var intervalID = setInterval(function() {
-        x += 1;
-        if (x == 2) {
-          clearInterval(intervalID);
-          setTimeout(function() {
-            is(x, 2);
-            finish();
-          }, 300);
-        }
-      }, 10);
-    </script>
-  </body>
-</html>
diff --git a/tests/content/test_windowproxy.html b/tests/content/test_windowproxy.html
deleted file mode 100644
index 71c55211fd5..00000000000
--- a/tests/content/test_windowproxy.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head id="foo">
-  <script src="harness.js"></script>
-</head>
-<body>
-<div></div>
-<script>
-  window.abcd = 15;
-  is(window.abcd, 15);
-  is(Object.getOwnPropertyDescriptor(window, 'abcd').value, 15);
-  is(window.hasOwnProperty('abcd'), true);
-
-  is('location' in window, true);
-  // FIXME: https://github.com/servo/servo/issues/4593
-  is(Object.hasOwnProperty('location'), false)
-
-  // Can't set indexed properties
-  window[100] = "abc";
-  is(window[100], undefined);
-  is(Object.getOwnPropertyDescriptor(window, 1000), undefined);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 506e7b62b7d..49e66eb2618 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -13,11 +13,494 @@
   },
   "local_changes": {
     "deleted": [],
-    "items": {},
+    "items": {
+      "testharness": {
+        "mozilla/DOMParser.html": [
+          {
+            "path": "mozilla/DOMParser.html",
+            "url": "/_mozilla/mozilla/DOMParser.html"
+          }
+        ],
+        "mozilla/Event.html": [
+          {
+            "path": "mozilla/Event.html",
+            "url": "/_mozilla/mozilla/Event.html"
+          }
+        ],
+        "mozilla/MouseEvent.html": [
+          {
+            "path": "mozilla/MouseEvent.html",
+            "url": "/_mozilla/mozilla/MouseEvent.html"
+          }
+        ],
+        "mozilla/blob.html": [
+          {
+            "path": "mozilla/blob.html",
+            "url": "/_mozilla/mozilla/blob.html"
+          }
+        ],
+        "mozilla/body_listener.html": [
+          {
+            "path": "mozilla/body_listener.html",
+            "url": "/_mozilla/mozilla/body_listener.html"
+          }
+        ],
+        "mozilla/caption.html": [
+          {
+            "path": "mozilla/caption.html",
+            "url": "/_mozilla/mozilla/caption.html"
+          }
+        ],
+        "mozilla/characterdata.html": [
+          {
+            "path": "mozilla/characterdata.html",
+            "url": "/_mozilla/mozilla/characterdata.html"
+          }
+        ],
+        "mozilla/collections.html": [
+          {
+            "path": "mozilla/collections.html",
+            "url": "/_mozilla/mozilla/collections.html"
+          }
+        ],
+        "mozilla/createElement_script.html": [
+          {
+            "path": "mozilla/createElement_script.html",
+            "url": "/_mozilla/mozilla/createElement_script.html"
+          }
+        ],
+        "mozilla/create_element.html": [
+          {
+            "path": "mozilla/create_element.html",
+            "url": "/_mozilla/mozilla/create_element.html"
+          }
+        ],
+        "mozilla/documentElement.html": [
+          {
+            "path": "mozilla/documentElement.html",
+            "url": "/_mozilla/mozilla/documentElement.html"
+          }
+        ],
+        "mozilla/document_activeElement.html": [
+          {
+            "path": "mozilla/document_activeElement.html",
+            "url": "/_mozilla/mozilla/document_activeElement.html"
+          }
+        ],
+        "mozilla/document_body.html": [
+          {
+            "path": "mozilla/document_body.html",
+            "url": "/_mozilla/mozilla/document_body.html"
+          }
+        ],
+        "mozilla/document_characterSet.html": [
+          {
+            "path": "mozilla/document_characterSet.html",
+            "url": "/_mozilla/mozilla/document_characterSet.html"
+          }
+        ],
+        "mozilla/document_characterSet_default.html": [
+          {
+            "path": "mozilla/document_characterSet_default.html",
+            "url": "/_mozilla/mozilla/document_characterSet_default.html"
+          }
+        ],
+        "mozilla/document_characterSet_invalid.html": [
+          {
+            "path": "mozilla/document_characterSet_invalid.html",
+            "url": "/_mozilla/mozilla/document_characterSet_invalid.html"
+          }
+        ],
+        "mozilla/document_compatMode_loose.html": [
+          {
+            "path": "mozilla/document_compatMode_loose.html",
+            "url": "/_mozilla/mozilla/document_compatMode_loose.html"
+          }
+        ],
+        "mozilla/document_compatMode_strict.html": [
+          {
+            "path": "mozilla/document_compatMode_strict.html",
+            "url": "/_mozilla/mozilla/document_compatMode_strict.html"
+          }
+        ],
+        "mozilla/document_contenttype.html": [
+          {
+            "path": "mozilla/document_contenttype.html",
+            "url": "/_mozilla/mozilla/document_contenttype.html"
+          }
+        ],
+        "mozilla/document_datalist_options.html": [
+          {
+            "path": "mozilla/document_datalist_options.html",
+            "url": "/_mozilla/mozilla/document_datalist_options.html"
+          }
+        ],
+        "mozilla/document_defaultView.html": [
+          {
+            "path": "mozilla/document_defaultView.html",
+            "url": "/_mozilla/mozilla/document_defaultView.html"
+          }
+        ],
+        "mozilla/document_getElementById.html": [
+          {
+            "path": "mozilla/document_getElementById.html",
+            "url": "/_mozilla/mozilla/document_getElementById.html"
+          }
+        ],
+        "mozilla/document_getElementsByName.html": [
+          {
+            "path": "mozilla/document_getElementsByName.html",
+            "url": "/_mozilla/mozilla/document_getElementsByName.html"
+          }
+        ],
+        "mozilla/document_head.html": [
+          {
+            "path": "mozilla/document_head.html",
+            "url": "/_mozilla/mozilla/document_head.html"
+          }
+        ],
+        "mozilla/document_images_cache.html": [
+          {
+            "path": "mozilla/document_images_cache.html",
+            "url": "/_mozilla/mozilla/document_images_cache.html"
+          }
+        ],
+        "mozilla/document_implementation.html": [
+          {
+            "path": "mozilla/document_implementation.html",
+            "url": "/_mozilla/mozilla/document_implementation.html"
+          }
+        ],
+        "mozilla/document_links_cache.html": [
+          {
+            "path": "mozilla/document_links_cache.html",
+            "url": "/_mozilla/mozilla/document_links_cache.html"
+          }
+        ],
+        "mozilla/document_readystate.html": [
+          {
+            "path": "mozilla/document_readystate.html",
+            "url": "/_mozilla/mozilla/document_readystate.html"
+          }
+        ],
+        "mozilla/document_set_node_value.html": [
+          {
+            "path": "mozilla/document_set_node_value.html",
+            "url": "/_mozilla/mozilla/document_set_node_value.html"
+          }
+        ],
+        "mozilla/document_title_nontextchildren.html": [
+          {
+            "path": "mozilla/document_title_nontextchildren.html",
+            "url": "/_mozilla/mozilla/document_title_nontextchildren.html"
+          }
+        ],
+        "mozilla/document_url.html": [
+          {
+            "path": "mozilla/document_url.html",
+            "url": "/_mozilla/mozilla/document_url.html"
+          }
+        ],
+        "mozilla/domtokenlist.html": [
+          {
+            "path": "mozilla/domtokenlist.html",
+            "url": "/_mozilla/mozilla/domtokenlist.html"
+          }
+        ],
+        "mozilla/element_attribute.html": [
+          {
+            "path": "mozilla/element_attribute.html",
+            "url": "/_mozilla/mozilla/element_attribute.html"
+          }
+        ],
+        "mozilla/element_attributes.html": [
+          {
+            "path": "mozilla/element_attributes.html",
+            "url": "/_mozilla/mozilla/element_attributes.html"
+          }
+        ],
+        "mozilla/element_classList.html": [
+          {
+            "path": "mozilla/element_classList.html",
+            "url": "/_mozilla/mozilla/element_classList.html"
+          }
+        ],
+        "mozilla/element_className.html": [
+          {
+            "path": "mozilla/element_className.html",
+            "url": "/_mozilla/mozilla/element_className.html"
+          }
+        ],
+        "mozilla/element_matches.html": [
+          {
+            "path": "mozilla/element_matches.html",
+            "url": "/_mozilla/mozilla/element_matches.html"
+          }
+        ],
+        "mozilla/empty_clientrect.html": [
+          {
+            "path": "mozilla/empty_clientrect.html",
+            "url": "/_mozilla/mozilla/empty_clientrect.html"
+          }
+        ],
+        "mozilla/enabled_disabled_selectors.html": [
+          {
+            "path": "mozilla/enabled_disabled_selectors.html",
+            "url": "/_mozilla/mozilla/enabled_disabled_selectors.html"
+          }
+        ],
+        "mozilla/event_dispatch.html": [
+          {
+            "path": "mozilla/event_dispatch.html",
+            "url": "/_mozilla/mozilla/event_dispatch.html"
+          }
+        ],
+        "mozilla/event_dispatch_dynamic.html": [
+          {
+            "path": "mozilla/event_dispatch_dynamic.html",
+            "url": "/_mozilla/mozilla/event_dispatch_dynamic.html"
+          }
+        ],
+        "mozilla/event_dispatch_order.html": [
+          {
+            "path": "mozilla/event_dispatch_order.html",
+            "url": "/_mozilla/mozilla/event_dispatch_order.html"
+          }
+        ],
+        "mozilla/event_handler_syntax_error.html": [
+          {
+            "path": "mozilla/event_handler_syntax_error.html",
+            "url": "/_mozilla/mozilla/event_handler_syntax_error.html"
+          }
+        ],
+        "mozilla/event_listener.html": [
+          {
+            "path": "mozilla/event_listener.html",
+            "url": "/_mozilla/mozilla/event_listener.html"
+          }
+        ],
+        "mozilla/focus_blur.html": [
+          {
+            "path": "mozilla/focus_blur.html",
+            "url": "/_mozilla/mozilla/focus_blur.html"
+          }
+        ],
+        "mozilla/getBoundingClientRect.html": [
+          {
+            "path": "mozilla/getBoundingClientRect.html",
+            "url": "/_mozilla/mozilla/getBoundingClientRect.html"
+          }
+        ],
+        "mozilla/getPropertyPriority.html": [
+          {
+            "path": "mozilla/getPropertyPriority.html",
+            "url": "/_mozilla/mozilla/getPropertyPriority.html"
+          }
+        ],
+        "mozilla/global.html": [
+          {
+            "path": "mozilla/global.html",
+            "url": "/_mozilla/mozilla/global.html"
+          }
+        ],
+        "mozilla/htmlcollection.html": [
+          {
+            "path": "mozilla/htmlcollection.html",
+            "url": "/_mozilla/mozilla/htmlcollection.html"
+          }
+        ],
+        "mozilla/htmlfieldsetelement_elements.html": [
+          {
+            "path": "mozilla/htmlfieldsetelement_elements.html",
+            "url": "/_mozilla/mozilla/htmlfieldsetelement_elements.html"
+          }
+        ],
+        "mozilla/htmlspacechars.html": [
+          {
+            "path": "mozilla/htmlspacechars.html",
+            "url": "/_mozilla/mozilla/htmlspacechars.html"
+          }
+        ],
+        "mozilla/iframe_contentDocument.html": [
+          {
+            "path": "mozilla/iframe_contentDocument.html",
+            "url": "/_mozilla/mozilla/iframe_contentDocument.html"
+          }
+        ],
+        "mozilla/img_width_height.html": [
+          {
+            "path": "mozilla/img_width_height.html",
+            "url": "/_mozilla/mozilla/img_width_height.html"
+          }
+        ],
+        "mozilla/inline_event_handler.html": [
+          {
+            "path": "mozilla/inline_event_handler.html",
+            "url": "/_mozilla/mozilla/inline_event_handler.html"
+          }
+        ],
+        "mozilla/innerHTML.html": [
+          {
+            "path": "mozilla/innerHTML.html",
+            "url": "/_mozilla/mozilla/innerHTML.html"
+          }
+        ],
+        "mozilla/interfaces.html": [
+          {
+            "path": "mozilla/interfaces.html",
+            "url": "/_mozilla/mozilla/interfaces.html"
+          }
+        ],
+        "mozilla/lenient_this.html": [
+          {
+            "path": "mozilla/lenient_this.html",
+            "url": "/_mozilla/mozilla/lenient_this.html"
+          }
+        ],
+        "mozilla/load_event.html": [
+          {
+            "path": "mozilla/load_event.html",
+            "url": "/_mozilla/mozilla/load_event.html"
+          }
+        ],
+        "mozilla/navigator.html": [
+          {
+            "path": "mozilla/navigator.html",
+            "url": "/_mozilla/mozilla/navigator.html"
+          }
+        ],
+        "mozilla/node_cloneNode.html": [
+          {
+            "path": "mozilla/node_cloneNode.html",
+            "url": "/_mozilla/mozilla/node_cloneNode.html"
+          }
+        ],
+        "mozilla/node_compareDocumentPosition.html": [
+          {
+            "path": "mozilla/node_compareDocumentPosition.html",
+            "url": "/_mozilla/mozilla/node_compareDocumentPosition.html"
+          }
+        ],
+        "mozilla/node_contains.html": [
+          {
+            "path": "mozilla/node_contains.html",
+            "url": "/_mozilla/mozilla/node_contains.html"
+          }
+        ],
+        "mozilla/node_insertBefore.html": [
+          {
+            "path": "mozilla/node_insertBefore.html",
+            "url": "/_mozilla/mozilla/node_insertBefore.html"
+          }
+        ],
+        "mozilla/node_isEqualNode.html": [
+          {
+            "path": "mozilla/node_isEqualNode.html",
+            "url": "/_mozilla/mozilla/node_isEqualNode.html"
+          }
+        ],
+        "mozilla/node_normalize.html": [
+          {
+            "path": "mozilla/node_normalize.html",
+            "url": "/_mozilla/mozilla/node_normalize.html"
+          }
+        ],
+        "mozilla/node_replaceChild.html": [
+          {
+            "path": "mozilla/node_replaceChild.html",
+            "url": "/_mozilla/mozilla/node_replaceChild.html"
+          }
+        ],
+        "mozilla/parentNode_querySelector.html": [
+          {
+            "path": "mozilla/parentNode_querySelector.html",
+            "url": "/_mozilla/mozilla/parentNode_querySelector.html"
+          }
+        ],
+        "mozilla/parentNode_querySelectorAll.html": [
+          {
+            "path": "mozilla/parentNode_querySelectorAll.html",
+            "url": "/_mozilla/mozilla/parentNode_querySelectorAll.html"
+          }
+        ],
+        "mozilla/parentnodes.html": [
+          {
+            "path": "mozilla/parentnodes.html",
+            "url": "/_mozilla/mozilla/parentnodes.html"
+          }
+        ],
+        "mozilla/proxy_setter.html": [
+          {
+            "path": "mozilla/proxy_setter.html",
+            "url": "/_mozilla/mozilla/proxy_setter.html"
+          }
+        ],
+        "mozilla/script_type.html": [
+          {
+            "path": "mozilla/script_type.html",
+            "url": "/_mozilla/mozilla/script_type.html"
+          }
+        ],
+        "mozilla/storage.html": [
+          {
+            "path": "mozilla/storage.html",
+            "url": "/_mozilla/mozilla/storage.html"
+          }
+        ],
+        "mozilla/textcontent.html": [
+          {
+            "path": "mozilla/textcontent.html",
+            "url": "/_mozilla/mozilla/textcontent.html"
+          }
+        ],
+        "mozilla/title.html": [
+          {
+            "path": "mozilla/title.html",
+            "url": "/_mozilla/mozilla/title.html"
+          }
+        ],
+        "mozilla/trace_null.html": [
+          {
+            "path": "mozilla/trace_null.html",
+            "url": "/_mozilla/mozilla/trace_null.html"
+          }
+        ],
+        "mozilla/union.html": [
+          {
+            "path": "mozilla/union.html",
+            "url": "/_mozilla/mozilla/union.html"
+          }
+        ],
+        "mozilla/window.html": [
+          {
+            "path": "mozilla/window.html",
+            "url": "/_mozilla/mozilla/window.html"
+          }
+        ],
+        "mozilla/window_performance.html": [
+          {
+            "path": "mozilla/window_performance.html",
+            "url": "/_mozilla/mozilla/window_performance.html"
+          }
+        ],
+        "mozilla/window_setInterval.html": [
+          {
+            "path": "mozilla/window_setInterval.html",
+            "url": "/_mozilla/mozilla/window_setInterval.html"
+          }
+        ],
+        "mozilla/windowproxy.html": [
+          {
+            "path": "mozilla/windowproxy.html",
+            "url": "/_mozilla/mozilla/windowproxy.html"
+          }
+        ]
+      }
+    },
     "reftest_nodes": {}
   },
   "reftest_nodes": {},
   "rev": null,
   "url_base": "/_mozilla/",
   "version": 2
-}
+}
\ No newline at end of file
diff --git a/tests/wpt/mozilla/meta/mozilla/enabled_disabled_selectors.html.ini b/tests/wpt/mozilla/meta/mozilla/enabled_disabled_selectors.html.ini
new file mode 100644
index 00000000000..7e97d32000f
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/enabled_disabled_selectors.html.ini
@@ -0,0 +1,5 @@
+[enabled_disabled_selectors.html]
+  type: testharness
+
+  [menuitem initial state]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/windowproxy.html.ini b/tests/wpt/mozilla/meta/mozilla/windowproxy.html.ini
new file mode 100644
index 00000000000..6de54222762
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/windowproxy.html.ini
@@ -0,0 +1,5 @@
+[windowproxy.html]
+  type: testharness
+
+  [Unforgeable location]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/tests/mozilla/DOMParser.html b/tests/wpt/mozilla/tests/mozilla/DOMParser.html
new file mode 100644
index 00000000000..f78eccb4e36
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/DOMParser.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals(String(DOMParser).indexOf("function DOMParser("), 0);
+  let parser = new DOMParser();
+  assert_true(parser instanceof DOMParser, "Should be DOMParser");
+  assert_true(parser.parseFromString("", "text/html") instanceof Document, "Should be Document");
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/Event.html b/tests/wpt/mozilla/tests/mozilla/Event.html
new file mode 100644
index 00000000000..94e72dba2df
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/Event.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals(String(Event).indexOf("function Event("), 0);
+
+  let ev = new Event("foopy", {cancelable: true});
+  assert_true(ev instanceof Event, "Should be Event");
+
+  assert_equals(ev.type, 'foopy');
+  assert_equals(ev.defaultPrevented, false);
+  ev.preventDefault();
+  assert_equals(ev.defaultPrevented, true);
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/MouseEvent.html b/tests/wpt/mozilla/tests/mozilla/MouseEvent.html
new file mode 100644
index 00000000000..3456da1f28e
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/MouseEvent.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals(String(MouseEvent).indexOf("function MouseEvent("), 0);
+
+  let ev = new MouseEvent("press", {bubbles: true, screenX: 150, detail: 100});
+
+  assert_true(ev instanceof Event, "Should be Event");
+  assert_true(ev instanceof UIEvent, "Should be UIEvent");
+  assert_true(ev instanceof MouseEvent, "Should be MouseEvent");
+  assert_equals(ev.screenX, 150);
+  assert_equals(ev.detail, 100);
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/blob.html b/tests/wpt/mozilla/tests/mozilla/blob.html
new file mode 100644
index 00000000000..3f932083542
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/blob.html
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+    test(function() {
+      var testData = ['<a id="a"><b id="b">hey!</b></a>'];
+      var b = new Blob(testData); // the blob
+      assert_equals(b.size, 32);
+      assert_equals(b.type, "");
+
+      var bs = b.slice(0, 5);
+      assert_equals(bs.size, 5);
+      assert_equals(b.type, "");
+
+      var bc = new Blob(testData, {type:"text/plain"}); // the blob
+      assert_equals(bc.size, 32);
+      assert_equals(bc.type, "text/plain");
+
+      var bss = new Blob(testData, {type:" text/plain "}); // spaces
+      assert_equals(bss.size, 32);
+      assert_equals(bss.type, " text/plain ");
+
+      var bcs = bc.slice(0, 7);
+      assert_equals(bcs.size, 7);
+      assert_equals(bcs.type, "");
+
+      var bcsc = bc.slice(0, 7, "text/xml");
+      assert_equals(bcsc.size, 7);
+      assert_equals(bcsc.type, "text/xml");
+
+      var bu = new Blob(testData, {type:"TEXT/PLAIN"}); // the blob
+      assert_equals(bu.size, 32);
+      assert_equals(bu.type, "text/plain");
+
+      var bj = new Blob(testData, {type:"☃"}); // the blob
+      assert_equals(bj.size, 32);
+      assert_equals(bj.type, "");
+
+      var bjs = bj.slice(0, 7, "☃");
+      assert_equals(bjs.size, 7);
+      assert_equals(bjs.type, "");
+    });
+    </script>
+  </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/body_listener.html b/tests/wpt/mozilla/tests/mozilla/body_listener.html
new file mode 100644
index 00000000000..13a1a0fdc15
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/body_listener.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(function() {
+  window.check_onload = this.step_func(function(listener) {
+    assert_equals(listener, window);
+    var ev = new Event('click', {bubbles: true, cancelable: true});
+    document.body.dispatchEvent(ev);
+  });
+  window.check_onclick = this.step_func_done(function(listener) {
+    assert_equals(listener, document.body);
+  });
+});
+</script>
+</head>
+<body onload="check_onload(this)" onclick="check_onclick(this)">
+</body>
+</html>
diff --git a/tests/content/test_caption.html b/tests/wpt/mozilla/tests/mozilla/caption.html
similarity index 58%
rename from tests/content/test_caption.html
rename to tests/wpt/mozilla/tests/mozilla/caption.html
index 64d487df922..85f31176e32 100644
--- a/tests/content/test_caption.html
+++ b/tests/wpt/mozilla/tests/mozilla/caption.html
@@ -1,24 +1,27 @@
 <html>
 <head>
-<script src="harness.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 </head>
 <table id="t">
 <caption id="tcaption">old caption</caption>
 </table>
 <script>
+test(function() {
   var t = document.getElementById("t");
   var tcaption = document.getElementById("tcaption");
-  is(t.caption, tcaption);
-  is(t.caption.innerHTML, "old caption");
+  assert_equals(t.caption, tcaption);
+  assert_equals(t.caption.innerHTML, "old caption");
 
   var newCaption = document.createElement("caption");
   newCaption.innerHTML = "new caption";
 
   t.caption = newCaption;
-  is(newCaption.parentNode, t);
-  is(t.caption, newCaption);
+  assert_equals(newCaption.parentNode, t);
+  assert_equals(t.caption, newCaption);
 
   // Test for https://github.com/servo/servo/issues/3997
   t.getBoundingClientRect();
+});
 </script>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/characterdata.html b/tests/wpt/mozilla/tests/mozilla/characterdata.html
new file mode 100644
index 00000000000..fe2dafa8675
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/characterdata.html
@@ -0,0 +1,47 @@
+<html>
+  <head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <p>This is the character data</p>
+  </body>
+  <script>
+  test(function() {
+    var a = document.getElementsByTagName('p')[0].childNodes[0];
+    assert_equals(a.data, "This is the character data");
+    // append test utf8
+    a.appendData(", append more 資料，測試資料");
+    assert_equals(a.data, "This is the character data, append more 資料，測試資料");
+
+    // length test utf8
+    assert_equals(a.length, 47);
+
+    // insert test non-utf8
+    a.insertData(26, " test");
+    assert_equals(a.data, "This is the character data test, append more 資料，測試資料");
+    // insert test utf8
+    a.insertData(48, "更多");
+    assert_equals(a.data, "This is the character data test, append more 資料，更多測試資料");
+
+    // delete test non-utf8
+    a.deleteData(40, 5);
+    assert_equals(a.data, "This is the character data test, append 資料，更多測試資料");
+    // delete test utf8
+    a.deleteData(45, 2);
+    assert_equals(a.data, "This is the character data test, append 資料，更多資料");
+
+    // replace test non-utf8
+    a.replaceData(33, 6, "other");
+    assert_equals(a.data, "This is the character data test, other 資料，更多資料");
+    // replace test non-utf8
+    a.replaceData(44, 2, "文字");
+    assert_equals(a.data, "This is the character data test, other 資料，更多文字");
+
+    // substring test non-utf8
+    assert_equals(a.substringData(12, 4), "char");
+    // substring test utf8
+    assert_equals(a.substringData(39, 2), "資料");
+  });
+  </script>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/click_prevent.html b/tests/wpt/mozilla/tests/mozilla/click_prevent.html
new file mode 100644
index 00000000000..c330e7339e4
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/click_prevent.html
@@ -0,0 +1,17 @@
+<html>
+<head>
+<script src="./harness.js"></script>
+<a id="foo" href="/nonexistent">test link</a>
+<script>
+async_test(function() {
+  var link = document.getElementById('foo');
+  link.addEventListener('click', this.step_func(function(ev) {
+    ev.preventDefault();
+  }));
+  var ev = new Event('click', {bubbles: true, cancelable: true});
+  link.dispatchEvent(ev);
+  setTimeout(this.step_func_done(), 500);
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/collections.html b/tests/wpt/mozilla/tests/mozilla/collections.html
new file mode 100644
index 00000000000..2f33466cfa8
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/collections.html
@@ -0,0 +1,149 @@
+<html>
+<head>
+<meta charset="utf-8">
+<title>test_binding
+    page  </title>
+<base href="./"></base>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+
+<div id="first" name="test">fffff<br><br><br><br>fffffffffffffffff</div>
+<div id="second">ggg</div>
+<span id="third" name="test">hhhhhhhh</span>
+<div id="fourth">iiiiiiiiiiiiiiiiiii</div>
+<a href="http://www.mozilla.org"></a>
+<img src="test.jpg"/>
+<embed></embed>
+<form>
+  <fieldset>
+    <legend>legend</legend>
+    <label for="">label<input type="text" value="input" /></label>
+  </fieldset>
+</form>
+<hr />
+<canvas/>
+<p>pppppppppp</p>
+<q>qqqqqqqqqqqqqqqqqqqqqqqqqqq</q>
+<progress max="100" value="80">80%</progress>
+<applet></applet>
+<input type="text" value="input"/>
+<iframe></iframe>
+<ol type="1">
+  <li>li</li>
+</ol>
+<table>
+  <caption>sample table</caption>
+  <colgroup>
+    <col/>
+  </colgroup>
+  <tbody>
+    <tr><th>head</th></tr>
+    <tr><td>data</td></tr>
+  </tbody>
+</table>
+<section>section</section>
+<aside>aside</aside>
+<b>b</b>
+<i>i</i>
+<small>small</small>
+<textarea>textarea</textarea>
+<time datetime="2014-02-14">Valentines day</time>
+<area></area>
+<data></data>
+<dialog></dialog>
+<template></template>
+<pre>pre</pre>
+<audio>
+  <source src="horse.ogg" type="audio/ogg">
+  <source src="horse.mp3" type="audio/mpeg">
+</audio>
+<video src="">
+  <track></track>
+</video>
+
+<foo-á>hi</foo-á>
+
+<script>
+test(function() {
+  function check_collection(obj, num, classes, name) {
+    test(function() {
+      assert_true(obj instanceof HTMLCollection, "Should be HTMLCollection");
+      assert_equals(obj.length, num);
+      assert_equals(obj[obj.length], undefined);
+
+      if (classes === undefined) {
+        return;
+      }
+
+      classes = [Element, HTMLElement].concat(classes);
+
+      for (var i = 0; i < obj.length; i++) {
+        assert_not_equals(obj[i], undefined);
+        assert_equals(obj[i].tagName, name);
+        for (var j = 0; j < classes.length; j++) {
+          assert_true(obj[i] instanceof classes[j], "Should be " + classes[j]);
+        }
+      }
+    });
+  }
+
+  function check_tag(tagname, num, classes, tagname_upper) {
+      if (tagname_upper === undefined)
+          tagname_upper = tagname.toUpperCase();
+      check_collection(document.getElementsByTagName(tagname), num, classes, tagname_upper);
+  }
+
+  check_collection(document.links,   1, [HTMLAnchorElement], "A");
+  check_collection(document.images,  1, [HTMLImageElement],  "IMG");
+  check_collection(document.embeds,  1, [HTMLEmbedElement],  "EMBED");
+  check_collection(document.plugins, 1, [HTMLEmbedElement],  "EMBED");
+  check_collection(document.scripts, 3, [HTMLScriptElement], "SCRIPT");
+  check_collection(document.applets, 1, [HTMLAppletElement], "APPLET");
+  check_collection(document.forms,   1, [HTMLFormElement],   "FORM");
+
+  check_collection(document.getElementsByTagName("nosuchtag"), 0);
+
+  check_tag("section",  1, []);
+  check_tag("aside",    1, []);
+  check_tag("b",        1, []);
+  check_tag("i",        1, []);
+  check_tag("small",    1, []);
+  check_tag("head",     1, [HTMLHeadElement]);
+  check_tag("div",      3, [HTMLDivElement]);
+  check_tag("iframe",   1, [HTMLIFrameElement]);
+  check_tag("body",     1, [HTMLBodyElement]);
+  check_tag("area",     1, [HTMLAreaElement]);
+  check_tag("base",     1, [HTMLBaseElement]);
+  check_tag("data",     1, [HTMLDataElement]);
+  check_tag("dialog",   1, [HTMLDialogElement]);
+  check_tag("ol",       1, [HTMLOListElement]);
+  check_tag("canvas",   1, [HTMLCanvasElement]);
+  check_tag("source",   2, [HTMLSourceElement]);
+  check_tag("time",     1, [HTMLTimeElement]);
+  check_tag("caption",  1, [HTMLTableCaptionElement]);
+  check_tag("textarea", 1, [HTMLTextAreaElement]);
+  check_tag("q",        1, [HTMLQuoteElement]);
+  check_tag("th",       1, [HTMLTableCellElement, HTMLTableHeaderCellElement]);
+  check_tag("td",       1, [HTMLTableCellElement, HTMLTableDataCellElement]);
+  check_tag("col",      1, [HTMLTableColElement]);
+  check_tag("colgroup", 1, [HTMLTableColElement]);
+  check_tag("input",    2, [HTMLInputElement]);
+  check_tag("li",       1, [HTMLLIElement]);
+  check_tag("progress", 1, [HTMLProgressElement]);
+  check_tag("template", 1, [HTMLTemplateElement]);
+  check_tag("pre",      1, [HTMLPreElement]);
+  check_tag("legend",   1, [HTMLLegendElement]);
+  check_tag("label",    1, [HTMLLabelElement]);
+  check_tag("track",    1, [HTMLTrackElement]);
+  check_tag("audio",    1, [HTMLMediaElement, HTMLAudioElement]);
+  check_tag("video",    1, [HTMLMediaElement, HTMLVideoElement]);
+
+  // Test non-ASCII tag names.  Uppercasing is ASCII-only per spec:
+  // http://dom.spec.whatwg.org/#dom-element-tagname
+  check_tag("foo-á", 1, [HTMLUnknownElement], "FOO-á");
+});
+</script>
+</body>
+</html>
diff --git a/tests/content/test_createElement_script.html b/tests/wpt/mozilla/tests/mozilla/createElement_script.html
similarity index 57%
rename from tests/content/test_createElement_script.html
rename to tests/wpt/mozilla/tests/mozilla/createElement_script.html
index ec5b2d01dd0..df819e861d9 100644
--- a/tests/content/test_createElement_script.html
+++ b/tests/wpt/mozilla/tests/mozilla/createElement_script.html
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="harness.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
   </head>
   <body>
     <script>
-      var output = "start";
+    var output;
+    test(function() {
+      output = "start";
 
       var script = document.createElement("script");
       script.setAttribute('type','text/javascript');
@@ -13,7 +16,8 @@
       document.body.appendChild(script);
 
       output += "end";
-      is(output, "start middle end");
+      assert_equals(output, "start middle end");
+    });
     </script>
   </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/create_element.html b/tests/wpt/mozilla/tests/mozilla/create_element.html
new file mode 100644
index 00000000000..0ceeae5de98
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/create_element.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <script>
+  test(function() {
+    var elem = document.createElement("foo");
+    assert_equals(elem.tagName, "FOO");
+    var elem = document.createElement("p");
+    assert_true(elem instanceof HTMLParagraphElement, "Should be HTMLParagraphElement");
+    var elem = document.createElement("sPAn");
+    assert_true(elem instanceof HTMLSpanElement, "Should be HTMLSpanElement");
+    var text = document.createTextNode("hello");
+    assert_true(text instanceof Text, "Should be Text");
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/documentElement.html b/tests/wpt/mozilla/tests/mozilla/documentElement.html
new file mode 100644
index 00000000000..aee3278ba84
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/documentElement.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_true(window instanceof Window, "Should be Window");
+  assert_true(document.documentElement instanceof HTMLHtmlElement, "Should be HTMLHtmlElement");
+  assert_true(document.documentElement.firstChild instanceof HTMLHeadElement, "Should be HTMLHeadElement");
+  assert_equals(document.documentElement.nextSibling, null);
+  assert_true(document instanceof Document, "Should be Document");
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_activeElement.html b/tests/wpt/mozilla/tests/mozilla/document_activeElement.html
new file mode 100644
index 00000000000..92a8e399adb
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_activeElement.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+    <head >
+        <title></title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <input id="foo" type="text"></input>
+        <script>
+          test(function() {
+            assert_not_equals(document.activeElement, null, "test_1.1, document.activeElement");
+            assert_equals(document.activeElement, document.body, "test_1.2, document.activeElement");
+
+            document.getElementById('foo').focus();
+            assert_not_equals(document.activeElement, null, "test_2.1, document.activeElement");
+            assert_equals(document.activeElement, document.getElementById("foo"), "test_2.2, document.activeElement");
+          });
+        </script>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_body.html b/tests/wpt/mozilla/tests/mozilla/document_body.html
new file mode 100644
index 00000000000..526794a4ca9
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_body.html
@@ -0,0 +1,66 @@
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+            test(function() {
+                assert_not_equals(document.body, null, "test1-0, existing document's body");
+                assert_true(document.body instanceof HTMLBodyElement, "test1-1, exising document's body: should be HTMLBodyElement");
+                assert_equals(document.body && document.body.tagName, "BODY", "test1-2, existing document's body");
+            }, "existing document's body");
+
+            test(function() {
+                let new_body = document.createElement("body");
+                assert_not_equals(new_body, null, "test2-0, replace document's body with new body");
+                document.body = new_body;
+                assert_equals(new_body, document.body, "test2-1, replace document's body with new body");
+            }, "replace document's body with new body");
+
+            test(function() {
+                let new_frameset = document.createElement("frameset");
+                assert_not_equals(new_frameset, null, "test2-0, replace document's body with new frameset");
+                document.body = new_frameset;
+                assert_equals(new_frameset, document.body, "test2-1, replace document's body with new frameset");
+            }, "replace document's body with new frameset");
+
+            test(function() {
+                let new_document = new Document();
+                new_document.appendChild(new_document.createElement("html"));
+                let new_div = new_document.createElement("div");
+
+                assert_not_equals(new_div, null, "test4-0, append an invalid element to a new document");
+
+                assert_throws(null, function() {
+                    new_document.body = new_div;
+                });
+                assert_equals(new_document.body, null, "test4-1, append an invalid element to a new document");
+            }, "append an invalid element to a new document");
+
+            test(function() {
+                let new_document = document.implementation.createHTMLDocument();
+                let new_body = new_document.createElement("body");
+
+                assert_not_equals(new_body, null, "test5-0, append body to a new document");
+                assert_true(new_body instanceof HTMLBodyElement, "test5-1, append body to a new document: should be HTMLBodyElement");
+                assert_equals(new_body && new_body.tagName, "BODY", "test5-2, append body to a new document");
+
+                new_document.body = new_body;
+                assert_equals(new_document.body, new_body, "test5-3, append body to a new document");
+            }, "append body to a new document");
+
+            test(function() {
+                let new_document = document.implementation.createHTMLDocument();
+                let new_frameset = new_document.createElement("frameset");
+
+                assert_not_equals(new_frameset, null, "test6-0, append frameset to a new document");
+                assert_true(new_frameset instanceof HTMLFrameSetElement, "test6-1, append frameset to a new document: should be HTMLFrameSetElement");
+                assert_equals(new_frameset && new_frameset.tagName, "FRAMESET", "test6-2, append frameset to a new document");
+
+                new_document.body = new_frameset;
+                assert_equals(new_document.body, new_frameset, "test6-3, append frameset to a new document");
+            }, "append frameset to a new document");
+        </script>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet.html
new file mode 100644
index 00000000000..70d892aae56
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_equals(document.characterSet, "UTF-8", "test1-0, characterSet");
+
+                var xmldoc = new Document;
+                assert_equals(xmldoc.characterSet, "UTF-8", "test2-1, characterSet");
+
+                var htmldoc = document.implementation.createHTMLDocument("title");
+                assert_equals(htmldoc.characterSet, "UTF-8", "test2-2, characterSet");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_default.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_default.html
new file mode 100644
index 00000000000..5dbd445b67b
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_default.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_equals(document.characterSet, "UTF-8", "test1-0, default characterSet");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_invalid.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_invalid.html
new file mode 100644
index 00000000000..129fbe0a389
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_invalid.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="unknown-charset">
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_equals(document.characterSet, "UTF-8", "test1-0, unknown charset");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_compatMode_loose.html b/tests/wpt/mozilla/tests/mozilla/document_compatMode_loose.html
new file mode 100644
index 00000000000..b1bf75b1e7f
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_compatMode_loose.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_equals(document.compatMode, "BackCompat", "test1-0, Loose HTML");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_compatMode_strict.html b/tests/wpt/mozilla/tests/mozilla/document_compatMode_strict.html
new file mode 100644
index 00000000000..39ecdc22bab
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_compatMode_strict.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_equals(document.compatMode, "CSS1Compat", "test1-0, Strict HTML");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_contenttype.html b/tests/wpt/mozilla/tests/mozilla/document_contenttype.html
new file mode 100644
index 00000000000..efa63b2ea39
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_contenttype.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_true(document instanceof Document, "test1-0, HTML document: should be Document");
+                assert_equals(document.contentType, "text/html", "test1-1, HTML document");
+            }, "HTML document");
+
+            test(function() {
+                var doc = new Document;
+                assert_true(doc instanceof Document, "test2-0, XML document: should be Document");
+                assert_equals(doc.contentType, "application/xml", "test2-1, XML document");
+            }, "XML document");
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_datalist_options.html b/tests/wpt/mozilla/tests/mozilla/document_datalist_options.html
new file mode 100644
index 00000000000..28441f21ed5
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_datalist_options.html
@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <datalist id="id">
+    <option value="A">
+    <option value="B">
+    <p>P</p>
+    <div>DIV</div>
+    <option value="C">
+  </datalist>
+  <script>
+  test(function() {
+    var datalist = document.getElementById("id");
+    assert_equals(datalist.options.length, 3);
+    assert_true(datalist.options[0] instanceof HTMLOptionElement, "Should be HTMLOptionElement");
+    assert_true(datalist.options[1] instanceof HTMLOptionElement, "Should be HTMLOptionElement");
+    assert_true(datalist.options[2] instanceof HTMLOptionElement, "Should be HTMLOptionElement");
+  });
+  </script>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_defaultView.html b/tests/wpt/mozilla/tests/mozilla/document_defaultView.html
new file mode 100644
index 00000000000..cd99a11bae9
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_defaultView.html
@@ -0,0 +1,13 @@
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+          test(function() {
+            assert_equals(document.defaultView, window);
+          });
+        </script>
+    </body>
+</html>
diff --git a/tests/content/test_document_getElementById.html b/tests/wpt/mozilla/tests/mozilla/document_getElementById.html
similarity index 77%
rename from tests/content/test_document_getElementById.html
rename to tests/wpt/mozilla/tests/mozilla/document_getElementById.html
index 7484fdf4eb5..4a22528c88f 100644
--- a/tests/content/test_document_getElementById.html
+++ b/tests/wpt/mozilla/tests/mozilla/document_getElementById.html
@@ -1,11 +1,13 @@
 <html>
 <head id="foo">
   <title></title>
-  <script src="harness.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
   <div id="bar"></div>
   <script>
+  test(function() {
     let gBody = document.getElementsByTagName("body")[0];
 
     // Test the assertion with inserting node with child having id into the document (mozilla#2630)
@@ -17,8 +19,9 @@
       a.appendChild(b).id = TEST_ID;
       gBody.appendChild(a);
       let result = document.getElementById(TEST_ID);
-      is(result, b, "test 9-0");
+      assert_equals(result, b, "test 9-0");
     }
+  });
   </script>
 </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_getElementsByName.html b/tests/wpt/mozilla/tests/mozilla/document_getElementsByName.html
new file mode 100644
index 00000000000..07c79725c4d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_getElementsByName.html
@@ -0,0 +1,17 @@
+<html>
+<head >
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div name="foo"></div>
+  <script>
+  test(function() {
+    let nameList = document.getElementsByName("foo");
+    assert_true(nameList instanceof NodeList, "Should be NodeList");
+    assert_false(nameList instanceof HTMLCollection, "Should not be HTMLCollection");
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_head.html b/tests/wpt/mozilla/tests/mozilla/document_head.html
new file mode 100644
index 00000000000..9070609d12c
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_head.html
@@ -0,0 +1,43 @@
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+            test(function() {
+                assert_not_equals(document.head, null, "test1-0, existing document's head");
+                assert_true(document.head instanceof HTMLHeadElement, "test1-1, exising document's head: should be HTMLHeadElement");
+                assert_equals(document.head && document.head.tagName, "HEAD", "test1-2, existing document's head");
+            }, "existing document's head");
+
+            test(function() {
+                let new_document = new Document();
+                new_document.appendChild(new_document.createElement("html"));
+                let new_head = new_document.createElement("head");
+
+                assert_not_equals(new_head, null, "test2-0, append head to a new document");
+                assert_true(new_head instanceof HTMLHeadElement, "test2-1, append head to a new document: should be HTMLHeadElement");
+                assert_equals(new_head && new_head.tagName, "head", "test2-2, append head to a new document");
+
+                // Document::head is read-only.
+                new_document.head = new_head;
+                assert_equals(new_document.head, null, "test2-3, append head to a new document");
+
+                new_document.documentElement.appendChild(new_head);
+                assert_equals(new_document.head, new_head, "test2-4, append head to a new document");
+            }, "append head to a new document");
+
+            test(function() {
+                let new_document = new Document();
+                let html = new_document.createElement("html");
+                let foo = new_document.createElement("foo");
+                let head = new_document.createElement("head");
+                new_document.appendChild(html);
+                html.appendChild(foo);
+                foo.appendChild(head);
+                assert_equals(new_document.head, null, "test3-0, head's parent should be document element");
+            }, "head's parent should be document element");
+        </script>
+    </body>
+</html>
diff --git a/tests/content/test_document_images_cache.html b/tests/wpt/mozilla/tests/mozilla/document_images_cache.html
similarity index 56%
rename from tests/content/test_document_images_cache.html
rename to tests/wpt/mozilla/tests/mozilla/document_images_cache.html
index 9cc990b9e89..b1e4768c9e5 100644
--- a/tests/content/test_document_images_cache.html
+++ b/tests/wpt/mozilla/tests/mozilla/document_images_cache.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
       </head>
       <body>
 
@@ -12,17 +13,19 @@
         </noscript>
 
         <script>
+          test(function() {
             var images = document.images;
-            is(images, document.images);
-            is(images.length, 1);
+            assert_equals(images, document.images);
+            assert_equals(images.length, 1);
 
             var image = document.createElement("img");
             image.setAttribute("src", "test.jpg");
             document.body.appendChild(image);
-            is(images.length, 2);
+            assert_equals(images.length, 2);
 
             document.body.removeChild(image);
-            is(images.length, 1);
+            assert_equals(images.length, 1);
+          });
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_implementation.html b/tests/wpt/mozilla/tests/mozilla/document_implementation.html
new file mode 100644
index 00000000000..e8652d90f56
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_implementation.html
@@ -0,0 +1,76 @@
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_not_equals(document.implementation, null, "test1-0, basic test");
+                assert_true(document.implementation instanceof DOMImplementation, "test1-1, basic test: should be DOMImplementation");
+
+                var implementation = document.implementation;
+                assert_equals(document.implementation, implementation, "test1-2, basic test");
+            }, "basic test");
+
+            test(function() {
+                assert_equals(document.doctype, null, "test2-0, createDocumentType");
+
+                var doctype = document.implementation.createDocumentType("html", null, null);
+                assert_true(doctype && doctype instanceof DocumentType, "test2-1, createDocumentType: should be DocumentType");
+
+                doctype = document.implementation.createDocumentType("html:html", null, null);
+                assert_true(doctype && doctype instanceof DocumentType, "test2-2, createDocumentType: should be DocumentType");
+            }, "createDocumentType");
+
+            test(function() {
+                var htmldoc = document.implementation.createHTMLDocument("example title");
+                assert_not_equals(htmldoc, null, "test3-0, createHTMLDocument");
+                assert_true(htmldoc instanceof Document, "test3-1, createHTMLDocument: should be Document");
+                assert_equals(htmldoc.childNodes.length, 2, "test3-3, createHTMLDocument");
+
+                assert_true(htmldoc.doctype && htmldoc.doctype instanceof DocumentType, "test3-4, createHTMLDocument: should be DocumentType");
+                assert_equals(htmldoc.doctype.name, "html", "test3-5, createHTMLDocument");
+
+                assert_true(htmldoc.documentElement && htmldoc.documentElement instanceof HTMLHtmlElement, "test3-6, createHTMLDocument: should be HTMLHtmlElement");
+                assert_equals(htmldoc.documentElement.childNodes.length, 2, "test3-7, createHTMLDocument");
+                assert_equals(htmldoc.documentElement.tagName, "HTML", "test3-8, createHTMLDocument");
+
+                assert_true(htmldoc.head && htmldoc.head instanceof HTMLHeadElement, "test3-9, createHTMLDocument: should be HTMLHeadElement");
+                assert_equals(htmldoc.head.tagName, "HEAD", "test3-10, createHTMLDocument");
+                assert_equals(htmldoc.head, htmldoc.documentElement.childNodes[0], "test3-11, createHTMLDocument");
+                assert_equals(htmldoc.head.childNodes.length, 1, "test3-12, createHTMLDocument");
+
+                assert_true(htmldoc.head.childNodes[0] instanceof HTMLTitleElement, "test3-13, createHTMLDocument: should be HTMLTitleElement");
+                assert_equals(htmldoc.head.childNodes[0].tagName, "TITLE", "test3-14, createHTMLDocument");
+                assert_equals(htmldoc.title, "example title", "test3-15, createHTMLDocument");
+
+                assert_true(htmldoc.body && htmldoc.body instanceof HTMLBodyElement, "test3-16, createHTMLDocument: should be HTMLBodyElement");
+                assert_equals(htmldoc.body.tagName, "BODY", "test3-17, createHTMLDocument");
+                assert_equals(htmldoc.body, htmldoc.documentElement.childNodes[1], "test3-18, createHTMLDocument");
+                assert_equals(htmldoc.body.childNodes.length, 0, "test3-19, createHTMLDocument");
+            }, "createHTMLDocument");
+
+            test(function() {
+                var doc = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', null);
+                assert_not_equals(doc, null, "test4-0, createDocument");
+                assert_true(doc instanceof Document, "test4-1, createDocument: should be Document");
+                assert_equals(doc.childNodes.length, 1, "test4-2, createDocument");
+                assert_equals(doc.doctype, null, "test4-3, createDocument");
+                assert_true(doc.documentElement instanceof HTMLHtmlElement, "test4-4, createDocument: should be HTMLHtmlElement");
+
+                var doctype = document.implementation.createDocumentType("html", null, null);
+                doc = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', doctype);
+                assert_equals(doc.childNodes.length, 2, "test4-5, createDocument");
+                assert_equals(doc.doctype, doctype, "test4-6, createDocument");
+                assert_true(doc.documentElement instanceof HTMLHtmlElement, "test4-7, createDocument: should be HTMLHtmlElement");
+
+                doctype = document.implementation.createDocumentType(
+                    'svg:svg', '-//W3C//DTD SVG 1.1//EN',
+                    'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd');
+                doc = document.implementation.createDocument('http://www.w3.org/2000/svg', 'svg:svg', doctype);
+                assert_equals(doc.childNodes.length, 2, "test4-8, createDocument");
+                assert_equals(doc.doctype, doctype, "test4-9, createDocument");
+                assert_true(doc.documentElement instanceof Element, "test4-10, createDocument: should be Element");
+            }, "createDocument");
+        </script>
+    </head>
+</html>
diff --git a/tests/content/test_document_links_cache.html b/tests/wpt/mozilla/tests/mozilla/document_links_cache.html
similarity index 58%
rename from tests/content/test_document_links_cache.html
rename to tests/wpt/mozilla/tests/mozilla/document_links_cache.html
index 590939e42f7..3a0172826d4 100644
--- a/tests/content/test_document_links_cache.html
+++ b/tests/wpt/mozilla/tests/mozilla/document_links_cache.html
@@ -1,37 +1,40 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
       </head>
       <body>
         <script>
+          test(function() {
             var links = document.links;
-            is(links, document.links);
-            is(links.length, 0);
+            assert_equals(links, document.links);
+            assert_equals(links.length, 0);
 
             var anchor = document.createElement("a");
             anchor.id = "anchor-with-href";
             anchor.setAttribute("href", "http://www.google.com");
             document.body.appendChild(anchor);
-            is(links.length, 1);
+            assert_equals(links.length, 1);
 
             anchor = document.createElement("a");
             anchor.id = "anchor-without-href";
             document.body.appendChild(anchor);
-            is(links.length, 1);
+            assert_equals(links.length, 1);
 
             anchor.setAttribute("href", "http://www.google.com");
-            is(links.length, 2);
+            assert_equals(links.length, 2);
 
             anchor.removeAttribute("href", "http://www.google.com");
-            is(links.length, 1);
+            assert_equals(links.length, 1);
 
             document.body.removeChild(document.getElementById("anchor-without-href"));
-            is(links.length, 1);
+            assert_equals(links.length, 1);
 
             document.body.removeChild(document.getElementById("anchor-with-href"));
-            is(links, document.links);
-            is(links.length, 0);
+            assert_equals(links, document.links);
+            assert_equals(links.length, 0);
+          });
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_readystate.html b/tests/wpt/mozilla/tests/mozilla/document_readystate.html
new file mode 100644
index 00000000000..7ff8f66cdf7
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_readystate.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <script>
+  async_test(function() {
+    var numChanges = 0;
+    document.addEventListener('readystatechange', this.step_func(function() {
+      numChanges++;
+    }), true);
+    window.onload = this.step_func_done(function() {
+      assert_equals(document.readyState, 'complete');
+      assert_equals(numChanges, 2);
+    });
+    assert_equals(document.readyState, "loading");
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_set_node_value.html b/tests/wpt/mozilla/tests/mozilla/document_set_node_value.html
new file mode 100644
index 00000000000..c6e23b8a055
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_set_node_value.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <body>
+    <div id="div" class="div-class">A</div>
+    <p>P</p>
+    <script>
+    test(function() {
+      assert_equals(document.nodeValue, null);
+      var div = document.getElementById("div");
+      assert_equals(div.nodeValue, null);
+      assert_equals(div.firstChild.nodeValue, "A");
+      div.firstChild.nodeValue = "B";
+      assert_equals(div.firstChild.nodeValue, "B");
+      var commentNode = document.createComment("comment node");
+      assert_equals(commentNode.nodeValue, "comment node");
+    });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_title_nontextchildren.html b/tests/wpt/mozilla/tests/mozilla/document_title_nontextchildren.html
new file mode 100644
index 00000000000..3f132f9ac1a
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_title_nontextchildren.html
@@ -0,0 +1,11 @@
+<html>
+<title>x</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  document.head.firstChild.appendChild(document.createElement("foo"));
+  assert_equals(document.title, "x");
+});
+</script>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_url.html b/tests/wpt/mozilla/tests/mozilla/document_url.html
new file mode 100644
index 00000000000..e1c90d1bcd0
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_url.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+    <head>
+        <title></title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                assert_not_equals(document.URL, null, "test1-0, URL & documentURI");
+                assert_not_equals(document.documentURI, null, "test1-1, URL & documentURI");
+                assert_equals(document.URL, document.documentURI, "test1-2, URL & documentURI");
+            }, "URL & documentURI");
+
+            test(function() {
+                var doc = new Document();
+                assert_equals(doc.URL, "about:blank", "test2-0, new document");
+            }, "new document");
+
+            test(function() {
+                var url = document.URL.split("/");
+                assert_equals(url[0], "http:", "test3-0, current document");
+                assert_equals(url[url.length-1], "document_url.html", "test3-1, current document");
+            }, "current document");
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/domtokenlist.html b/tests/wpt/mozilla/tests/mozilla/domtokenlist.html
new file mode 100644
index 00000000000..a758d566e3e
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/domtokenlist.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+          test(function() {
+            var div = document.createElement("div");
+            var classList = div.classList;
+
+            assert_equals(classList.length, 0);
+            assert_equals(classList.item(0), null);
+            assert_throws(null, function () {
+                classList.contains("");
+            });
+            assert_throws(null, function () {
+                classList.contains(" ");
+            });
+
+            var list = ["foo", " foo", "foo ", " foo ", "   foo   "];
+            for(var i = 0; i < list.length; i++) {
+                div.className = list[i];
+                assert_equals(div.className, list[i]);
+                assert_equals(classList.length, 1);
+                assert_equals(classList.item(0), "foo");
+                assert_equals(classList.item(1), null);
+                assert_equals(classList.contains("foo"), true);
+                assert_equals(classList.contains("bar"), false);
+            }
+
+            list = ["foo bar", " foo bar", " foo bar ", "   foo   bar   "];
+            for(var i = 0; i < list.length; i++) {
+                div.className = list[i];
+                assert_equals(div.className, list[i]);
+                assert_equals(classList.length, 2);
+                assert_equals(classList.item(0), "foo");
+                assert_equals(classList.item(1), "bar");
+                assert_equals(classList.item(2), null);
+                assert_equals(classList.contains("foo"), true);
+                assert_equals(classList.contains("bar"), true);
+                assert_equals(classList.contains("baz"), false);
+            }
+          });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/element_attribute.html b/tests/wpt/mozilla/tests/mozilla/element_attribute.html
new file mode 100644
index 00000000000..a18ec78511a
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/element_attribute.html
@@ -0,0 +1,67 @@
+<html>
+<head id="foo">
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div id="test" foo="bar"></div>
+  <script>
+    let element = document.getElementById("test");
+
+    test(function() {
+      let r1 = element.getAttribute("id");
+      assert_equals(r1, "test", "test1-0, Element.getAttribute().");
+      let r2 = element.getAttribute("foo");
+      assert_equals(r2, "bar", "test1-1, Element.getAttribute().");
+    });
+
+    test(function() {
+      let NAME  = "hoge";
+      let VALUE = "fuga";
+      element.setAttribute(NAME, VALUE);
+      let r = element.getAttribute(NAME);
+      assert_equals(r, VALUE, "test2. Element.setAttribute().");
+    });
+
+    test(function() {
+      let NAME = "foo";
+      let VALUE = "mozilla";
+      element.setAttribute(NAME, VALUE);
+      let r = element.getAttribute(NAME);
+      assert_equals(r, VALUE, "test3, attribute update by Element.setAttribute().")
+    });
+
+    test(function() {
+      element.setAttribute("id", "bar");
+      element.removeAttribute("id");
+
+      let r1 = element.hasAttribute("id");
+      assert_equals(r1, false, "test4-0, Element.removeAttribute().");
+      let r2 = element.getAttribute("id");
+      assert_equals(r2, null, "test4-1, Element.removeAttribute().");
+    });
+
+    test(function() {
+      element.setAttribute("xml:lang", "en");
+
+      let r1 = element.hasAttribute("xml:lang");
+      assert_equals(r1, true, "test5-0, Element.setAttribute('xml:lang').");
+      let r2 = element.getAttribute("xml:lang");
+      assert_not_equals(r2, null, "test5-1, Element.setAttribute('xml:lang').");
+    });
+
+    test(function() {
+      assert_throws(null, function () {
+        element.setAttributeNS("http://example.com", "xmlns", "foo");
+      });
+      assert_throws(null, function () {
+        element.setAttributeNS("http://www.w3.org/2000/xmlns/", "attr", "value");
+      });
+      assert_throws(null, function () {
+        element.setAttributeNS("http://www.w3.org/2000/xmlns/", "prefix:attr", "value");
+      });
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/content/test_element_attributes.html b/tests/wpt/mozilla/tests/mozilla/element_attributes.html
similarity index 50%
rename from tests/content/test_element_attributes.html
rename to tests/wpt/mozilla/tests/mozilla/element_attributes.html
index 7eb560ec258..6a45c5b4c6f 100644
--- a/tests/content/test_element_attributes.html
+++ b/tests/wpt/mozilla/tests/mozilla/element_attributes.html
@@ -1,20 +1,23 @@
 <html>
 <head id="foo">
-  <script src="harness.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
 <div></div>
 <script>
+test(function() {
   var attrs = [];
   for (var i = 'a'.charCodeAt(0); i != 'z'.charCodeAt(0); i++) {
     document.getElementsByTagName('div')[0].setAttribute(String.fromCharCode(i),
-                                                      i.toString());
+                                                         i.toString());
   }
   var attributes = document.getElementsByTagName('div')[0].attributes;
   for (var i = 0; i < attributes.length; i++) {
-    is(attributes[i].name, String.fromCharCode(i + 'a'.charCodeAt(0)));
-    is(attributes[i].value, (i + 'a'.charCodeAt(0)).toString());
+    assert_equals(attributes[i].name, String.fromCharCode(i + 'a'.charCodeAt(0)));
+    assert_equals(attributes[i].value, (i + 'a'.charCodeAt(0)).toString());
   }
+});
 </script>
 </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/element_classList.html b/tests/wpt/mozilla/tests/mozilla/element_classList.html
new file mode 100644
index 00000000000..45936b06490
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/element_classList.html
@@ -0,0 +1,22 @@
+<!-- Remove this and update WPT metadata once DOMTokenList.toggle (#3138) is implemented. -->
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+          test(function() {
+            let div = document.createElement("div");
+            div.className = "foo bar";
+
+            let classList = div.classList;
+            div.className = "";
+
+            assert_equals(classList.item(0), null, "classList.item(0) must return null when all classes have been removed");
+            assert_equals(classList[0], undefined, "classList[0] must be undefined when all classes have been removed");
+          });
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/tests/content/test_element_className.html b/tests/wpt/mozilla/tests/mozilla/element_className.html
similarity index 52%
rename from tests/content/test_element_className.html
rename to tests/wpt/mozilla/tests/mozilla/element_className.html
index 298205c4681..ffce5c17607 100644
--- a/tests/content/test_element_className.html
+++ b/tests/wpt/mozilla/tests/mozilla/element_className.html
@@ -1,36 +1,39 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
         <div id="foo-1" class="foo"></div>
         <div id="foo-2" class="baz"></div>
         <script>
+          test(function() {
             let foo1 = document.getElementById("foo-1");
             let foo2 = document.getElementById("foo-2");
 
             foo1.className += " bar";
-            is(foo1.className, "foo bar");
+            assert_equals(foo1.className, "foo bar");
 
             let foo3 = document.createElement("div");
             foo3.id = "foo-3";
             foo3.className = "foo";
             document.body.appendChild(foo3);
-            is(foo3, document.getElementById("foo-3"));
+            assert_equals(foo3, document.getElementById("foo-3"));
 
             let collection = document.getElementsByClassName("foo");
-            is(collection.length, 2);
-            is(collection[0].id, foo1.id);
-            is(collection[1].id, foo3.id);
+            assert_equals(collection.length, 2);
+            assert_equals(collection[0].id, foo1.id);
+            assert_equals(collection[1].id, foo3.id);
 
             collection = document.getElementsByClassName("bar");
-            is(collection.length, 1);
-            is(collection[0].id, foo1.id);
+            assert_equals(collection.length, 1);
+            assert_equals(collection[0].id, foo1.id);
 
             collection = document.getElementsByClassName("baz");
-            is(collection.length, 1);
-            is(collection[0].id, foo2.id);
+            assert_equals(collection.length, 1);
+            assert_equals(collection[0].id, foo2.id);
+          });
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/element_matches.html b/tests/wpt/mozilla/tests/mozilla/element_matches.html
new file mode 100644
index 00000000000..5e3cc422386
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/element_matches.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div id="foo"></div>
+
+  <script>
+  test(function() {
+    let test = document.getElementById("foo");
+
+    assert_equals(test.matches("#foo"), true, "test-1");
+    assert_equals(test.matches("#not-foo"), false, "test-2");
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/empty_clientrect.html b/tests/wpt/mozilla/tests/mozilla/empty_clientrect.html
new file mode 100644
index 00000000000..d1aa50b2238
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/empty_clientrect.html
@@ -0,0 +1,20 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  var rect = window.document.head.getBoundingClientRect();
+  var rects = window.document.head.getClientRects();
+  assert_true(rect instanceof DOMRect, "Should be DOMRect");
+  assert_equals(rect.top, 0);
+  assert_equals(rect.bottom, 0);
+  assert_equals(rect.left, 0);
+  assert_equals(rect.right, 0);
+  assert_equals(rect.width, 0);
+  assert_equals(rect.height, 0);
+  assert_equals(rects.length, 0);
+});
+</script>
+</head>
+</html>
diff --git a/tests/content/test_enabled_disabled_selectors.html b/tests/wpt/mozilla/tests/mozilla/enabled_disabled_selectors.html
similarity index 81%
rename from tests/content/test_enabled_disabled_selectors.html
rename to tests/wpt/mozilla/tests/mozilla/enabled_disabled_selectors.html
index 3a46183de29..75a7b1a22bc 100644
--- a/tests/content/test_enabled_disabled_selectors.html
+++ b/tests/wpt/mozilla/tests/mozilla/enabled_disabled_selectors.html
@@ -2,7 +2,8 @@
 <html>
     <head>
         <title>Tests for :enabled and :disabled selectors</title>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
         <button id="button-1"></button>
@@ -52,7 +53,16 @@
             </legend>
         </fieldset>
         <script>
-            { // Simple initialization checks.
+            function check_selector(elem, selector, matches) {
+                assert_equals(elem.matches(selector), matches);
+            }
+
+            function check_disabled_selector(elem, disabled) {
+                check_selector(elem, ":disabled", disabled);
+                check_selector(elem, ":enabled", !disabled);
+            }
+
+            test(function() {
                 var list, i, elem;
 
                 // Examples of elements which are never :enabled or :disabled.
@@ -73,15 +83,19 @@
                 }
 
                 // These are :enabled (and not :disabled) by default.
-                // XXX: Add 'menuitem' here whenever available.
                 list = ['button', 'input', 'select', 'textarea', 'optgroup', 'option', 'fieldset'];
                 for(i = 0; i < list.length; i++) {
                     elem = document.createElement(list[i]);
                     check_disabled_selector(elem, false);
                 }
-            }
+            }, "Simple initialization checks");
 
-            { // Document elements tests.
+            test(function() {
+                var elem = document.createElement('menuitem');
+                check_disabled_selector(elem, false);
+            }, "menuitem initial state");
+
+            test(function() {
                 var click_count = 0;
                 var click_event = new Event('click', {bubbles: true, cancelable: true});
                 var list, elem1, elem2, elem3, elem4, elem5;
@@ -93,36 +107,36 @@
                     click_count = 0;
 
                     elem1 = document.getElementById(list[i] + "-1");
-                    is(elem1.disabled, false);
+                    assert_equals(elem1.disabled, false);
 
                     elem1.addEventListener('click', on_click);
                     elem1.dispatchEvent(click_event);
-                    is(click_count, 1);
+                    assert_equals(click_count, 1);
 
                     elem2 = document.getElementById(list[i] + "-2");
-                    is(elem2.disabled, true);
+                    assert_equals(elem2.disabled, true);
 
                     // Only user-generated click events are prevented.
                     elem2.addEventListener('click', on_click);
                     elem2.dispatchEvent(click_event);
-                    is(click_count, 2);
+                    assert_equals(click_count, 2);
 
                     // This should look disabled, though - missing UA's CSS for :disabled?
                     elem3 = document.getElementById(list[i] + "-3");
-                    is(elem3.disabled, false);
+                    assert_equals(elem3.disabled, false);
 
                     if (list[i] == 'option') { continue; }
 
                     elem4 = document.getElementById(list[i] + "-4");
-                    is(elem4.disabled, false);
+                    assert_equals(elem4.disabled, false);
 
                     // This should look disabled, though - missing UA's CSS for :disabled?
                     elem5 = document.getElementById(list[i] + "-5");
-                    is(elem5.disabled, false);
+                    assert_equals(elem5.disabled, false);
                 }
-            }
+            }, "Document elements tests")
 
-            { // JS tests (Button, Input, Select, TextArea).
+            test(function() {
                 var list = ['button', 'input', 'select', 'textarea'];
                 var fieldset = document.createElement("fieldset");
                 fieldset.disabled = true;
@@ -151,9 +165,9 @@
                     div.removeChild(elem);
                     check_disabled_selector(elem, false);
                 }
-            }
+            }, "JS tests (Button, Input, Select, TextArea)");
 
-            { // JS tests (Option).
+            test(function() {
                 var optgroup = document.createElement("optgroup");
                 optgroup.disabled = true;
 
@@ -171,7 +185,7 @@
 
                 optgroup.removeChild(option);
                 check_disabled_selector(option, false);
-            }
+            }, "JS tests (Option)");
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/event_dispatch.html b/tests/wpt/mozilla/tests/mozilla/event_dispatch.html
new file mode 100644
index 00000000000..304b55fbeca
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/event_dispatch.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<span>Paragraph containing <div>event listener</div>.</span>
+<script>
+test(function() {
+  var bodyTimes = 0;
+  function bodyListener(ev) {
+    bodyTimes++;
+    assert_equals(ev.currentTarget, document.getElementsByTagName('body')[0]);
+    assert_equals(ev.target, document.getElementsByTagName('div')[0]);
+    if (bodyTimes == 1) {
+      assert_equals(ev.eventPhase, ev.CAPTURING_PHASE);
+    } else if (bodyTimes == 2) {
+      assert_equals(ev.eventPhase, ev.BUBBLING_PHASE);
+    }
+  }
+
+  var spanTimes = 0;
+  function spanListener(ev) {
+    assert_equals(ev.currentTarget, document.getElementsByTagName('span')[0]);
+    assert_equals(ev.target, document.getElementsByTagName('div')[0]);
+    assert_equals(ev.eventPhase, ev.BUBBLING_PHASE);
+    spanTimes++;
+  }
+
+  var divTimes = 0;
+  function divListener(ev) {
+    var self = document.getElementsByTagName('div')[0];
+    assert_equals(ev.currentTarget, self);
+    assert_equals(ev.target, self);
+    assert_equals(ev.eventPhase, ev.AT_TARGET);
+    divTimes++;
+  }
+
+  document.getElementsByTagName('body')[0].addEventListener("foopy", this.step_func(bodyListener), true);
+  document.getElementsByTagName('body')[0].addEventListener("foopy", this.step_func(bodyListener), false);
+  document.getElementsByTagName('span')[0].addEventListener("foopy", this.step_func(spanListener), false);
+  document.getElementsByTagName('div')[0].addEventListener("foopy", this.step_func(divListener), false);
+  var ev = new Event('foopy', {bubbles: true});
+  assert_equals(ev.bubbles, true);
+  document.getElementsByTagName('div')[0].dispatchEvent(ev);
+  assert_equals(bodyTimes, 2, 'body listener should be called multiple times');
+  assert_equals(divTimes, 1, 'target listener should be called once');
+  assert_equals(spanTimes, 1, 'span listener should be called while bubbling');
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/event_dispatch_dynamic.html b/tests/wpt/mozilla/tests/mozilla/event_dispatch_dynamic.html
new file mode 100644
index 00000000000..08dc4c89a6d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/event_dispatch_dynamic.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<b><b><b></b></b></b>
+<script>
+test(function() {
+  var sawmiddle = -1;
+  var sawouter = -1;
+  var step = 0;
+  var outerb = document.getElementsByTagName('b')[0];
+  var middleb = outerb.firstChild;
+  var innerb = middleb.firstChild;
+  outerb.addEventListener("x", this.step_func(function() {
+    middleb.addEventListener("x", this.step_func(function() {
+      sawmiddle = step++;
+    }), true);
+    sawouter = step++;
+  }), true);
+  innerb.dispatchEvent(new Event("x"));
+  assert_equals(sawmiddle, 1);
+  assert_equals(sawouter, 0);
+});
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/event_dispatch_order.html b/tests/wpt/mozilla/tests/mozilla/event_dispatch_order.html
new file mode 100644
index 00000000000..48513cfff42
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/event_dispatch_order.html
@@ -0,0 +1,44 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="foo"></div>
+<script>
+test(function() {
+  var sawBubble = false;
+  var sawCapture = false;
+  var sawBubbleTwice = false;
+  function handler(ev) {
+    assert_equals(ev.eventPhase, ev.AT_TARGET);
+    assert_equals(sawBubble, false);
+    assert_equals(sawCapture, false);
+    sawBubble = true;
+  }
+  function handler2(ev) {
+    assert_equals(ev.eventPhase, ev.AT_TARGET);
+    assert_equals(sawBubble, true);
+    assert_equals(sawCapture, false);
+    sawCapture = true;
+  }
+  function handler3(ev) {
+    assert_equals(ev.eventPhase, ev.AT_TARGET);
+    assert_equals(sawBubble, true);
+    assert_equals(sawCapture, true);
+    sawBubbleTwice = true;
+  }
+
+  var target = document.getElementById('foo');
+  target.addEventListener('foopy', this.step_func(handler), false);
+  target.addEventListener('foopy', this.step_func(handler2), true);
+  target.addEventListener('foopy', this.step_func(handler3), false);
+  var ev = new Event('foopy', {bubbles: true});
+  target.dispatchEvent(ev);
+  assert_equals(sawBubble, true);
+  assert_equals(sawCapture, true);
+  assert_equals(sawBubbleTwice, true);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/event_handler_syntax_error.html b/tests/wpt/mozilla/tests/mozilla/event_handler_syntax_error.html
new file mode 100644
index 00000000000..78962c67d2c
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/event_handler_syntax_error.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title></title>
+  <meta charset="UTF-8">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <a id="a" onclick="{">link</a>
+  <script>
+  test(function() {
+    var a = document.getElementById("a");
+    assert_equals(a.onclick, null, "invalid onclick attribute");
+
+    document.body.setAttribute("onx", "{");
+    document.body.setAttribute("ony", "}");
+
+    assert_equals(document.body.getAttribute("onx"), "{");
+    assert_equals(document.body.getAttribute("ony"), "}");
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/content/test_event_listener.html b/tests/wpt/mozilla/tests/mozilla/event_listener.html
similarity index 76%
rename from tests/content/test_event_listener.html
rename to tests/wpt/mozilla/tests/mozilla/event_listener.html
index da040fb2ed6..0ba1ce0d557 100644
--- a/tests/content/test_event_listener.html
+++ b/tests/wpt/mozilla/tests/mozilla/event_listener.html
@@ -1,13 +1,15 @@
 <html>
 <head>
-<script src="harness.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
 <script>
+test(function() {
   function onFoopy(ev) {
     window.removeEventListener('foopy', onFoopy);
-    is(ev instanceof expected, true);
-    is(ev.type, 'foopy');
+    assert_equals(ev instanceof expected, true);
+    assert_equals(ev.type, 'foopy');
   }
 
   var expected;
@@ -18,7 +20,7 @@
                                                   0, 0, 0, 0, false, false,
                                                   false, false, 0, null); }]];
   for (var i = 0; i < events.length; i++) {
-    addEventListener('foopy', onFoopy);
+    addEventListener('foopy', this.step_func(onFoopy));
     expected = events[i][1];
     var ev = document.createEvent(events[i][0]);
     events[i][2](ev);
@@ -27,11 +29,12 @@
 
   var constructors = [Event, UIEvent, MouseEvent];
   for (var i = 0; i < constructors.length; i++) {
-    addEventListener('foopy', onFoopy);
+    addEventListener('foopy', this.step_func(onFoopy));
     expected = constructors[i];
     var ev = new constructors[i]('foopy', {cancelable: true, bubbles: true});
     window.dispatchEvent(ev);
   }
+});
 </script>
 </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/focus_blur.html b/tests/wpt/mozilla/tests/mozilla/focus_blur.html
new file mode 100644
index 00000000000..83575faf7ad
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/focus_blur.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <input id="a">
+  <input id="b">
+  <script>
+  test(function() {
+    var a = document.getElementById("a");
+    var b = document.getElementById("b");
+
+    assert_equals(document.activeElement, document.body);
+    a.focus();
+    assert_equals(document.activeElement, a);
+    b.focus();
+    assert_equals(document.activeElement, b);
+    a.blur();
+    assert_equals(document.activeElement, b);
+    b.blur();
+    assert_equals(document.activeElement, document.body);
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html b/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
new file mode 100644
index 00000000000..8d65b672072
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/getBoundingClientRect.html
@@ -0,0 +1,37 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+    position: relative;
+    top:  100px;
+    left: 100px;
+    width: 100px;
+    height: 100px;
+}
+</style>
+</head>
+<body>
+    <div>my div</div>
+    <script>
+    test(function() {
+      assert_equals(String(DOMRect).indexOf("function DOMRect("), 0);
+
+      var elems = document.getElementsByTagName('div');
+      var rect = elems[0].getBoundingClientRect();
+      assert_true(rect instanceof DOMRect, "Should be DOMRect");
+
+      assert_greater_than_equal(rect.top,    100);
+      assert_greater_than_equal(rect.bottom, 200);
+      assert_greater_than_equal(rect.left,   100);
+      assert_greater_than_equal(rect.right,  200);
+
+      assert_equals(rect.width, 100);
+      assert_equals(rect.height, 100);
+      assert_equals(rect.width,  rect.right  - rect.left);
+      assert_equals(rect.height, rect.bottom - rect.top);
+    });
+    </script>
+</body>
+</html>
diff --git a/tests/content/test_getPropertyPriority.html b/tests/wpt/mozilla/tests/mozilla/getPropertyPriority.html
similarity index 76%
rename from tests/content/test_getPropertyPriority.html
rename to tests/wpt/mozilla/tests/mozilla/getPropertyPriority.html
index 85bcde77238..75cd6517ffc 100644
--- a/tests/content/test_getPropertyPriority.html
+++ b/tests/wpt/mozilla/tests/mozilla/getPropertyPriority.html
@@ -1,10 +1,12 @@
 <html>
   <head>
-    <script src="harness.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
   </head>
   <body>
     <div id="important" style='outline-color: #111 !important; outline-style: solid !important; outline-width: 1px !important; background-color: #222 !important; color: #FFF'></div>
     <script>
+    test(function() {
       var properties = {
         'outline-color': 'important',
         'outline-style': 'important',
@@ -18,8 +20,9 @@
       for (var property in Object.keys(properties)) {
         var name = Object.keys(properties)[property];
         var value = properties[name];
-        is(elem.style.getPropertyPriority(name), value, name + ' priority');
+        assert_equals(elem.style.getPropertyPriority(name), value, name + ' priority');
       }
+    });
     </script>
   </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/global.html b/tests/wpt/mozilla/tests/mozilla/global.html
new file mode 100644
index 00000000000..5ce66ed4b40
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/global.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+var global = this;
+test(function() {
+  assert_equals(window, window.window);
+  assert_equals(window, global);
+  for (var key in global) {
+    assert_equals(global[key], window[key]);
+  }
+});
+</script>
+</head>
+</html>
diff --git a/tests/content/test_htmlcollection.html b/tests/wpt/mozilla/tests/mozilla/htmlcollection.html
similarity index 50%
rename from tests/content/test_htmlcollection.html
rename to tests/wpt/mozilla/tests/mozilla/htmlcollection.html
index 410c54b2ddf..98098e2e711 100644
--- a/tests/content/test_htmlcollection.html
+++ b/tests/wpt/mozilla/tests/mozilla/htmlcollection.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
         <div id="foo-1" class="foo"></div>
@@ -25,93 +26,88 @@
 
             let htmlcollection = null;
 
-            // test1: HTMLCollection interface
-            {
+            test(function() {
                 htmlcollection = document.getElementsByClassName("foo");
-                is(htmlcollection.length, 2);
-                is(htmlcollection.item(0), foo1);
-                is(htmlcollection.item(1), foo2);
-                is(htmlcollection.item(2), null);
-                is(htmlcollection.namedItem("foo-1"), foo1);
-                is(htmlcollection.namedItem("bar"), null);
+                assert_equals(htmlcollection.length, 2);
+                assert_equals(htmlcollection.item(0), foo1);
+                assert_equals(htmlcollection.item(1), foo2);
+                assert_equals(htmlcollection.item(2), null);
+                assert_equals(htmlcollection.namedItem("foo-1"), foo1);
+                assert_equals(htmlcollection.namedItem("bar"), null);
 
                 htmlcollection = document.getElementsByClassName("FOO");
-                is(htmlcollection.length, 0);
+                assert_equals(htmlcollection.length, 0);
 
                 htmlcollection = document.getElementsByClassName("bar");
-                is(htmlcollection.length, 1);
-                is(htmlcollection.item(0), bar);
-                is(htmlcollection.item(1), null);
-                is(htmlcollection.namedItem("bar"), bar);
-            }
+                assert_equals(htmlcollection.length, 1);
+                assert_equals(htmlcollection.item(0), bar);
+                assert_equals(htmlcollection.item(1), null);
+                assert_equals(htmlcollection.namedItem("bar"), bar);
+            }, "HTMLCollection interface");
 
-            // test2: live HTMLCollection
-            {
+            test(function() {
                 htmlcollection = document.getElementsByClassName("live");
-                is(htmlcollection.length, 1);
-                is(htmlcollection.item(0), live);
+                assert_equals(htmlcollection.length, 1);
+                assert_equals(htmlcollection.item(0), live);
 
                 let new_live = document.createElement("div");
                 new_live.className = "live";
                 document.body.appendChild(new_live);
-                is(htmlcollection.length, 2);
-                is(htmlcollection.item(1), new_live);
+                assert_equals(htmlcollection.length, 2);
+                assert_equals(htmlcollection.item(1), new_live);
 
                 document.body.removeChild(new_live);
-                is(htmlcollection.length, 1);
-            }
+                assert_equals(htmlcollection.length, 1);
+            }, "live HTMLCollection");
 
-            // test3: getElementsByTagName
-            {
-                is(document.getElementsByTagName("DIV").length, 5);
+            test(function() {
+                assert_equals(document.getElementsByTagName("DIV").length, 5);
 
-                is(document.getElementsByTagName("div").length,
+                assert_equals(document.getElementsByTagName("div").length,
                    document.documentElement.getElementsByTagName("div").length);
 
-                is(document.getElementsByTagName("p").length,
+                assert_equals(document.getElementsByTagName("p").length,
                    document.getElementById("class-example").getElementsByTagName("p").length);
-            }
+            }, "getElementsByTagName");
 
-            // test4: getElementsByTagNameNS
-            {
+            test(function() {
                 htmlcollection = document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "div");
-                is(htmlcollection.length, 5);
+                assert_equals(htmlcollection.length, 5);
 
                 let from_element = document.documentElement.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "div");
-                is(htmlcollection.length, from_element.length);
+                assert_equals(htmlcollection.length, from_element.length);
 
                 htmlcollection = document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "DIV");
-                is(htmlcollection.length, 0);
+                assert_equals(htmlcollection.length, 0);
 
                 htmlcollection = document.getElementsByTagNameNS("", "div");
-                is(htmlcollection.length, 0);
+                assert_equals(htmlcollection.length, 0);
 
                 htmlcollection = document.getElementsByTagNameNS("invalid", "div");
-                is(htmlcollection.length, 0);
+                assert_equals(htmlcollection.length, 0);
 
                 from_element = document.getElementById("class-example").getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "p");
-                is(from_element.length, 3);
-            }
+                assert_equals(from_element.length, 3);
+            }, "getElementsByTagNameNS");
 
-            // test5: document.getElementsByClassName
-            {
+            test(function() {
                 htmlcollection = document.getElementsByClassName("aaa");
-                is(htmlcollection.length, 2);
-                is(htmlcollection.item(0), p1);
-                is(htmlcollection.item(1), p2);
+                assert_equals(htmlcollection.length, 2);
+                assert_equals(htmlcollection.item(0), p1);
+                assert_equals(htmlcollection.item(1), p2);
 
                 htmlcollection = document.getElementsByClassName("ccc bbb");
-                is(htmlcollection.length, 1);
-                is(htmlcollection.item(0), p3);
+                assert_equals(htmlcollection.length, 1);
+                assert_equals(htmlcollection.item(0), p3);
 
                 htmlcollection = document.getElementsByClassName("aaa,bbb");
-                is(htmlcollection.length, 0);
+                assert_equals(htmlcollection.length, 0);
 
                 let from_element = document.getElementById("class-example").getElementsByClassName("bbb");
-                is(from_element.length, 2);
-                is(from_element.item(0), p1);
-                is(from_element.item(1), p3);
-            }
+                assert_equals(from_element.length, 2);
+                assert_equals(from_element.item(0), p1);
+                assert_equals(from_element.item(1), p3);
+            }, "document.getElementsByClassName");
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/htmlfieldsetelement_elements.html b/tests/wpt/mozilla/tests/mozilla/htmlfieldsetelement_elements.html
new file mode 100644
index 00000000000..ee0ea4ae15f
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/htmlfieldsetelement_elements.html
@@ -0,0 +1,47 @@
+<html>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <fieldset id="fs">
+    <legend>Display</legend>
+    <input type=radio name=a>
+    <fieldset>
+      <button>Click!</button>
+    </fieldset>
+    <keygen name="key">
+    <textarea>
+      A
+    </textarea>
+    <select>
+      <option value="1"> A </option>
+      <option value="2" selected> B </option>
+    </select>
+    <form onsubmit="return false" oninput="o.value = a.valueAsNumber + b.valueAsNumber">
+      <input name=a type=number step=any> +
+      <input name=b type=number step=any> =
+      <output name=c for="a b"></output>
+    </form>
+    <figure>
+      <object type="application/x-java-applet">
+        <param name="code" value="MyJavaClass">
+        <p>You do not have Java available, or it is disabled.</p>
+      </object>
+      <figcaption>My Java Clock</figcaption>
+    </figure>
+  </fieldset>
+  <script>
+  test(function() {
+    var fs = document.getElementById("fs");
+    assert_equals(fs.elements.length, 10);
+    assert_true(fs.elements[0] instanceof HTMLInputElement, "Should be HTMLInputElement");
+    assert_true(fs.elements[1] instanceof HTMLFieldSetElement, "Should be HTMLFieldSetElement");
+    assert_true(fs.elements[2] instanceof HTMLButtonElement, "Should be HTMLButtonElement");
+    assert_true(fs.elements[3] instanceof HTMLUnknownElement, "Should be HTMLUnknownElement");
+    assert_true(fs.elements[4] instanceof HTMLTextAreaElement, "Should be HTMLTextAreaElement");
+    assert_true(fs.elements[5] instanceof HTMLSelectElement, "Should be HTMLSelectElement");
+    assert_true(fs.elements[6] instanceof HTMLInputElement, "Should be HTMLInputElement");
+    assert_true(fs.elements[7] instanceof HTMLInputElement, "Should be HTMLInputElement");
+    assert_true(fs.elements[8] instanceof HTMLOutputElement, "Should be HTMLOutputElement");
+    assert_true(fs.elements[9] instanceof HTMLObjectElement, "Should be HTMLObjectElement");
+  });
+  </script>
+</html>
diff --git a/tests/content/test_htmlspacechars.html b/tests/wpt/mozilla/tests/mozilla/htmlspacechars.html
similarity index 68%
rename from tests/content/test_htmlspacechars.html
rename to tests/wpt/mozilla/tests/mozilla/htmlspacechars.html
index fbb6046d8c3..31cb0c0be6c 100644
--- a/tests/content/test_htmlspacechars.html
+++ b/tests/wpt/mozilla/tests/mozilla/htmlspacechars.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
         <!-- \u0020 Space -->
@@ -19,8 +20,10 @@
         <!-- Non-HTML space character -->
         <div id="bar" class="ggg&#11;foo"></div>
         <script>
-            is(document.getElementsByClassName("foo").length, 6);
-            is_not(document.getElementById("bar").className, "ggg foo");
+          test(function() {
+            assert_equals(document.getElementsByClassName("foo").length, 6);
+            assert_not_equals(document.getElementById("bar").className, "ggg foo");
+          });
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html b/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html
new file mode 100644
index 00000000000..28dd011d2cf
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/iframe_contentDocument.html
@@ -0,0 +1,28 @@
+<html>
+<head>
+<meta charset="utf8" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<title>Iframe contentDocument test.</title>
+</head>
+<body>
+<iframe src="resources/iframe_contentDocument_inner.html" id="iframe"></iframe>
+<script>
+async_test(function() {
+  var timeout = 100;
+  var iframe = document.getElementById('iframe');
+  function test_contentWindow() {
+    if (!iframe.contentWindow) {
+      // Iframe not loaded yet, try again.
+      // No load event for iframe, insert bug number here.
+      setTimeout(this.step_func(test_contentWindow), timeout);
+      return;
+    }
+    assert_equals(iframe.contentDocument.getElementById('test').textContent, 'value');
+    this.done();
+  }
+  this.step(test_contentWindow);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/img_width_height.html b/tests/wpt/mozilla/tests/mozilla/img_width_height.html
new file mode 100644
index 00000000000..c792668083c
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/img_width_height.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <img src="test.png"/>
+<script>
+// Testing get/set of image width/height properties
+async_test(function() {
+  var img = window.document.getElementsByTagName("img")[0];
+
+  var wait_for_img_load = this.step_func(function (f) {
+	  if (img.width != 0) {
+		  f();
+	  } else {
+		  window.setTimeout(function() { wait_for_img_load(f) }, 1);
+	  }
+  });
+
+  wait_for_img_load(this.step_func_done(function() {
+	  assert_equals(img.width, 500);
+	  assert_equals(img.height, 378);
+	  img.width = 200;
+	  img.height = 100;
+	  assert_equals(img.width, 200);
+	  assert_equals(img.height, 100);
+  }));
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/inline_event_handler.html b/tests/wpt/mozilla/tests/mozilla/inline_event_handler.html
new file mode 100644
index 00000000000..4f86be5b9cb
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/inline_event_handler.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body onload="t.step(function() { assert_true(event instanceof Event, 'Should be Event'); this.done(); })">
+<script>
+var t = async_test();
+</script>
+</body>
+</html>
diff --git a/tests/content/test_innerHTML.html b/tests/wpt/mozilla/tests/mozilla/innerHTML.html
similarity index 55%
rename from tests/content/test_innerHTML.html
rename to tests/wpt/mozilla/tests/mozilla/innerHTML.html
index b140cfbe894..031e67e0c3b 100644
--- a/tests/content/test_innerHTML.html
+++ b/tests/wpt/mozilla/tests/mozilla/innerHTML.html
@@ -1,12 +1,15 @@
 <html>
   <head>
-    <script src="harness.js"></script>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
     <script>
+    test(function() {
       var a = document.createElement("div");
       a.appendChild(document.createElement("pre")).appendChild(new Text(""));
       var b = document.createElement("div");
       b.appendChild(a);
-      is(b.innerHTML, "<div><pre></pre></div>");
+      assert_equals(b.innerHTML, "<div><pre></pre></div>");
+    });
     </script>
   </head>
 </html>
diff --git a/tests/content/test_interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html
similarity index 78%
rename from tests/content/test_interfaces.html
rename to tests/wpt/mozilla/tests/mozilla/interfaces.html
index cb566e4ce1a..a3a4712ee13 100644
--- a/tests/content/test_interfaces.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
 <title>Interfaces exposed on the window</title>
-<script src="harness.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
 // This is a list of all interfaces that are exposed to every webpage.
 // Please only add things to this list with great care and proper review
@@ -89,6 +90,7 @@ var interfaceNamesInGlobalScope = [
   "HTMLCollection",
   "HTMLDataElement",
   "HTMLDataListElement",
+  "HTMLDialogElement",
   "HTMLDirectoryElement",
   "HTMLDivElement",
   "HTMLDListElement",
@@ -154,6 +156,7 @@ var interfaceNamesInGlobalScope = [
   "NamedNodeMap",
   "Navigator",
   "Node",
+  "NodeFilter",
   "NodeIterator",
   "NodeList",
   "Performance",
@@ -166,6 +169,7 @@ var interfaceNamesInGlobalScope = [
   "StorageEvent",
   "TestBinding", // XXX
   "Text",
+  "TextDecoder",
   "TextEncoder",
   "TreeWalker",
   "UIEvent",
@@ -194,26 +198,30 @@ function createInterfaceMap() {
 
   addInterfaces(ecmaGlobals);
   addInterfaces(interfaceNamesInGlobalScope);
+  addInterfaces(["EventWatcher"]);
   return interfaceMap;
 }
 
-var interfaceMap = createInterfaceMap();
-for (var name of Object.getOwnPropertyNames(window)) {
-  if (!/^[A-Z]/.test(name)) {
-    continue;
+test(function() {
+  var interfaceMap = createInterfaceMap();
+  for (var name of Object.getOwnPropertyNames(window)) {
+    if (!/^[A-Z]/.test(name)) {
+      continue;
+    }
+    assert_true(name in interfaceMap,
+                "If this is failing: DANGER, are you sure you want to expose the new " +
+                "interface " + name + " to all webpages as a property on the window? " +
+                "Do not make a change to this file without review from jdm or Ms2ger " +
+                "for that specific change!");
+    if (name in interfaceMap) {
+      delete interfaceMap[name];
+    }
   }
-  is_in(name, interfaceMap,
-        "If this is failing: DANGER, are you sure you want to expose the new " +
-        "interface " + name + " to all webpages as a property on the window? " +
-        "Do not make a change to this file without review from jdm or Ms2ger " +
-        "for that specific change!");
-  if (name in interfaceMap) {
-    delete interfaceMap[name];
+  for (var name of Object.keys(interfaceMap)) {
+    assert_true(name in window, name + " should be defined on the global scope");
   }
-}
-for (var name of Object.keys(interfaceMap)) {
-  is_in(name, window, name + " should be defined on the global scope");
-}
-is(Object.keys(interfaceMap).length, 0,
-   "The following interface(s) are not enumerated: " + Object.keys(interfaceMap).join(", "));
+  assert_equals(Object.keys(interfaceMap).length, 0,
+                "The following interface(s) are not enumerated: " +
+                Object.keys(interfaceMap).join(", "));
+});
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/lenient_this.html b/tests/wpt/mozilla/tests/mozilla/lenient_this.html
new file mode 100644
index 00000000000..960c74613f3
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/lenient_this.html
@@ -0,0 +1,22 @@
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            var handler = function () { };
+            document.onreadystatechange = handler;
+            var obj = {};
+
+            test(function() {
+                var val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(document);
+                assert_equals(val, handler, "test1-0, basic test");
+            }, "basic test");
+
+            test(function() {
+                var val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(obj);
+                assert_equals(val, undefined, "test2-0, calling getter returns undefined");
+                assert_equals(Document.prototype.onreadystatechange, undefined, "test2-1, property access returns undefined");
+            }, 'Should not throw for attribute marked "[LenientThis]"');
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/load_event.html b/tests/wpt/mozilla/tests/mozilla/load_event.html
new file mode 100644
index 00000000000..091909ee81c
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/load_event.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+async_test(function() {
+  var onloads = 0;
+  function check(ev) {
+    assert_true(ev instanceof Event, "Should be Event");
+    ev.preventDefault();
+    assert_equals(ev.defaultPrevented, false);
+    assert_equals(ev.target, document);
+    assert_equals(ev.currentTarget, window);
+  }
+
+  window.onload = this.unreached_func("this inline handler should be overwritten");
+  window.onload = this.step_func(function(ev) {
+    onloads++;
+    assert_equals(onloads, 1);
+    check(ev);
+  });
+  addEventListener("load", this.step_func_done(function(ev) {
+    onloads++;
+    assert_equals(onloads, 2);
+    check(ev);
+  }));
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/navigator.html b/tests/wpt/mozilla/tests/mozilla/navigator.html
new file mode 100644
index 00000000000..83f74b6e6cf
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/navigator.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+test(function() {
+  assert_equals(window.navigator, window.navigator);
+  assert_true(window.navigator instanceof Navigator, "Should be Navigator");
+
+  var nav = window.navigator;
+  assert_equals(nav.product, "Gecko");
+  assert_equals(nav.taintEnabled(), false);
+  assert_equals(nav.appName, "Netscape");
+  assert_equals(nav.appCodeName, "Mozilla");
+  assert_equals(nav.platform, "");
+  assert_equals(nav.appVersion, "4.0");
+});
+</script>
+</body>
+</html>
diff --git a/tests/content/test_node_cloneNode.html b/tests/wpt/mozilla/tests/mozilla/node_cloneNode.html
similarity index 86%
rename from tests/content/test_node_cloneNode.html
rename to tests/wpt/mozilla/tests/mozilla/node_cloneNode.html
index 7342ba9eb8c..b2ab789af00 100644
--- a/tests/content/test_node_cloneNode.html
+++ b/tests/wpt/mozilla/tests/mozilla/node_cloneNode.html
@@ -1,22 +1,25 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script>
             function check_copy(orig, copy, type) {
-                is_not(orig, copy);
-                is_a(orig, type);
-                is_a(copy, type);
+                assert_not_equals(orig, copy);
+                assert_true(orig instanceof type, "Should be type");
+                assert_true(copy instanceof type, "Should be type");
             }
 
             function create_element_and_check(localName, type) {
+              test(function() {
                 var element = document.createElement(localName);
                 var copy = element.cloneNode();
                 check_copy(element, copy, type);
+              }, "createElement(" + localName + ")");
             }
 
             // test1: createElement
-            {
+            test(function() {
                 create_element_and_check("a",         HTMLAnchorElement);
                 create_element_and_check("abbr",      HTMLElement);
                 create_element_and_check("acronym",   HTMLElement);
@@ -139,66 +142,58 @@
                 create_element_and_check("video",     HTMLVideoElement);
                 create_element_and_check("unknown",   HTMLUnknownElement);
                 create_element_and_check("wbr",       HTMLElement);
-            }
+            }, "");
 
-            // test2: createDocumentFragment
-            {
+            test(function() {
                 var fragment = document.createDocumentFragment();
                 var copy = fragment.cloneNode();
                 check_copy(fragment, copy, DocumentFragment);
-            }
+            }, "createDocumentFragment");
 
-            // test3: createTextNode
-            {
+            test(function() {
                 var text = document.createTextNode("hello world");
                 var copy = text.cloneNode();
                 check_copy(text, copy, Text);
-                is(text.data, copy.data);
-                is(text.wholeText, copy.wholeText);
-            }
+                assert_equals(text.data, copy.data);
+                assert_equals(text.wholeText, copy.wholeText);
+            }, "createTextNode");
 
-            // test4: createComment
-            {
+            test(function() {
                 var comment = document.createComment("a comment");
                 var copy = comment.cloneNode();
                 check_copy(comment, copy, Comment);
-                is(comment.data, copy.data);
-            }
+                assert_equals(comment.data, copy.data);
+            }, "createComment");
 
-            // test5: createProcessingInstruction
-            {
+            test(function() {
                 var pi = document.createProcessingInstruction("target", "data");
                 var copy = pi.cloneNode();
                 check_copy(pi, copy, ProcessingInstruction);
-                is(pi.data, copy.data);
-                is(pi.target, pi.target);
-            }
+                assert_equals(pi.data, copy.data);
+                assert_equals(pi.target, pi.target);
+            }, "createProcessingInstruction");
 
-            // test6: implementation.createDocumentType
-            {
+            test(function() {
                 var doctype = document.implementation.createDocumentType("html", "public", "system");
                 var copy = doctype.cloneNode();
                 check_copy(doctype, copy, DocumentType);
-                is(doctype.name, copy.name);
-                is(doctype.publicId, copy.publicId);
-                is(doctype.systemId, copy.systemId);
-            }
+                assert_equals(doctype.name, copy.name);
+                assert_equals(doctype.publicId, copy.publicId);
+                assert_equals(doctype.systemId, copy.systemId);
+            }, "implementation.createDocumentType");
 
-            // test7: implementation.createDocument
-            {
+            test(function() {
                 // FIXME: https://github.com/mozilla/servo/issues/1509
-            }
+            }, "implementation.createDocument");
 
-            // test8: implementation.createHTMLDocument
-            {
+            test(function() {
                 var html = document.implementation.createHTMLDocument("title");
                 var copy = html.cloneNode();
                 check_copy(html, copy, Document);
-                is(html.title, copy.title);
-            }
+                assert_equals(html.title, copy.title);
+            }, "implementation.createHTMLDocument");
 
-            // test9: node with children
-            {
+            test(function() {
                 var parent = document.createElement("div");
                 var child1 = document.createElement("div");
                 var child2 = document.createElement("div");
@@ -212,21 +207,21 @@
                 var copy = parent.cloneNode(deep);
 
                 check_copy(parent, copy, HTMLDivElement);
-                is(copy.childNodes.length, 2);
+                assert_equals(copy.childNodes.length, 2);
 
                 check_copy(child1, copy.childNodes[0], HTMLDivElement);
-                is(copy.childNodes[0].childNodes.length, 0);
+                assert_equals(copy.childNodes[0].childNodes.length, 0);
 
                 check_copy(child2, copy.childNodes[1], HTMLDivElement);
-                is(copy.childNodes[1].childNodes.length, 1);
+                assert_equals(copy.childNodes[1].childNodes.length, 1);
                 check_copy(grandChild, copy.childNodes[1].childNodes[0], HTMLDivElement);
 
                 deep = false;
                 copy = parent.cloneNode(deep);
 
                 check_copy(parent, copy, HTMLDivElement);
-                is(copy.childNodes.length, 0);
-            }
+                assert_equals(copy.childNodes.length, 0);
+            }, "node with children");
         </script>
     </head>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_compareDocumentPosition.html b/tests/wpt/mozilla/tests/mozilla/node_compareDocumentPosition.html
new file mode 100644
index 00000000000..67a73b7f06f
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_compareDocumentPosition.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+                test(function() {
+                        var elem = document.createElement("div");
+                        var other = document.createElement("div");
+                        assert_equals(elem.compareDocumentPosition(elem),0);
+
+                        var nonTree = elem.compareDocumentPosition(other);
+                        var prefix = Node.DOCUMENT_POSITION_DISCONNECTED + Node.DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
+                        assert_equals(nonTree == prefix + Node.DOCUMENT_POSITION_FOLLOWING || nonTree == prefix + Node.DOCUMENT_POSITION_PRECEDING,
+                           true);
+
+                        elem.appendChild(other);
+                        assert_equals(elem.compareDocumentPosition(other), Node.DOCUMENT_POSITION_CONTAINED_BY + Node.DOCUMENT_POSITION_FOLLOWING);
+                        assert_equals(other.compareDocumentPosition(elem), Node.DOCUMENT_POSITION_CONTAINS + Node.DOCUMENT_POSITION_PRECEDING);
+
+                        var another = document.createElement("div");
+                        other.appendChild(another);
+                        assert_equals(elem.compareDocumentPosition(another), Node.DOCUMENT_POSITION_CONTAINED_BY + Node.DOCUMENT_POSITION_FOLLOWING);
+                        assert_equals(another.compareDocumentPosition(elem), Node.DOCUMENT_POSITION_CONTAINS + Node.DOCUMENT_POSITION_PRECEDING);
+
+                        var follower = document.createElement("div");
+                        elem.appendChild(follower);
+                        var preceder = document.createElement("div");
+                        another.appendChild(preceder);
+                        assert_equals(another.compareDocumentPosition(follower), Node.DOCUMENT_POSITION_FOLLOWING);
+                        assert_equals(follower.compareDocumentPosition(another), Node.DOCUMENT_POSITION_PRECEDING);
+                        assert_equals(follower.compareDocumentPosition(preceder), Node.DOCUMENT_POSITION_PRECEDING);
+                });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_contains.html b/tests/wpt/mozilla/tests/mozilla/node_contains.html
new file mode 100644
index 00000000000..d76471fec9d
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_contains.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                var parent = document.createElement("div");
+                var child = document.createElement("div");
+                var child_of_child = document.createElement("div");
+                var other = document.createElement("div");
+
+                child.appendChild(child_of_child);
+                parent.appendChild(child);
+
+                assert_equals(parent.contains(parent), true, "test1-0, Node.contains");
+                assert_equals(parent.contains(child), true, "test1-1, Node.contains");
+                assert_equals(parent.contains(child_of_child), true, "test1-2, Node.contains");
+                assert_equals(parent.contains(other), false, "test1-3, Node.contains");
+            });
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_insertBefore.html b/tests/wpt/mozilla/tests/mozilla/node_insertBefore.html
new file mode 100644
index 00000000000..27f4e9182e2
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_insertBefore.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Node.insertBefore</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script type="text/javascript">
+            test(function() {
+                var root = document.createElement("div");
+                var after = document.createElement("div");
+                var before = document.createElement("div");
+
+                root.appendChild(after);
+
+                assert_equals(root.insertBefore(before, after), before, "test1-0, insertBefore");
+                assert_equals(root.childNodes[0], before, "test1-1, insertBefore");
+                assert_equals(root.childNodes[1], after, "test1-2, insertBefore");
+            });
+        </script>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_isEqualNode.html b/tests/wpt/mozilla/tests/mozilla/node_isEqualNode.html
new file mode 100644
index 00000000000..ab8e54bb1aa
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_isEqualNode.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script>
+            test(function() {
+                var elem = document.createElement("div");
+                var other = document.createElement("div");
+                assert_equals(elem.isEqualNode(elem), true);
+                assert_equals(elem.isEqualNode(other), true);
+                assert_equals(other.isEqualNode(elem), true);
+                assert_equals(elem.isEqualNode(document), false);
+            }, "simple checks");
+
+            test(function() {
+                var parent_elem = document.createElement("div");
+                var child_elem = document.createElement("div");
+                parent_elem.appendChild(child_elem);
+
+                var other_parent = document.createElement("div");
+                var other_child = document.createElement("div");
+                other_parent.appendChild(other_child);
+
+                assert_equals(parent_elem.isEqualNode(other_parent), true);
+                assert_equals(child_elem.isEqualNode(other_child), true);
+
+                var child_text = document.createTextNode("lorem ipsum");
+                child_elem.appendChild(child_text);
+
+                assert_equals(parent_elem.isEqualNode(other_parent), false);
+                assert_equals(child_elem.isEqualNode(other_child), false);
+            }, "non-element children");
+        </script>
+    </head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_normalize.html b/tests/wpt/mozilla/tests/mozilla/node_normalize.html
new file mode 100644
index 00000000000..4b333150332
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_normalize.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+    test(function() {
+      var parent1 = document.createElement("div");
+      var child1 = document.createTextNode("aaa");
+      var child2 = document.createTextNode("");
+      var child3 = document.createTextNode("bb");
+
+      var parent2 = document.createElement("div");
+
+      parent1.appendChild(child1);
+      parent1.appendChild(child2);
+      parent1.appendChild(child3);
+
+      parent2.appendChild(document.createTextNode(""));
+
+      parent1.normalize();
+      parent2.normalize();
+
+      assert_equals(Array.prototype.map.call(parent1.childNodes, function(el) {return el.length}).indexOf(0), -1, "Node.normalize removes empty text nodes");
+      assert_equals(parent1.childNodes.length, 1, "Node.normalize merges text nodes in one");
+      assert_equals(parent1.childNodes[0].length, 5, "test 1-2, Node.normalize merges text nodes values");
+      assert_equals(parent2.childNodes.length, 0, "Node.normalize removes empty text nodes even if there is only one text node");
+      assert_equals(child2.textContent, "", "Node.normalize doesn't change removed children original content")
+      assert_equals(child3.textContent, "bb", "Node.normalize doesn't change removed children original content")
+    });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/node_replaceChild.html b/tests/wpt/mozilla/tests/mozilla/node_replaceChild.html
new file mode 100644
index 00000000000..a0ea4ffc179
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/node_replaceChild.html
@@ -0,0 +1,48 @@
+<!doctype html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+            test(function() {
+                var root = document.createElement("div");
+                var elem = document.createElement("div");
+                var foo = document.createTextNode("foo");
+                var bar = document.createTextNode("bar");
+
+                elem.appendChild(bar);
+                assert_equals(elem.replaceChild(bar, bar), bar, "test1-0, 1-to-1");
+                assert_equals(elem.childNodes[0], bar, "test1-1, 1-to-1");
+
+                root.appendChild(foo);
+                assert_equals(root.replaceChild(bar, foo), foo, "test1-2, 1-to-1");
+                assert_equals(elem.childNodes.length, 0, "test1-3, 1-to-1");
+                assert_equals(root.childNodes[0], bar, "test1-4, 1-to-1");
+
+                elem.appendChild(foo);
+                assert_equals(root.replaceChild(elem, bar), bar, "test1-5, 1-to-1");
+                assert_equals(root.childNodes[0].childNodes[0], foo, "test1-6, 1-to-1");
+            }, "1-to-1");
+
+            test(function() {
+                var doc_doctype = document.doctype;
+                var new_doctype = document.implementation.createDocumentType("html", null, null);
+
+                assert_not_equals(doc_doctype, new_doctype, "test2-0, doctype");
+                assert_equals(document.replaceChild(new_doctype, doc_doctype), doc_doctype, "test2-1, doctype");
+                assert_equals(document.doctype, new_doctype, "test2-2, doctype");
+            }, "doctype");
+
+            test(function() {
+                var doc_elem = document.documentElement;
+                var new_elem = document.createElement("html");
+
+                assert_not_equals(doc_elem, new_elem, "test3-0, documentElement");
+                assert_equals(document.replaceChild(new_elem, doc_elem), doc_elem, "test3-1, documentElement");
+                assert_equals(document.documentElement, new_elem, "test3-2, documentElement");
+            }, "documentElement");
+        </script>
+    </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/parentNode_querySelector.html b/tests/wpt/mozilla/tests/mozilla/parentNode_querySelector.html
new file mode 100644
index 00000000000..3239f15ab00
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/parentNode_querySelector.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <div id="foo"></div>
+        <div id="foo\bar"></div>
+        <div id="foo:bar"></div>
+        <div id="bar" class="myClass"></p>
+        <script>
+            test(function() {
+                let div = document.getElementById("foo");
+                assert_equals(document.querySelector("#foo"), div);
+
+                div = document.getElementById("foo\\bar");
+                assert_equals(document.querySelector("#foo\\\\bar"), div);
+
+                div = document.getElementById("foo:bar");
+                assert_equals(document.querySelector("#foo\\:bar"), div);
+
+                div = document.getElementById("bar");
+                assert_equals(document.querySelector("div.myClass"), div);
+                assert_equals(document.querySelector("div:nth-of-type(4)"), div);
+            }, "Document");
+
+            test(function() {
+                let body = document.body;
+                let div = document.getElementById("foo");
+                assert_equals(body.querySelector("#foo"), div);
+
+                div = document.getElementById("foo\\bar");
+                assert_equals(body.querySelector("#foo\\\\bar"), div);
+
+                div = document.getElementById("foo:bar");
+                assert_equals(body.querySelector("#foo\\:bar"), div);
+
+                div = document.getElementById("bar");
+                assert_equals(body.querySelector("div.myClass"), div);
+                assert_equals(body.querySelector("div:nth-of-type(4)"), div);
+            }, "Element");
+
+            test(function() {
+                let docfrag = document.createDocumentFragment();
+
+                let div = document.createElement("div");
+                div.id = "foo";
+                div.className = "myClass";
+
+                let child = document.createElement("div");
+                div.appendChild(child);
+                docfrag.appendChild(div);
+
+                let p = document.createElement("p");
+                p.id = "bar";
+                p.className = "myClass";
+                docfrag.appendChild(p);
+
+                assert_equals(docfrag.querySelector("#foo"), div);
+                assert_equals(docfrag.querySelector("div.myClass"), div);
+
+                assert_equals(docfrag.querySelector("#bar"), p);
+                assert_equals(docfrag.querySelector("p.myClass"), p);
+
+                assert_equals(docfrag.querySelector(".myClass"), div);
+                assert_equals(docfrag.querySelector("div > div"), child);
+            }, "DocumentFragment");
+        </script>
+    </body>
+</html>
diff --git a/tests/content/test_parentNode_querySelectorAll.html b/tests/wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html
similarity index 59%
rename from tests/content/test_parentNode_querySelectorAll.html
rename to tests/wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html
index bc99a8251a6..f52ccee7541 100644
--- a/tests/content/test_parentNode_querySelectorAll.html
+++ b/tests/wpt/mozilla/tests/mozilla/parentNode_querySelectorAll.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="harness.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
     </head>
     <body>
         <div id="parent">
@@ -14,28 +15,28 @@
             let bar = document.getElementById("bar");
             let baz = document.getElementById("baz");
 
-            { // document.querySelector
+            test(function() {
                 let nodelist = document.querySelectorAll(".test");
-                is_a(nodelist, NodeList);
-                is(nodelist.length, 3);
-                is(nodelist.item(0), foo);
-                is(nodelist.item(1), bar);
-                is(nodelist.item(2), baz);
+                assert_true(nodelist instanceof NodeList, "Should be NodeList");
+                assert_equals(nodelist.length, 3);
+                assert_equals(nodelist.item(0), foo);
+                assert_equals(nodelist.item(1), bar);
+                assert_equals(nodelist.item(2), baz);
 
                 nodelist = document.querySelectorAll("div > .test");
-                is(nodelist.length, 3);
-            }
+                assert_equals(nodelist.length, 3);
+            }, "Document");
 
-            { // element.querySelector
+            test(function() {
                 let div = document.getElementById("parent");
                 let nodelist = div.querySelectorAll(".test");
-                is(nodelist.length, 3);
+                assert_equals(nodelist.length, 3);
 
                 nodelist = div.querySelectorAll("div:nth-of-type(1)");
-                is(nodelist.item(0), div);
-            }
+                assert_equals(nodelist.item(0), div);
+            }, "Element");
 
-            { // docfrag.querySelector
+            test(function() {
                 let docfrag = document.createDocumentFragment();
 
                 let div = document.createElement("div");
@@ -47,11 +48,11 @@
                 docfrag.appendChild(div);
 
                 let nodelist = docfrag.querySelectorAll("#foo");
-                is(nodelist.item(0), div);
+                assert_equals(nodelist.item(0), div);
 
                 nodelist = docfrag.querySelectorAll("#foo:nth-child(1)");
-                is(nodelist.item(0), div);
-            }
+                assert_equals(nodelist.item(0), div);
+            }, "DocumentFragment");
         </script>
     </body>
 </html>
diff --git a/tests/wpt/mozilla/tests/mozilla/parentnodes.html b/tests/wpt/mozilla/tests/mozilla/parentnodes.html
new file mode 100644
index 00000000000..5effbcdfdab
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/parentnodes.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div id="div1"></div>
+  <script>
+  test(function() {
+    assert_true(document.documentElement.parentNode instanceof Document, "Should be Document");
+    assert_equals(document.documentElement.parentElement, null);
+
+    var elem = document.createElement("p");
+    assert_equals(elem.parentNode, null);
+    assert_equals(elem.parentElement, null);
+    
+    var child = document.createElement("p");
+    elem.appendChild(child);
+
+    assert_equals(child.parentNode, elem);
+    assert_equals(child.parentElement, elem);
+  });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/proxy_setter.html b/tests/wpt/mozilla/tests/mozilla/proxy_setter.html
new file mode 100644
index 00000000000..b8d3d8e9cfb
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/proxy_setter.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+test(function() {
+  assert_equals(window.document.title, '');
+  window.document.title = 'foo';
+  assert_equals(window.document.title, 'foo');
+});
+</script>
+</body>
+</html>
diff --git a/tests/content/resources/iframe_contentDocument_inner.html b/tests/wpt/mozilla/tests/mozilla/resources/iframe_contentDocument_inner.html
similarity index 100%
rename from tests/content/resources/iframe_contentDocument_inner.html
rename to tests/wpt/mozilla/tests/mozilla/resources/iframe_contentDocument_inner.html
diff --git a/tests/content/test_script_type.html b/tests/wpt/mozilla/tests/mozilla/script_type.html
similarity index 86%
rename from tests/content/test_script_type.html
rename to tests/wpt/mozilla/tests/mozilla/script_type.html
index 2a67db887cf..e05202e7371 100644
--- a/tests/content/test_script_type.html
+++ b/tests/wpt/mozilla/tests/mozilla/script_type.html
@@ -1,13 +1,21 @@
 <html>
 <head>
   <title></title>
-  <script src="harness.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
   <script>
-    expect(22);
-    function ok(msg) { _pass(msg, ""); }
-    function fail(msg) { _fail(msg, ""); }
+    async_test(function() {
+      var executed = 0;
+      window.ok = this.step_func(function() {
+        ++executed;
+      })
+      window.fail = this.unreached_func()
+      window.onload = this.step_func_done(function() {
+        assert_equals(executed, 22);
+      });
+    });
   </script>
   <script type="">
     ok('type is empty string');
diff --git a/tests/content/test_storage.html b/tests/wpt/mozilla/tests/mozilla/storage.html
similarity index 62%
rename from tests/content/test_storage.html
rename to tests/wpt/mozilla/tests/mozilla/storage.html
index e8322d29496..375c537a1b3 100644
--- a/tests/content/test_storage.html
+++ b/tests/wpt/mozilla/tests/mozilla/storage.html
@@ -1,14 +1,17 @@
 <html>
 <head>
   <title></title>
-  <script src="harness.js"></script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
   <script>
+  test(function() {
     // Delete keys that don't exist in either localStorage
     // or sessionStorage.
     delete localStorage.a;
     delete sessionStorage.a;
+  });
   </script>
 </body>
 </html>
diff --git a/tests/content/test.jpg b/tests/wpt/mozilla/tests/mozilla/test.jpg
similarity index 100%
rename from tests/content/test.jpg
rename to tests/wpt/mozilla/tests/mozilla/test.jpg
diff --git a/tests/content/test.png b/tests/wpt/mozilla/tests/mozilla/test.png
similarity index 100%
rename from tests/content/test.png
rename to tests/wpt/mozilla/tests/mozilla/test.png
diff --git a/tests/wpt/mozilla/tests/mozilla/textcontent.html b/tests/wpt/mozilla/tests/mozilla/textcontent.html
new file mode 100644
index 00000000000..c89bb1b640f
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/textcontent.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div>this is
+ text content</div>
+<script>
+test(function() {
+  var div = document.getElementsByTagName('div')[0];
+  assert_equals(div.textContent, "this is\n text content");
+  var newContent = "new text con\ntent";
+  div.textContent = newContent;
+  assert_equals(div.textContent, newContent);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/title.html b/tests/wpt/mozilla/tests/mozilla/title.html
new file mode 100644
index 00000000000..d4e55bc43f7
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/title.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>starting title</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_equals(document.title, "starting title");
+  document.title = "new title";
+  assert_equals(document.title, "new title");
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/trace_null.html b/tests/wpt/mozilla/tests/mozilla/trace_null.html
new file mode 100644
index 00000000000..bb4f8c1fc52
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/trace_null.html
@@ -0,0 +1,9 @@
+<!-- crashtest -->
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  new CustomEvent("foo", { detail: null });
+  gc();
+});
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/union.html b/tests/wpt/mozilla/tests/mozilla/union.html
new file mode 100644
index 00000000000..d9116cd7bde
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/union.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<select id="sel"></select>
+<script>
+test(function() {
+  var div = document.createElement('div');
+  var optgroup = document.createElement('optgroup');
+  var sel = document.getElementById('sel');
+
+  var opt = document.createElement('option');
+  sel.add(opt);
+  sel.add(optgroup);
+  sel.add(opt, div);
+  sel.add(optgroup, div);
+  sel.add(opt, 5);
+  sel.add(optgroup, 5);
+  assert_throws(null, function() { sel.add(div) });
+  sel.add(optgroup, function() {})
+});
+</script>
+</head>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/window.html b/tests/wpt/mozilla/tests/mozilla/window.html
new file mode 100644
index 00000000000..1bc363a1122
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/window.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+test(function() {
+  assert_equals(window, window.self);
+  assert_true(window.self instanceof Window, "Should be Window");
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/window_performance.html b/tests/wpt/mozilla/tests/mozilla/window_performance.html
new file mode 100644
index 00000000000..6b96c18b3cd
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/window_performance.html
@@ -0,0 +1,30 @@
+<html>
+<head>
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+test(function() {
+  assert_not_equals(window.performance, undefined);
+  assert_true(window.performance instanceof Performance, "Should be Performance");
+
+  assert_not_equals(window.performance.timing, undefined);
+  assert_true(window.performance.timing instanceof PerformanceTiming, "Should be PerformanceTiming");
+
+  assert_greater_than(window.performance.timing.navigationStart, 0);
+
+  var last = window.performance.now();
+  assert_greater_than(last, 0);
+
+  // Check that window.performance.now() is monotonically increasing
+  for (var i = 0; i < 100; i++) {
+    var next = window.performance.now();
+    assert_greater_than(next, last);
+    last = next;
+  }
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/window_setInterval.html b/tests/wpt/mozilla/tests/mozilla/window_setInterval.html
new file mode 100644
index 00000000000..a3c68a69b03
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/window_setInterval.html
@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+    async_test(function() {
+      var x = 0;
+      var intervalID = setInterval(this.step_func(function() {
+        x += 1;
+        if (x == 2) {
+          clearInterval(intervalID);
+          setTimeout(this.step_func_done(function() {
+            assert_equals(x, 2);
+          }), 300);
+        }
+      }), 10);
+    });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/windowproxy.html b/tests/wpt/mozilla/tests/mozilla/windowproxy.html
new file mode 100644
index 00000000000..8ea7fc43392
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/windowproxy.html
@@ -0,0 +1,28 @@
+<html>
+<head id="foo">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div></div>
+<script>
+test(function() {
+  window.abcd = 15;
+  assert_equals(window.abcd, 15);
+  assert_equals(Object.getOwnPropertyDescriptor(window, 'abcd').value, 15);
+  assert_equals(window.hasOwnProperty('abcd'), true);
+
+  assert_equals('location' in window, true);
+
+  // Can't set indexed properties
+  window[100] = "abc";
+  assert_equals(window[100], undefined);
+  assert_equals(Object.getOwnPropertyDescriptor(window, 1000), undefined);
+});
+
+test(function() {
+  assert_own_property(window, 'location')
+}, "Unforgeable location");
+</script>
+</body>
+</html>