diff --git a/tests/wpt/dom/Element-children.html b/tests/wpt/dom/Element-children.html
deleted file mode 100644
index c0210f96..00000000
--- a/tests/wpt/dom/Element-children.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<title>HTMLCollection edge cases</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<div id="test"><img><img id=foo><img id=foo><img name="bar"></div>
-<script>
-setup(function() {
-  // Add some non-HTML elements in there to test what happens with those.
-  var container = document.getElementById("test");
-  var child = document.createElementNS("", "img");
-  child.setAttribute("id", "baz");
-  container.appendChild(child);
-
-  child = document.createElementNS("", "img");
-  child.setAttribute("name", "qux");
-  container.appendChild(child);
-});
-
-test(function() {
-  var container = document.getElementById("test");
-  var result = container.children.item("foo");
-  assert_true(result instanceof Element, "Expected an Element.");
-  assert_false(result.hasAttribute("id"), "Expected the IDless Element.")
-})
-
-test(function() {
-  var container = document.getElementById("test");
-  var list = container.children;
-  var result = [];
-  for (var p in list) {
-    if (list.hasOwnProperty(p)) {
-      result.push(p);
-    }
-  }
-  assert_array_equals(result, ['0', '1', '2', '3', '4', '5']);
-  result = Object.getOwnPropertyNames(list);
-  assert_array_equals(result, ['0', '1', '2', '3', '4', '5', 'foo', 'bar', 'baz']);
-
-  // Mapping of exposed names to their indices in the list.
-  var exposedNames = { 'foo': 1, 'bar': 3, 'baz': 4 };
-  for (var exposedName in exposedNames) {
-    assert_true(exposedName in list);
-    assert_true(list.hasOwnProperty(exposedName));
-    assert_equals(list[exposedName], list.namedItem(exposedName));
-    assert_equals(list[exposedName], list.item(exposedNames[exposedName]));
-    assert_true(list[exposedName] instanceof Element);
-  }
-
-  var unexposedNames = ['qux'];
-  for (var unexposedName of unexposedNames) {
-    assert_false(unexposedName in list);
-    assert_false(list.hasOwnProperty(unexposedName));
-    assert_equals(list[unexposedName], undefined);
-    assert_equals(list.namedItem(unexposedName), null);
-  }
-});
-</script>
diff --git a/tests/wpt/dom/Document-getElementsByClassName.html b/tests/wpt/dom/nodes/Document-getElementsByClassName.html
similarity index 100%
rename from tests/wpt/dom/Document-getElementsByClassName.html
rename to tests/wpt/dom/nodes/Document-getElementsByClassName.html
diff --git a/tests/wpt/dom/Element-childElement-null-svg.svg b/tests/wpt/dom/nodes/Element-childElement-null-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-childElement-null-svg.svg
rename to tests/wpt/dom/nodes/Element-childElement-null-svg.svg
diff --git a/tests/wpt/dom/Element-childElement-null-xhtml.xhtml b/tests/wpt/dom/nodes/Element-childElement-null-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-childElement-null-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-childElement-null-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-childElement-null.html b/tests/wpt/dom/nodes/Element-childElement-null.html
similarity index 100%
rename from tests/wpt/dom/Element-childElement-null.html
rename to tests/wpt/dom/nodes/Element-childElement-null.html
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-add-svg.svg b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-add-svg.svg
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-add-xhtml.xhtml b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-add-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-add.html b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-add.html
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-add.html
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-add.html
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-remove-svg.svg b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-remove-svg.svg
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-remove-xhtml.xhtml b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-remove-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-childElementCount-dynamic-remove.html b/tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove.html
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-dynamic-remove.html
rename to tests/wpt/dom/nodes/Element-childElementCount-dynamic-remove.html
diff --git a/tests/wpt/dom/Element-childElementCount-nochild-svg.svg b/tests/wpt/dom/nodes/Element-childElementCount-nochild-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-nochild-svg.svg
rename to tests/wpt/dom/nodes/Element-childElementCount-nochild-svg.svg
diff --git a/tests/wpt/dom/Element-childElementCount-nochild-xhtml.xhtml b/tests/wpt/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-nochild-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-childElementCount-nochild.html b/tests/wpt/dom/nodes/Element-childElementCount-nochild.html
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-nochild.html
rename to tests/wpt/dom/nodes/Element-childElementCount-nochild.html
diff --git a/tests/wpt/dom/Element-childElementCount-svg.svg b/tests/wpt/dom/nodes/Element-childElementCount-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-svg.svg
rename to tests/wpt/dom/nodes/Element-childElementCount-svg.svg
diff --git a/tests/wpt/dom/Element-childElementCount-xhtml.xhtml b/tests/wpt/dom/nodes/Element-childElementCount-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-childElementCount-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-childElementCount.html b/tests/wpt/dom/nodes/Element-childElementCount.html
similarity index 100%
rename from tests/wpt/dom/Element-childElementCount.html
rename to tests/wpt/dom/nodes/Element-childElementCount.html
diff --git a/tests/wpt/dom/Element-firstElementChild-entity-xhtml.xhtml b/tests/wpt/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-entity-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-firstElementChild-entity.svg b/tests/wpt/dom/nodes/Element-firstElementChild-entity.svg
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-entity.svg
rename to tests/wpt/dom/nodes/Element-firstElementChild-entity.svg
diff --git a/tests/wpt/dom/Element-firstElementChild-namespace-svg.svg b/tests/wpt/dom/nodes/Element-firstElementChild-namespace-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-namespace-svg.svg
rename to tests/wpt/dom/nodes/Element-firstElementChild-namespace-svg.svg
diff --git a/tests/wpt/dom/Element-firstElementChild-namespace-xhtml.xhtml b/tests/wpt/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-namespace-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-firstElementChild-namespace.html b/tests/wpt/dom/nodes/Element-firstElementChild-namespace.html
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-namespace.html
rename to tests/wpt/dom/nodes/Element-firstElementChild-namespace.html
diff --git a/tests/wpt/dom/Element-firstElementChild-svg.svg b/tests/wpt/dom/nodes/Element-firstElementChild-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-svg.svg
rename to tests/wpt/dom/nodes/Element-firstElementChild-svg.svg
diff --git a/tests/wpt/dom/Element-firstElementChild-xhtml.xhtml b/tests/wpt/dom/nodes/Element-firstElementChild-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-firstElementChild-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-firstElementChild.html b/tests/wpt/dom/nodes/Element-firstElementChild.html
similarity index 100%
rename from tests/wpt/dom/Element-firstElementChild.html
rename to tests/wpt/dom/nodes/Element-firstElementChild.html
diff --git a/tests/wpt/dom/Element-lastElementChild-svg.svg b/tests/wpt/dom/nodes/Element-lastElementChild-svg.svg
similarity index 100%
rename from tests/wpt/dom/Element-lastElementChild-svg.svg
rename to tests/wpt/dom/nodes/Element-lastElementChild-svg.svg
diff --git a/tests/wpt/dom/Element-lastElementChild-xhtml.xhtml b/tests/wpt/dom/nodes/Element-lastElementChild-xhtml.xhtml
similarity index 100%
rename from tests/wpt/dom/Element-lastElementChild-xhtml.xhtml
rename to tests/wpt/dom/nodes/Element-lastElementChild-xhtml.xhtml
diff --git a/tests/wpt/dom/Element-lastElementChild.html b/tests/wpt/dom/nodes/Element-lastElementChild.html
similarity index 100%
rename from tests/wpt/dom/Element-lastElementChild.html
rename to tests/wpt/dom/nodes/Element-lastElementChild.html
