--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -122,17 +122,16 @@ support-files =
   file_bug1045809_1.html
   file_bug1045809_2.html
   file_csp_block_all_mixedcontent.html
   file_csp_block_all_mixedcontent.js
   !/toolkit/components/passwordmgr/test/browser/form_basic.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test.html
   !/toolkit/components/passwordmgr/test/browser/insecure_test_subframe.html
   !/toolkit/content/tests/browser/common/mockTransfer.js
-  !/toolkit/crashreporter/test/browser/crashreport.sjs
   !/toolkit/modules/tests/browser/metadata_*.html
   !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
   !/toolkit/mozapps/extensions/test/xpinstall/redirect.sjs
   !/toolkit/mozapps/extensions/test/xpinstall/restartless-unsigned.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi

--- a/dom/plugins/test/mochitest/chrome.ini
+++ b/dom/plugins/test/mochitest/chrome.ini
@@ -1,15 +1,14 @@
 [DEFAULT]
 skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
   hang_test.js
   privatemode_perwindowpb.xul
   plugin-utils.js
-  !/toolkit/crashreporter/test/browser/crashreport.sjs
 
 [test_bug479979.xul]
 [test_bug751809.html]
 [test_busy_hang.xul]
 skip-if = (!crashreporter) || (os != "win")
 [test_clear_site_data.html]
 [test_convertpoint.xul]
 skip-if = toolkit != "cocoa"

--- a/toolkit/crashreporter/test/browser/browser.ini
+++ b/toolkit/crashreporter/test/browser/browser.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 support-files =
   head.js
-  crashreport.sjs
 
 [browser_aboutCrashes.js]
 [browser_aboutCrashesResubmit.js]
 [browser_bug471404.js]
 [browser_clearReports.js]

--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -46,16 +46,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['system/windowsproxy']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['system/androidproxy']
 
 if CONFIG['MOZ_CRASHREPORTER']:
     DIRS += ['crashreporter']
 
+TEST_HARNESS_FILES.testing.mochitest.browser.toolkit.crashreporter.test.browser += [
+    'crashreporter/test/browser/crashreport.sjs',
+]
+
 with Files('mozapps/installer/windows/*'):
     BUG_COMPONENT = ('Toolkit', 'NSIS Installer')
 
 with Files('pluginproblem/*'):
     BUG_COMPONENT = ('Core', 'Plug-ins')
 
 with Files('mozapps/preferences/*'):
     BUG_COMPONENT = ('Toolkit', 'Preferences')