diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 3091ab85f53..bc31d8c61a5 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6088,12 +6088,6 @@
             "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",
diff --git a/tests/wpt/mozilla/tests/mozilla/document_body.html b/tests/wpt/mozilla/tests/mozilla/document_body.html
deleted file mode 100644
index c77da6cda15..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/document_body.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<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() {
-                var 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() {
-                var 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() {
-                var new_document = new Document();
-                new_document.appendChild(new_document.createElement("html"));
-                var 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() {
-                var new_document = document.implementation.createHTMLDocument();
-                var 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() {
-                var new_document = document.implementation.createHTMLDocument();
-                var 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/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
index 150ab50bee1..07f1edf939c 100644
--- a/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
+++ b/tests/wpt/web-platform-tests/html/dom/documents/dom-tree-accessors/Document.body.html
@@ -119,6 +119,12 @@ test(function() {
   assert_equals(doc.body, null);
 }, "Non-HTML frameset as the root node");
 
+test(function() {
+  assert_not_equals(document.body, null);
+  assert_true(document.body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+  assert_equals(document.body.tagName, "BODY");
+}, "existing document's body");
+
 
 var originalBody = document.body;
 test(function() {
@@ -140,4 +146,24 @@ test(function() {
   })
   assert_equals(doc.body, null);
 }, "Setting document.body when there's no root element.")
+test(function() {
+  var doc = document.implementation.createHTMLDocument();
+
+  var new_body = doc.createElement("body");
+  assert_true(new_body instanceof HTMLBodyElement, "should be HTMLBodyElement");
+  assert_equals(new_body.tagName, "BODY");
+
+  doc.body = new_body;
+  assert_equals(doc.body, new_body);
+}, "Setting document.body to a new body element.");
+test(function() {
+  var doc = document.implementation.createHTMLDocument();
+
+  var new_frameset = doc.createElement("frameset");
+  assert_true(new_frameset instanceof HTMLFrameSetElement, "should be HTMLFrameSetElement");
+  assert_equals(new_frameset.tagName, "FRAMESET");
+
+  doc.body = new_frameset;
+  assert_equals(doc.body, new_frameset, "test6-3, append frameset to a new document");
+}, "Setting document.body to a new frameset element.");
 </script>
