--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -6,10 +6,28 @@
 
 DIRS += [
     'base',
     'shistory',
     'build',
     'resources/content',
 ]
 
-TEST_DIRS += ['test']
+XPCSHELL_TESTS_MANIFESTS += [
+    'test/unit/xpcshell.ini',
+    'test/unit_ipc/xpcshell.ini',
+]
 
+MOCHITEST_MANIFESTS += [
+    'test/chrome/mochitest.ini',
+    'test/iframesandbox/mochitest.ini',
+    'test/mochitest.ini',
+    'test/navigation/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'test/chrome/chrome.ini',
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    'test/browser/browser.ini',
+    'test/navigation/browser.ini',
+]

--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@@ -43,17 +43,17 @@ skip-if = (buildapp == 'b2g' && toolkit 
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug384014.html]
 [test_bug385434.html]
 [test_bug387979.html]
 [test_bug402210.html]
 [test_bug404548.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug413310.html]
-skip-if = true || toolkit == 'android' || buildapp == 'b2g'
+skip-if = true
 # Disabled for too many intermittent failures (bug 719186)
 [test_bug475636.html]
 [test_bug509055.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug511449.html]
 skip-if = toolkit != "cocoa" || e10s
 support-files = file_bug511449.html
 [test_bug529119-1.html]

deleted file mode 100644
--- a/docshell/test/moz.build
+++ /dev/null
@@ -1,23 +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 += [
-    'unit/xpcshell.ini',
-    'unit_ipc/xpcshell.ini',
-]
-
-MOCHITEST_MANIFESTS += [
-    'chrome/mochitest.ini',
-    'iframesandbox/mochitest.ini',
-    'mochitest.ini',
-    'navigation/mochitest.ini',
-]
-BROWSER_CHROME_MANIFESTS += [
-    'browser/browser.ini',
-    'navigation/browser.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']