deleted file mode 100644
--- a/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

deleted file mode 100644
--- a/content/test/unit/xpcshell.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[DEFAULT]
-head = head_content.js
-tail =
-skip-if = toolkit == 'gonk'
-support-files =
-  empty_document.xml
-  isequalnode_data.xml
-  nodelist_data_1.xml
-  nodelist_data_2.xul
-  test_delete_range.xml
-
-[test_isequalnode.js]
-[test_nodelist.js]
-[test_normalize.js]
-[test_range.js]
-[test_treewalker.js]
-[test_xml_parser.js]
-[test_xml_serializer.js]

rename from content/test/unit/empty_document.xml
rename to dom/base/test/unit/empty_document.xml

rename from content/test/unit/head_content.js
rename to dom/base/test/unit/head_xml.js

rename from content/test/unit/isequalnode_data.xml
rename to dom/base/test/unit/isequalnode_data.xml

rename from content/test/unit/nodelist_data_1.xml
rename to dom/base/test/unit/nodelist_data_1.xml

rename from content/test/unit/nodelist_data_2.xul
rename to dom/base/test/unit/nodelist_data_2.xul

rename from content/test/unit/test_delete_range.xml
rename to dom/base/test/unit/test_delete_range.xml

rename from content/test/unit/test_isequalnode.js
rename to dom/base/test/unit/test_isequalnode.js

rename from content/test/unit/test_nodelist.js
rename to dom/base/test/unit/test_nodelist.js

rename from content/test/unit/test_normalize.js
rename to dom/base/test/unit/test_normalize.js

rename from content/test/unit/test_range.js
rename to dom/base/test/unit/test_range.js

rename from content/test/unit/test_treewalker.js
rename to dom/base/test/unit/test_treewalker.js

rename from content/test/unit/test_xml_parser.js
rename to dom/base/test/unit/test_xml_parser.js

rename from content/test/unit/test_xml_serializer.js
rename to dom/base/test/unit/test_xml_serializer.js

--- a/dom/base/test/unit/xpcshell.ini
+++ b/dom/base/test/unit/xpcshell.ini
@@ -15,19 +15,38 @@ support-files =
   3_result_2.xml
   4_original.xml
   4_result_1.xml
   4_result_2.xml
   4_result_3.xml
   4_result_4.xml
   4_result_5.xml
   4_result_6.xml
+  empty_document.xml
+  isequalnode_data.xml
+  nodelist_data_1.xml
+  nodelist_data_2.xul
+  test_delete_range.xml
 
 [test_bug553888.js]
 [test_bug737966.js]
 [test_error_codes.js]
 run-sequentially = Hardcoded 4444 port.
 # Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs
 skip-if = os == 'mac'
+[test_isequalnode.js]
+head = head_xml.js
+[test_nodelist.js]
+head = head_xml.js
+[test_normalize.js]
+head = head_xml.js
+[test_range.js]
+head = head_xml.js
 [test_thirdpartyutil.js]
+[test_treewalker.js]
+head = head_xml.js
 [test_xhr_document.js]
 [test_xhr_standalone.js]
+[test_xml_parser.js]
+head = head_xml.js
+[test_xml_serializer.js]
+head = head_xml.js
 [test_xmlserializer.js]

--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -89,17 +89,16 @@ DIRS += [
     '/uriloader',
     '/caps',
     '/parser',
     '/gfx',
     '/image',
     '/dom',
     '/view',
     '/widget',
-    '/content',
     '/editor',
     '/layout',
     '/docshell',
     '/embedding',
     '/xpfe/appshell'
 ]
 
 # This needs to be built after the gfx/ directory