diff --git a/dom/devicestorage/ipc/Makefile.in b/dom/devicestorage/ipc/Makefile.in
index a6419aabc389..0c9e8a6e9696 100644
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@@ -2,5 +2,7 @@
 # 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/.
 
+MOCHITEST_FILES := ../test/devicestorage_common.js
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/toolkit/components/places/tests/browser/browser_colorAnalyzer.js b/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
index 4674372b5898..88bc42515800 100644
--- a/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
+++ b/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
@@ -322,7 +322,7 @@ tests.push(function test_perfBigImage() {
 
 // the rest of the tests are for coverage of "real" favicons
 // exact color isn't terribly important, just make sure it's reasonable
-const filePrefix = getRootDirectory(gTestPath);
+const filePrefix = getRootDirectory(gTestPath) + "colorAnalyzer/";
 
 tests.push(function test_categoryDiscover() {
   frcTest(filePrefix + "category-discover.png", 0xB28D3A,
diff --git a/toolkit/components/satchel/test/browser/Makefile.in b/toolkit/components/satchel/test/browser/Makefile.in
index 5501cd4b3305..bfe3c3580f68 100644
--- a/toolkit/components/satchel/test/browser/Makefile.in
+++ b/toolkit/components/satchel/test/browser/Makefile.in
@@ -2,3 +2,4 @@
 # 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/.
 
+MOCHITEST_BROWSER_FILES := ../subtst_privbrowsing.html
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index b5a0911a095d..3e4ce88a1f24 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -2,6 +2,11 @@
 # 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/.
 
+MOCHITEST_CHROME_FILES := \
+  ../widgets/popup_shared.js \
+  ../widgets/tree_shared.js \
+  $(SHULL)
+
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
 # textboxes and lists only, so skip this test on Mac
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/toolkit/mozapps/update/test/chrome/Makefile.in b/toolkit/mozapps/update/test/chrome/Makefile.in
index 55004d452945..db5856a61e92 100644
--- a/toolkit/mozapps/update/test/chrome/Makefile.in
+++ b/toolkit/mozapps/update/test/chrome/Makefile.in
@@ -2,6 +2,11 @@
 # 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/.
 
+MOCHITEST_CHROME_FILES := \
+  ../unit/data/simple.mar \
+  ../unit/data/simple_no_pib.mar \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 libs::