--- a/accessible/tests/mochitest/a11y.ini
+++ b/accessible/tests/mochitest/a11y.ini
@@ -1,34 +1,17 @@
 [DEFAULT]
 support-files =
   ../../../dom/media/test/bug461281.ogg
   dumbfile.xpi
   formimage.png
   letters.gif
   moz.png
   longdesc_src.html
-  actions.js
-  attributes.js
-  autocomplete.js
-  browser.js
-  common.js
-  events.js
-  grid.js
-  layout.js
-  name.js
-  pivot.js
-  relations.js
-  role.js
-  selectable.js
-  states.js
-  table.js
-  value.js
-  text.js
+  *.js
   treeview.css
-  treeview.js
 
 [test_aria_token_attrs.html]
 [test_bug420863.html]
 [test_descr.html]
 [test_nsIAccessibleDocument.html]
 [test_nsIAccessibleImage.html]
 [test_OuterDocAccessible.html]

--- a/accessible/tests/mochitest/actions/a11y.ini
+++ b/accessible/tests/mochitest/actions/a11y.ini
@@ -1,9 +1,12 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/dom/media/test/bug461281.ogg
 
 [test_anchors.html]
 [test_aria.html]
 [test_controls.html]
 [test_general.html]
 [test_general.xul]
 [test_keys.html]
 [test_keys_menu.xul]

--- a/accessible/tests/mochitest/attributes/a11y.ini
+++ b/accessible/tests/mochitest/attributes/a11y.ini
@@ -1,9 +1,11 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_obj.html]
 [test_obj_css.html]
 [test_obj_css.xul]
 [test_obj_group.html]
 [test_obj_group.xul]
 [test_obj_group_tree.xul]
 [test_tag.html]

--- a/accessible/tests/mochitest/bounds/a11y.ini
+++ b/accessible/tests/mochitest/bounds/a11y.ini
@@ -1,6 +1,8 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_list.html]
 [test_select.html]
 [test_zoom.html]
 [test_zoom_text.html]

--- a/accessible/tests/mochitest/editabletext/a11y.ini
+++ b/accessible/tests/mochitest/editabletext/a11y.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
-support-files = editabletext.js
+support-files =
+  editabletext.js
+  !/accessible/tests/mochitest/*.js
 
 [test_1.html]
 [test_2.html]

--- a/accessible/tests/mochitest/elm/a11y.ini
+++ b/accessible/tests/mochitest/elm/a11y.ini
@@ -1,9 +1,13 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
+  !/dom/media/test/bug461281.ogg
 
 [test_HTMLSpec.html]
 skip-if = buildapp == 'mulet'
 [test_figure.html]
 [test_listbox.xul]
 [test_MathMLSpec.html]
 [test_nsApplicationAcc.html]
 [test_plugin.html]

--- a/accessible/tests/mochitest/events/a11y.ini
+++ b/accessible/tests/mochitest/events/a11y.ini
@@ -1,13 +1,15 @@
 [DEFAULT]
 support-files =
   docload_wnd.html
   focus.html
   scroll.html
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/letters.gif
 
 [test_aria_alert.html]
 [test_aria_menu.html]
 [test_aria_objattr.html]
 [test_aria_statechange.html]
 [test_attrs.html]
 [test_caretmove.html]
 [test_caretmove.xul]

--- a/accessible/tests/mochitest/focus/a11y.ini
+++ b/accessible/tests/mochitest/focus/a11y.ini
@@ -1,7 +1,9 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_focusedChild.html]
 skip-if = (os == 'win' && (os_version == '6.2' || os_version == '6.3')) # bug 845134
 [test_takeFocus.html]
 skip-if = buildapp == 'mulet'
 [test_takeFocus.xul]

--- a/accessible/tests/mochitest/hittest/a11y.ini
+++ b/accessible/tests/mochitest/hittest/a11y.ini
@@ -1,10 +1,12 @@
 [DEFAULT]
 support-files = zoom_tree.xul
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/letters.gif
 
 [test_browser.html]
 [test_canvas_hitregion.html]
 skip-if = (os == "android" || appname == "b2g")
 [test_general.html]
 [test_menu.xul]
 [test_shadowroot.html]
 [test_zoom.html]

--- a/accessible/tests/mochitest/hyperlink/a11y.ini
+++ b/accessible/tests/mochitest/hyperlink/a11y.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
 support-files = hyperlink.js
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/letters.gif
 
 [test_general.html]
 [test_general.xul]

--- a/accessible/tests/mochitest/hypertext/a11y.ini
+++ b/accessible/tests/mochitest/hypertext/a11y.ini
@@ -1,4 +1,7 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/letters.gif
 
 [test_general.html]
 [test_update.html]

--- a/accessible/tests/mochitest/jsat/a11y.ini
+++ b/accessible/tests/mochitest/jsat/a11y.ini
@@ -2,16 +2,18 @@
 support-files =
   dom_helper.js
   gestures.json
   jsatcommon.js
   output.js
   doc_traversal.html
   doc_content_integration.html
   doc_content_text.html
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
 
 [test_alive.html]
 [test_content_integration.html]
 skip-if = buildapp == 'mulet'
 [test_content_text.html]
 skip-if = buildapp == 'mulet'
 [test_explicit_names.html]
 [test_gesture_tracker.html]

--- a/accessible/tests/mochitest/name/a11y.ini
+++ b/accessible/tests/mochitest/name/a11y.ini
@@ -1,14 +1,16 @@
 [DEFAULT]
 support-files =
   general.css
   general.xbl
   markup.js
   markuprules.xml
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
 
 [test_browserui.xul]
 [test_counterstyle.html]
 [test_general.html]
 [test_general.xul]
 [test_link.html]
 [test_list.html]
 [test_markup.html]

--- a/accessible/tests/mochitest/pivot/a11y.ini
+++ b/accessible/tests/mochitest/pivot/a11y.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 support-files =
   doc_virtualcursor.html
   doc_virtualcursor_text.html
+  !/accessible/tests/mochitest/*.js
 
 [test_virtualcursor.html]
 [test_virtualcursor_text.html]

--- a/accessible/tests/mochitest/relations/a11y.ini
+++ b/accessible/tests/mochitest/relations/a11y.ini
@@ -1,9 +1,11 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_bindings.xhtml]
 [test_embeds.xul]
 [test_general.html]
 [test_general.xul]
 [test_tabbrowser.xul]
 [test_tree.xul]
 [test_ui_modalprompt.html]

--- a/accessible/tests/mochitest/role/a11y.ini
+++ b/accessible/tests/mochitest/role/a11y.ini
@@ -1,7 +1,10 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
 
 [test_aria.html]
 [test_aria.xul]
 [test_general.html]
 [test_general.xul]
 [test_svg.html]

--- a/accessible/tests/mochitest/scroll/a11y.ini
+++ b/accessible/tests/mochitest/scroll/a11y.ini
@@ -1,4 +1,6 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_zoom.html]
 [test_zoom_text.html]

--- a/accessible/tests/mochitest/selectable/a11y.ini
+++ b/accessible/tests/mochitest/selectable/a11y.ini
@@ -1,8 +1,12 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/treeview.css
+  !/accessible/tests/mochitest/treeview.js
 
 [test_aria.html]
 [test_listbox.xul]
 [test_menu.xul]
 [test_menulist.xul]
 [test_select.html]
 [test_tree.xul]

--- a/accessible/tests/mochitest/states/a11y.ini
+++ b/accessible/tests/mochitest/states/a11y.ini
@@ -1,15 +1,19 @@
 [DEFAULT]
 support-files =
   z_frames.html
   z_frames_article.html
   z_frames_checkbox.html
   z_frames_textbox.html
   z_frames_update.html
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/dumbfile.xpi
+  !/accessible/tests/mochitest/formimage.png
+  !/accessible/tests/mochitest/treeview.css
 
 [test_aria.html]
 [test_aria.xul]
 [test_aria_imgmap.html]
 [test_aria_widgetitems.html]
 [test_buttons.html]
 [test_controls.html]
 [test_controls.xul]

--- a/accessible/tests/mochitest/table/a11y.ini
+++ b/accessible/tests/mochitest/table/a11y.ini
@@ -1,9 +1,11 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_css_tables.html]
 [test_headers_ariagrid.html]
 [test_headers_ariatable.html]
 [test_headers_listbox.xul]
 [test_headers_table.html]
 [test_headers_tree.xul]
 [test_indexes_ariagrid.html]

--- a/accessible/tests/mochitest/text/a11y.ini
+++ b/accessible/tests/mochitest/text/a11y.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 support-files = doc.html
+  !/accessible/tests/mochitest/*.js
 
 [test_atcaretoffset.html]
 [test_charboundary.html]
 [test_doc.html]
 [test_general.xul]
 [test_gettext.html]
 [test_hypertext.html]
 [test_lineboundary.html]

--- a/accessible/tests/mochitest/textattrs/a11y.ini
+++ b/accessible/tests/mochitest/textattrs/a11y.ini
@@ -1,4 +1,7 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
 
 [test_general.html]
 [test_invalid.html]

--- a/accessible/tests/mochitest/textcaret/a11y.ini
+++ b/accessible/tests/mochitest/textcaret/a11y.ini
@@ -1,4 +1,6 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_browserui.xul]
 [test_general.html]

--- a/accessible/tests/mochitest/textrange/a11y.ini
+++ b/accessible/tests/mochitest/textrange/a11y.ini
@@ -1,4 +1,7 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/moz.png
 
 [test_general.html]
 [test_selection.html]

--- a/accessible/tests/mochitest/textselection/a11y.ini
+++ b/accessible/tests/mochitest/textselection/a11y.ini
@@ -1,4 +1,6 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_general.html]
 [test_userinput.html]

--- a/accessible/tests/mochitest/tree/a11y.ini
+++ b/accessible/tests/mochitest/tree/a11y.ini
@@ -1,12 +1,18 @@
 [DEFAULT]
 support-files =
   dockids.html
   wnd.xul
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/formimage.png
+  !/accessible/tests/mochitest/letters.gif
+  !/accessible/tests/mochitest/moz.png
+  !/accessible/tests/mochitest/tree/wnd.xul
+  !/dom/media/test/bug461281.ogg
 
 [test_applicationacc.xul]
 skip-if = true # Bug 561508
 [test_aria_globals.html]
 [test_aria_grid.html]
 [test_aria_imgmap.html]
 [test_aria_list.html]
 [test_aria_menu.html]

--- a/accessible/tests/mochitest/treeupdate/a11y.ini
+++ b/accessible/tests/mochitest/treeupdate/a11y.ini
@@ -1,9 +1,13 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
+  !/accessible/tests/mochitest/letters.gif
+  !/accessible/tests/mochitest/moz.png
 
 [test_ariadialog.html]
 [test_ariaowns.html]
 [test_bug852150.xhtml]
 [test_bug883708.xhtml]
 [test_bug884251.xhtml]
 [test_bug895082.html]
 [test_bug1040735.html]

--- a/accessible/tests/mochitest/value/a11y.ini
+++ b/accessible/tests/mochitest/value/a11y.ini
@@ -1,7 +1,9 @@
 [DEFAULT]
+support-files =
+  !/accessible/tests/mochitest/*.js
 
 [test_general.html]
 [test_number.html]
 [test_progress.html]
 [test_progress.xul]
 [test_range.html]

--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -117,16 +117,30 @@ support-files =
   test_mcb_double_redirect_image.html
   test_mcb_redirect.js
   test_mcb_redirect.sjs
   xul_tooltiptext.xhtml
   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
+  !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
 
 [browser_URLBarSetURI.js]
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [browser_aboutAccounts.js]
 skip-if = os == "linux" # Bug 958026
 support-files =
   content_aboutAccounts.js
 [browser_aboutCertError.js]

--- a/browser/base/content/test/general/mochitest.ini
+++ b/browser/base/content/test/general/mochitest.ini
@@ -16,15 +16,16 @@ support-files =
   offlineChild2.cacheManifest
   offlineChild2.cacheManifest^headers^
   offlineChild2.html
   offlineEvent.cacheManifest
   offlineEvent.cacheManifest^headers^
   offlineEvent.html
   subtst_contextmenu.html
   video.ogg
+  !/image/test/mochitest/blue.png
 
 [test_bug364677.html]
 [test_bug395533.html]
 [test_feed_discovery.html]
 skip-if = e10s
 [test_offlineNotification.html]
 skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works?

--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -19,16 +19,17 @@ support-files =
   social_crash_content_helper.js
   social_flyout.html
   social_mark.html
   social_panel.html
   social_postActivation.html
   social_sidebar.html
   social_sidebar_empty.html
   unchecked.jpg
+  !/browser/base/content/test/plugins/blockNoPlugins.xml
 
 [browser_aboutHome_activation.js]
 [browser_addons.js]
 [browser_blocklist.js]
 [browser_share.js]
 skip-if = true # bug 1115131
 [browser_social_activation.js]
 [browser_social_chatwindow.js]

--- a/browser/components/feeds/test/chrome/chrome.ini
+++ b/browser/components/feeds/test/chrome/chrome.ini
@@ -1,9 +1,12 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
 support-files = sample_feed.atom
+  !/browser/components/feeds/test/bug408328-data.xml
+  !/browser/components/feeds/test/valid-feed.xml
+  !/browser/components/feeds/test/valid-unsniffable-feed.xml
 
 [test_423060.xul]
 [test_bug368464.html]
 [test_bug408328.html]
 skip-if= buildapp == 'mulet'
 [test_maxSniffing.html]

--- a/browser/experiments/test/xpcshell/xpcshell.ini
+++ b/browser/experiments/test/xpcshell/xpcshell.ini
@@ -5,16 +5,17 @@ tags = addons
 firefox-appdir = browser
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   experiments_1.manifest
   experiment-1.xpi
   experiment-1a.xpi
   experiment-2.xpi
   experiment-racybranch.xpi
+  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 generated-files =
   experiment-1.xpi
   experiment-1a.xpi
   experiment-2.xpi
   experiment-racybranch.xpi
 
 [test_activate.js]
 [test_api.js]

--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   file_disableScript.html
+  !/caps/tests/mochitest/file_disableScript.html
 
 [test_bug995943.xul]
 [test_addonMayLoad.html]
 [test_disableScript.xul]
 [test_principal_jarprefix_origin_appid_appstatus.html]
 # jarPrefix test doesn't work on Windows, see bug 776296.
 skip-if = os == "win"

--- a/caps/tests/mochitest/mochitest.ini
+++ b/caps/tests/mochitest/mochitest.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 support-files =
   file_data.txt
   file_disableScript.html
+  !/js/xpconnect/tests/mochitest/file_empty.html
 
 [test_app_principal_equality.html]
 [test_bug246699.html]
 [test_bug292789.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug423375.html]
 [test_bug470804.html]
 [test_disallowInheritPrincipal.html]

--- a/chrome/test/unit_ipc/xpcshell.ini
+++ b/chrome/test/unit_ipc/xpcshell.ini
@@ -1,6 +1,10 @@
 [DEFAULT]
 head = 
 tail = 
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/chrome/test/unit/data/**
+  !/chrome/test/unit/test_resolve_uris.js
+  !/chrome/test/unit/head_crtestutils.js
 
 [test_resolve_uris_ipc.js]

--- a/devtools/client/animationinspector/test/browser.ini
+++ b/devtools/client/animationinspector/test/browser.ini
@@ -6,16 +6,21 @@ support-files =
   doc_body_animation.html
   doc_frame_script.js
   doc_keyframes.html
   doc_modify_playbackRate.html
   doc_negative_animation.html
   doc_simple_animation.html
   doc_multiple_animation_types.html
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_animation_animated_properties_displayed.js]
 [browser_animation_click_selects_animation.js]
 [browser_animation_controller_exposes_document_currentTime.js]
 skip-if = os == "linux" && !debug # Bug 1234567
 [browser_animation_empty_on_invalid_nodes.js]
 [browser_animation_keyframe_click_to_set_time.js]
 [browser_animation_keyframe_markers.js]

--- a/devtools/client/debugger/test/mochitest/browser.ini
+++ b/devtools/client/debugger/test/mochitest/browser.ini
@@ -117,16 +117,18 @@ support-files =
   doc_with-frame.html
   doc_worker-source-map.html
   doc_WorkerActor.attach-tab1.html
   doc_WorkerActor.attach-tab2.html
   doc_WorkerActor.attachThread-tab.html
   head.js
   sjs_random-javascript.sjs
   testactors.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/framework/test/shared-head.js
 
 [browser_dbg_aaa_run_first_leaktest.js]
 skip-if = e10s && debug
 [browser_dbg_addonactor.js]
 tags = addons
 [browser_dbg_addon-sources.js]
 tags = addons
 [browser_dbg_addon-workers-dbg-enabled.js]

--- a/devtools/client/eyedropper/test/browser.ini
+++ b/devtools/client/eyedropper/test/browser.ini
@@ -1,10 +1,12 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   color-block.html
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/framework/test/shared-head.js
 
 [browser_eyedropper_basic.js]
 skip-if = os == "win" && debug # bug 963492
 [browser_eyedropper_cmd.js]

--- a/devtools/client/inspector/computed/test/browser.ini
+++ b/devtools/client/inspector/computed/test/browser.ini
@@ -5,16 +5,21 @@ support-files =
   doc_matched_selectors.html
   doc_media_queries.html
   doc_pseudoelement.html
   doc_sourcemaps.css
   doc_sourcemaps.css.map
   doc_sourcemaps.html
   doc_sourcemaps.scss
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_computed_browser-styles.js]
 [browser_computed_cycle_color.js]
 [browser_computed_getNodeInfo.js]
 [browser_computed_keybindings_01.js]
 [browser_computed_keybindings_02.js]
 [browser_computed_matched-selectors-toggle.js]
 [browser_computed_matched-selectors_01.js]

--- a/devtools/client/inspector/fonts/test/browser.ini
+++ b/devtools/client/inspector/fonts/test/browser.ini
@@ -2,13 +2,18 @@
 tags = devtools
 subsuite = devtools
 support-files =
   browser_fontinspector.html
   test_iframe.html
   ostrich-black.ttf
   ostrich-regular.ttf
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_fontinspector.js]
 [browser_fontinspector_edit-previews.js]
 [browser_fontinspector_edit-previews-show-all.js]
 [browser_fontinspector_theme-change.js]

--- a/devtools/client/inspector/layout/test/browser.ini
+++ b/devtools/client/inspector/layout/test/browser.ini
@@ -1,15 +1,20 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   doc_layout_iframe1.html
   doc_layout_iframe2.html
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_layout.js]
 [browser_layout_editablemodel.js]
 # [browser_layout_editablemodel_allproperties.js]
 # Disabled for too many intermittent failures (bug 1009322)
 [browser_layout_editablemodel_border.js]
 [browser_layout_editablemodel_stylerules.js]
 [browser_layout_guides.js]

--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -35,16 +35,21 @@ support-files =
   lib_jquery_1.1.js
   lib_jquery_1.2_min.js
   lib_jquery_1.3_min.js
   lib_jquery_1.4_min.js
   lib_jquery_1.6_min.js
   lib_jquery_1.7_min.js
   lib_jquery_1.11.1_min.js
   lib_jquery_2.1.1_min.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_markup_anonymous_01.js]
 [browser_markup_anonymous_02.js]
 skip-if = e10s # scratchpad.xul is not loading in e10s window
 [browser_markup_anonymous_03.js]
 [browser_markup_anonymous_04.js]
 [browser_markup_copy_image_data.js]
 [browser_markup_css_completion_style_attribute_01.js]

--- a/devtools/client/inspector/rules/test/browser.ini
+++ b/devtools/client/inspector/rules/test/browser.ini
@@ -26,16 +26,21 @@ support-files =
   doc_sourcemaps.css.map
   doc_sourcemaps.html
   doc_sourcemaps.scss
   doc_style_editor_link.css
   doc_test_image.png
   doc_urls_clickable.css
   doc_urls_clickable.html
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_rules_add-property-and-reselect.js]
 [browser_rules_add-property-cancel_01.js]
 [browser_rules_add-property-cancel_02.js]
 [browser_rules_add-property-cancel_03.js]
 [browser_rules_add-property-commented.js]
 [browser_rules_add-property_01.js]
 [browser_rules_add-property_02.js]

--- a/devtools/client/inspector/test/browser.ini
+++ b/devtools/client/inspector/test/browser.ini
@@ -25,16 +25,21 @@ support-files =
   doc_inspector_remove-iframe-during-load.html
   doc_inspector_search.html
   doc_inspector_search-reserved.html
   doc_inspector_search-suggestions.html
   doc_inspector_search-svg.html
   doc_inspector_select-last-selected-01.html
   doc_inspector_select-last-selected-02.html
   head.js
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/test/head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/shared/test/test-actor.js
+  !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_inspector_breadcrumbs.js]
 [browser_inspector_breadcrumbs_highlight_hover.js]
 [browser_inspector_breadcrumbs_keybinding.js]
 [browser_inspector_breadcrumbs_menu.js]
 [browser_inspector_breadcrumbs_mutations.js]
 [browser_inspector_delete-selected-node-01.js]
 [browser_inspector_delete-selected-node-02.js]

--- a/devtools/client/jsonview/test/browser.ini
+++ b/devtools/client/jsonview/test/browser.ini
@@ -7,15 +7,18 @@ support-files =
   doc_frame_script.js
   head.js
   invalid_json.json
   invalid_json.json^headers^
   simple_json.json
   simple_json.json^headers^
   valid_json.json
   valid_json.json^headers^
+  !/devtools/client/commandline/test/head.js
+  !/devtools/client/framework/test/head.js
+  !/devtools/client/framework/test/shared-head.js
 
 [browser_jsonview_copy_headers.js]
 [browser_jsonview_copy_json.js]
 [browser_jsonview_copy_rawdata.js]
 [browser_jsonview_filter.js]
 [browser_jsonview_invalid_json.js]
 [browser_jsonview_valid_json.js]

--- a/devtools/client/memory/test/browser/browser.ini
+++ b/devtools/client/memory/test/browser/browser.ini
@@ -1,15 +1,17 @@
 [DEFAULT]
 tags = devtools devtools-memory
 subsuite = devtools
 support-files =
   head.js
   doc_big_tree.html
   doc_steady_allocation.html
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/framework/test/shared-redux-head.js
 
 [browser_memory_allocationStackDisplay_01.js]
     skip-if = debug # bug 1219554
 [browser_memory_displays_01.js]
 [browser_memory_clear_snapshots.js]
 [browser_memory_diff_01.js]
 [browser_memory_dominator_trees_01.js]
 [browser_memory_dominator_trees_02.js]

--- a/devtools/client/netmonitor/har/test/browser.ini
+++ b/devtools/client/netmonitor/har/test/browser.ini
@@ -1,9 +1,11 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   head.js
   html_har_post-data-test-page.html
+  !/devtools/client/netmonitor/test/head.js
+  !/devtools/client/netmonitor/test/html_simple-test-page.html
 
 [browser_net_har_copy_all_as_har.js]
 [browser_net_har_post_data.js]

--- a/devtools/client/responsive.html/test/browser/browser.ini
+++ b/devtools/client/responsive.html/test/browser/browser.ini
@@ -1,9 +1,11 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   browser_devices.json
   head.js
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/framework/test/shared-redux-head.js
 
 [browser_exit_button.js]
 [browser_viewport_basics.js]

--- a/devtools/client/responsivedesign/test/browser.ini
+++ b/devtools/client/responsivedesign/test/browser.ini
@@ -1,14 +1,16 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   head.js
   touch.html
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/framework/test/shared-head.js
 
 [browser_responsive_cmd.js]
 [browser_responsivecomputedview.js]
 skip-if = e10s && debug # Bug 1252201 - Docshell leak on debug e10s
 [browser_responsiveruleview.js]
 skip-if = e10s && debug # Bug 1252201 - Docshell leak on debug e10s
 [browser_responsiveui.js]
 [browser_responsiveui_touch.js]

--- a/devtools/client/shared/test/browser.ini
+++ b/devtools/client/shared/test/browser.ini
@@ -13,16 +13,17 @@ support-files =
   html-mdn-css-basic-testing.html
   html-mdn-css-no-summary.html
   html-mdn-css-no-summary-or-syntax.html
   html-mdn-css-no-syntax.html
   html-mdn-css-syntax-old-style.html
   leakhunt.js
   test-actor.js
   test-actor-registry.js
+  !/devtools/client/framework/test/shared-head.js
 
 [browser_css_color.js]
 [browser_cubic-bezier-01.js]
 [browser_cubic-bezier-02.js]
 [browser_cubic-bezier-03.js]
 [browser_cubic-bezier-04.js]
 [browser_cubic-bezier-05.js]
 [browser_cubic-bezier-06.js]

--- a/devtools/client/styleeditor/test/browser.ini
+++ b/devtools/client/styleeditor/test/browser.ini
@@ -45,16 +45,18 @@ support-files =
   test_private.css
   test_private.html
   doc_frame_script.js
   doc_long.css
   doc_uncached.css
   doc_uncached.html
   doc_xulpage.xul
   sync.html
+  !/devtools/client/commandline/test/helpers.js
+  !/devtools/client/inspector/shared/test/head.js
 
 [browser_styleeditor_autocomplete.js]
 [browser_styleeditor_autocomplete-disabled.js]
 [browser_styleeditor_bug_740541_iframes.js]
 [browser_styleeditor_bug_851132_middle_click.js]
 [browser_styleeditor_bug_870339.js]
 [browser_styleeditor_cmd_edit.js]
 [browser_styleeditor_enabled.js]

--- a/devtools/client/webconsole/test/browser.ini
+++ b/devtools/client/webconsole/test/browser.ini
@@ -135,16 +135,19 @@ support-files =
   test-exception-stackframe.html
   test_bug_1010953_cspro.html^headers^
   test_bug_1010953_cspro.html
   test_bug1045902_console_csp_ignore_reflected_xss_message.html^headers^
   test_bug1045902_console_csp_ignore_reflected_xss_message.html
   test_bug1092055_shouldwarn.js^headers^
   test_bug1092055_shouldwarn.js
   test_bug1092055_shouldwarn.html
+  !/devtools/client/framework/test/shared-head.js
+  !/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
+  !/image/test/mochitest/blue.png
 
 [browser_bug1045902_console_csp_ignore_reflected_xss_message.js]
 skip-if = (e10s && debug) || (e10s && os == 'win') # Bug 1221499 enabled these on windows
 [browser_bug664688_sandbox_update_after_navigation.js]
 [browser_bug_638949_copy_link_location.js]
 [browser_bug_862916_console_dir_and_filter_off.js]
 skip-if = (e10s && (os == 'win' || os == 'mac')) # Bug 1243976
 [browser_bug_865288_repeat_different_objects.js]

--- a/devtools/server/tests/browser/browser.ini
+++ b/devtools/server/tests/browser/browser.ini
@@ -16,16 +16,17 @@ support-files =
   storage-unsecured-iframe.html
   storage-updates.html
   storage-secured-iframe.html
   stylesheets-nested-iframes.html
   timeline-iframe-child.html
   timeline-iframe-parent.html
   director-script-target.html
   storage-helpers.js
+  !/devtools/server/tests/mochitest/hello-actor.js
 
 [browser_animation_emitMutations.js]
 [browser_animation_getFrames.js]
 [browser_animation_getMultipleStates.js]
 [browser_animation_getPlayers.js]
 [browser_animation_getStateAfterFinished.js]
 [browser_animation_getSubTreeAnimations.js]
 [browser_animation_keepFinished.js]

--- a/devtools/shared/webconsole/test/chrome.ini
+++ b/devtools/shared/webconsole/test/chrome.ini
@@ -4,16 +4,18 @@ skip-if = buildapp == 'b2g'
 support-files =
   common.js
   data.json
   data.json^headers^
   helper_serviceworker.js
   network_requests_iframe.html
   sandboxed_iframe.html
   console-test-worker.js
+  !/browser/base/content/test/general/browser_star_hsts.sjs
+  !/browser/base/content/test/general/pinning_headers.sjs
 
 [test_basics.html]
 [test_bug819670_getter_throws.html]
 [test_cached_messages.html]
 [test_commands_other.html]
 [test_commands_registration.html]
 [test_consoleapi.html]
 [test_consoleapi_innerID.html]

--- a/dom/animation/test/chrome.ini
+++ b/dom/animation/test/chrome.ini
@@ -1,13 +1,14 @@
 [DEFAULT]
 support-files =
   testcommon.js
   ../../imptests/testharness.js
   ../../imptests/testharnessreport.js
+  !/dom/animation/test/chrome/file_animate_xrays.html
 [chrome/test_animate_xrays.html]
 # file_animate_xrays.html needs to go in mochitest.ini since it is served
 # over HTTP
 [chrome/test_animation_observers.html]
 [chrome/test_animation_properties.html]
 [chrome/test_animation_property_state.html]
 [chrome/test_generated_content_getAnimations.html]
 [chrome/test_restyles.html]

--- a/dom/animation/test/mochitest.ini
+++ b/dom/animation/test/mochitest.ini
@@ -1,90 +1,90 @@
 [DEFAULT]
 # Support files for chrome tests that we want to load over HTTP need
 # to go in here, not chrome.ini.
 support-files =
+  chrome/file_animate_xrays.html
+  css-animations/file_animation-cancel.html
+  css-animations/file_animation-computed-timing.html
+  css-animations/file_animation-currenttime.html
+  css-animations/file_animation-finish.html
+  css-animations/file_animation-finished.html
+  css-animations/file_animation-id.html
+  css-animations/file_animation-oncancel.html
+  css-animations/file_animation-onfinish.html
+  css-animations/file_animation-pausing.html
+  css-animations/file_animation-play.html
+  css-animations/file_animation-playbackrate.html
+  css-animations/file_animation-playstate.html
+  css-animations/file_animation-ready.html
+  css-animations/file_animation-reverse.html
+  css-animations/file_animation-starttime.html
+  css-animations/file_animations-dynamic-changes.html
+  css-animations/file_cssanimation-animationname.html
+  css-animations/file_document-get-animations.html
+  css-animations/file_effect-target.html
+  css-animations/file_element-get-animations.html
+  css-animations/file_keyframeeffect-getframes.html
+  css-animations/file_pseudoElement-get-animations.html
+  css-transitions/file_animation-cancel.html
+  css-transitions/file_animation-computed-timing.html
+  css-transitions/file_animation-currenttime.html
+  css-transitions/file_animation-finished.html
+  css-transitions/file_animation-pausing.html
+  css-transitions/file_animation-ready.html
+  css-transitions/file_animation-starttime.html
+  css-transitions/file_csstransition-transitionproperty.html
+  css-transitions/file_document-get-animations.html
+  css-transitions/file_effect-target.html
+  css-transitions/file_element-get-animations.html
+  css-transitions/file_keyframeeffect-getframes.html
+  css-transitions/file_pseudoElement-get-animations.html
+  document-timeline/file_document-timeline.html
+  mozilla/file_deferred_start.html
+  mozilla/file_hide_and_show.html
+  mozilla/file_partial_keyframes.html
   testcommon.js
-  chrome/file_animate_xrays.html
 
 [css-animations/test_animations-dynamic-changes.html]
-support-files = css-animations/file_animations-dynamic-changes.html
 [css-animations/test_animation-cancel.html]
-support-files = css-animations/file_animation-cancel.html
 [css-animations/test_animation-computed-timing.html]
-support-files = css-animations/file_animation-computed-timing.html
 [css-animations/test_animation-currenttime.html]
-support-files = css-animations/file_animation-currenttime.html
 [css-animations/test_animation-finish.html]
-support-files = css-animations/file_animation-finish.html
 [css-animations/test_animation-finished.html]
-support-files = css-animations/file_animation-finished.html
 [css-animations/test_animation-id.html]
-support-files = css-animations/file_animation-id.html
 [css-animations/test_animation-oncancel.html]
-support-files = css-animations/file_animation-oncancel.html
 [css-animations/test_animation-onfinish.html]
-support-files = css-animations/file_animation-onfinish.html
 [css-animations/test_animation-pausing.html]
-support-files = css-animations/file_animation-pausing.html
 [css-animations/test_animation-play.html]
-support-files = css-animations/file_animation-play.html
 [css-animations/test_animation-playbackrate.html]
-support-files = css-animations/file_animation-playbackrate.html
 [css-animations/test_animation-playstate.html]
-support-files = css-animations/file_animation-playstate.html
 [css-animations/test_animation-ready.html]
-support-files = css-animations/file_animation-ready.html
 [css-animations/test_animation-reverse.html]
-support-files = css-animations/file_animation-reverse.html
 [css-animations/test_animation-starttime.html]
-support-files = css-animations/file_animation-starttime.html
 [css-animations/test_cssanimation-animationname.html]
-support-files = css-animations/file_cssanimation-animationname.html
 [css-animations/test_document-get-animations.html]
-support-files = css-animations/file_document-get-animations.html
 [css-animations/test_effect-target.html]
-support-files = css-animations/file_effect-target.html
 [css-animations/test_element-get-animations.html]
 skip-if = buildapp == 'mulet'
-support-files = css-animations/file_element-get-animations.html
 [css-animations/test_keyframeeffect-getframes.html]
-support-files = css-animations/file_keyframeeffect-getframes.html
 [css-animations/test_pseudoElement-get-animations.html]
-support-files = css-animations/file_pseudoElement-get-animations.html
 [css-transitions/test_animation-cancel.html]
-support-files = css-transitions/file_animation-cancel.html
 [css-transitions/test_animation-computed-timing.html]
-support-files = css-transitions/file_animation-computed-timing.html
 [css-transitions/test_animation-currenttime.html]
-support-files = css-transitions/file_animation-currenttime.html
 [css-transitions/test_animation-finished.html]
-support-files = css-transitions/file_animation-finished.html
 [css-transitions/test_animation-pausing.html]
-support-files = css-transitions/file_animation-pausing.html
 [css-transitions/test_animation-ready.html]
-support-files = css-transitions/file_animation-ready.html
 [css-transitions/test_animation-starttime.html]
-support-files = css-transitions/file_animation-starttime.html
 [css-transitions/test_csstransition-transitionproperty.html]
-support-files = css-transitions/file_csstransition-transitionproperty.html
 [css-transitions/test_document-get-animations.html]
-support-files = css-transitions/file_document-get-animations.html
 [css-transitions/test_effect-target.html]
-support-files = css-transitions/file_effect-target.html
 [css-transitions/test_element-get-animations.html]
 skip-if = buildapp == 'mulet'
-support-files = css-transitions/file_element-get-animations.html
 [css-transitions/test_keyframeeffect-getframes.html]
-support-files = css-transitions/file_keyframeeffect-getframes.html
 [css-transitions/test_pseudoElement-get-animations.html]
-support-files = css-transitions/file_pseudoElement-get-animations.html
 [document-timeline/test_document-timeline.html]
-support-files = document-timeline/file_document-timeline.html
 [document-timeline/test_request_animation_frame.html]
 skip-if = buildapp == 'mulet'
 [mozilla/test_deferred_start.html]
-support-files = mozilla/file_deferred_start.html
 skip-if = (toolkit == 'gonk' && debug)
 [mozilla/test_hide_and_show.html]
-support-files = mozilla/file_hide_and_show.html
 [mozilla/test_partial_keyframes.html]
-support-files = mozilla/file_partial_keyframes.html

--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -257,16 +257,19 @@ support-files =
   file_explicit_user_agent.sjs
   referrer_change_server.sjs
   file_change_policy_redirect.html
   file_bug1198095.js
   file_bug1250148.sjs
   mozbrowser_api_utils.js
   websocket_helpers.js
   websocket_tests.js
+  !/dom/html/test/form_submit_server.sjs
+  !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
+  !/image/test/mochitest/blue.png
 
 [test_anonymousContent_api.html]
 [test_anonymousContent_append_after_reflow.html]
 [test_anonymousContent_canvas.html]
 skip-if = buildapp == 'b2g' # Requires webgl support
 [test_anonymousContent_insert.html]
 [test_anonymousContent_manipulate_content.html]
 [test_anonymousContent_style_csp.html]

--- a/dom/base/test/unit_ipc/xpcshell.ini
+++ b/dom/base/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,10 @@
 [DEFAULT]
 head =
 tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/dom/base/test/unit/test_bug553888.js
+  !/dom/base/test/unit/test_xhr_document.js
 
 [test_bug553888_wrap.js]
 [test_xhr_document_ipc.js]

--- a/dom/bindings/test/chrome.ini
+++ b/dom/bindings/test/chrome.ini
@@ -1,10 +1,16 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
+support-files =
+  !/dom/bindings/test/file_bug707564.html
+  !/dom/bindings/test/file_bug775543.html
+  !/dom/bindings/test/file_document_location_set_via_xray.html
+  !/dom/bindings/test/file_dom_xrays.html
+  !/dom/bindings/test/file_proxies_via_xray.html
 
 [test_bug707564-chrome.html]
 [test_bug775543.html]
 [test_document_location_set_via_xray.html]
 [test_dom_xrays.html]
 [test_proxies_via_xray.html]
 [test_document_location_via_xray_cached.html]
 [test_blacklisted_prerendering_function.xul]

--- a/dom/bindings/test/mochitest.ini
+++ b/dom/bindings/test/mochitest.ini
@@ -3,16 +3,17 @@ support-files =
   file_InstanceOf.html
   file_bug707564.html
   file_bug707564-2.html
   file_bug775543.html
   file_document_location_set_via_xray.html
   file_dom_xrays.html
   file_proxies_via_xray.html
   forOf_iframe.html
+  !/js/xpconnect/tests/mochitest/file_empty.html
 
 [test_async_stacks.html]
 [test_ByteString.html]
 [test_InstanceOf.html]
 [test_bug560072.html]
 [test_bug707564.html]
 [test_bug742191.html]
 [test_bug759621.html]

--- a/dom/browser-element/mochitest/priority/mochitest.ini
+++ b/dom/browser-element/mochitest/priority/mochitest.ini
@@ -1,30 +1,34 @@
 [DEFAULT]
 # Good luck running these tests on anything but desktop Linux.
 run-if = os == 'linux' && buildapp == 'browser' && !e10s
+support-files =
+  file_Audio.html
+  file_HighPriority.html
+  file_MultipleFrames.html
+  file_NestedFramesOuter.html
+  file_WebGLContextLost.html
+  silence.ogg
+  !/dom/browser-element/mochitest/browserElementTestHelpers.js
+  !/dom/browser-element/mochitest/file_empty.html
 
 # Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
 # because testing the process-priority manager without OOP frames does not make
 # much sense.
 
 [test_Simple.html]
 [test_Visibility.html]
 [test_HighPriority.html]
-support-files = file_HighPriority.html
 [test_Background.html]
 [test_BackgroundLRU.html]
 [test_Activity.html]
 [test_Audio.html]
-support-files = file_Audio.html silence.ogg
 [test_Keyboard.html]
 [test_MultipleActivities.html]
 [test_MultipleFrames.html]
-support-files = file_MultipleFrames.html
 [test_Preallocated.html]
 disabled = bug 968604, bug 987164
 [test_ExpectingSystemMessage.html]
 [test_ExpectingSystemMessage2.html]
 [test_NestedFrames.html]
-support-files = file_NestedFramesOuter.html
 [test_WebGLContextLost.html]
 disabled = bug 865844
-support-files = file_WebGLContextLost.html

--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -7,16 +7,17 @@ support-files =
   bug426082.html
   bug656379-1.html
   bug418986-3.js
   error_event_worker.js
   empty.js
   window_bug493251.html
   window_bug659071.html
   window_wheel_default_action.html
+  !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 
 [test_accel_virtual_modifier.html]
 [test_addEventListenerExtraArg.html]
 [test_all_synthetic_events.html]
 [test_bug226361.xhtml]
 skip-if = buildapp == 'b2g' || buildapp == 'mulet'
 [test_bug238987.html]
 skip-if = buildapp == 'b2g'

--- a/dom/html/test/forms/mochitest.ini
+++ b/dom/html/test/forms/mochitest.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 support-files =
   save_restore_radio_groups.sjs
   test_input_number_data.js
+  !/dom/html/test/reflect.js
 
 [test_bug1039548.html]
 [test_button_attributes_reflection.html]
 [test_input_radio_radiogroup.html]
 [test_input_radio_required.html]
 [test_change_event.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_datalist_element.html]

--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -566,16 +566,18 @@ support-files =
   wavedata_s24.wav
   wavedata_s24.wav^headers^
   wavedata_s16.wav
   wavedata_s16.wav^headers^
   wavedata_u8.wav
   wavedata_u8.wav^headers^
   wavedata_ulaw.wav
   wavedata_ulaw.wav^headers^
+  !/dom/canvas/test/captureStream_common.js
+  !/dom/html/test/reflect.js
 
 [test_access_control.html]
 skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1082984
 [test_aspectratio_mp4.html]
 [test_audio1.html]
 [test_audio2.html]
 [test_audioDocumentTitle.html]
 skip-if = true # bug 475110 - disabled since we don't play Wave files standalone

--- a/dom/media/tests/mochitest/identity/mochitest.ini
+++ b/dom/media/tests/mochitest/identity/mochitest.ini
@@ -3,16 +3,24 @@
 # broken HTTPS on b2g emulator - bug 1135339
 # Android 4.3 - bug 981881
 # Exit code -11 for linux/opt/non-e10s - bug 1256284
 subsuite = media
 skip-if = android_version == '18' || (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'b2g' && toolkit == 'gonk') || buildapp == 'mulet' || (os == 'linux' && !debug && !e10s)
 support-files =
   /.well-known/idp-proxy/idp.js
   identityPcTest.js
+  !/dom/media/tests/mochitest/blacksilence.js
+  !/dom/media/tests/mochitest/dataChannel.js
+  !/dom/media/tests/mochitest/head.js
+  !/dom/media/tests/mochitest/network.js
+  !/dom/media/tests/mochitest/pc.js
+  !/dom/media/tests/mochitest/sdpUtils.js
+  !/dom/media/tests/mochitest/templates.js
+  !/dom/media/tests/mochitest/turnConfig.js
 tags = msg
 
 [test_idpproxy.html]
 support-files =
   /.well-known/idp-proxy/idp-redirect-http.js
   /.well-known/idp-proxy/idp-redirect-http.js^headers^
   /.well-known/idp-proxy/idp-redirect-http-trick.js
   /.well-known/idp-proxy/idp-redirect-http-trick.js^headers^

--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -9,16 +9,24 @@ support-files =
   network.js
   nonTrickleIce.js
   pc.js
   templates.js
   NetworkPreparationChromeScript.js
   blacksilence.js
   turnConfig.js
   sdpUtils.js
+  !/dom/canvas/test/captureStream_common.js
+  !/dom/canvas/test/webgl-mochitest/webgl-util.js
+  !/dom/media/test/manifest.js
+  !/dom/media/test/320x240.ogv
+  !/dom/media/test/r11025_s16_c1.wav
+  !/dom/media/test/bug461281.ogg
+  !/dom/media/test/seek.webm
+  !/dom/media/test/gizmo.mp4
 
 [test_dataChannel_basicAudio.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' # Bug 962984 for debug, bug 963244 for opt
 [test_dataChannel_basicAudioVideo.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_basicAudioVideoNoBundle.html]
 skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) FAILS WHEN RUN MANUALLY ON AWS, android(Bug 1189784, timeouts on 4.3 emulator)
 [test_dataChannel_basicAudioVideoCombined.html]

--- a/dom/plugins/test/mochitest/chrome.ini
+++ b/dom/plugins/test/mochitest/chrome.ini
@@ -1,14 +1,15 @@
 [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/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -18,16 +18,17 @@ support-files =
   mixed_case_mime.sjs
   neverending.sjs
   npruntime_identifiers_subpage.html
   plugin-stream-referer.sjs
   plugin_window.html
   pluginstream.js
   post.sjs
   plugin-utils.js
+  !/toolkit/components/passwordmgr/test/authenticate.sjs
 
 [test_GCrace.html]
 [test_NPNVdocumentOrigin.html]
 [test_NPPVpluginWantsAllNetworkStreams.html]
 [test_bug406541.html]
 [test_bug532208.html]
 [test_bug539565-1.html]
 [test_bug539565-2.html]

--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,14 +1,16 @@
 [DEFAULT]
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 head = head_plugins.js
 tail =
 tags = addons
 firefox-appdir = browser
+support-files =
+  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 
 [test_allowed_types.js]
 skip-if = appname == "thunderbird"
 reason = plugins are disabled by default in Thunderbird
 [test_bug455213.js]
 # Bug 676953: test fails consistently on Android
 fail-if = os == "android"
 [test_bug471245.js]

--- a/dom/security/test/csp/browser.ini
+++ b/dom/security/test/csp/browser.ini
@@ -1,3 +1,5 @@
 [DEFAULT]
+support-files =
+  !/dom/security/test/csp/file_testserver.sjs
 [browser_test_web_manifest.js]
 [browser_test_web_manifest_mixed_content.js]

--- a/dom/security/test/csp/chrome.ini
+++ b/dom/security/test/csp/chrome.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g' || os == 'android'
+support-files =
+  !/dom/security/test/csp/file_bug768029.html
 
 [test_bug768029.html]
 [test_bug773891.html]

--- a/dom/security/test/csp/mochitest.ini
+++ b/dom/security/test/csp/mochitest.ini
@@ -154,16 +154,17 @@ support-files =
   file_docwrite_meta.css
   file_docwrite_meta.js
   file_multipart_testserver.sjs
   file_fontloader.sjs
   file_fontloader.woff
   file_block_all_mcb.sjs
   file_block_all_mixed_content_frame_navigation1.html
   file_block_all_mixed_content_frame_navigation2.html
+  !/image/test/mochitest/blue.png
 
 [test_base-uri.html]
 [test_blob_data_schemes.html]
 [test_connect-src.html]
 [test_CSP.html]
 [test_allow_https_schemes.html]
 skip-if = buildapp == 'b2g' #no ssl support
 [test_bug663567.html]

--- a/dom/security/test/mixedcontentblocker/mochitest.ini
+++ b/dom/security/test/mixedcontentblocker/mochitest.ini
@@ -7,15 +7,17 @@ support-files =
   file_frameNavigation_grandchild.html
   file_frameNavigation_innermost.html
   file_frameNavigation_secure.html
   file_frameNavigation_secure_grandchild.html
   file_main.html
   file_main_bug803225.html
   file_main_bug803225_websocket_wsh.py
   file_server.sjs
+  !/dom/media/test/320x240.ogv
+  !/image/test/mochitest/blue.png
 
 [test_main.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC
 [test_bug803225.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC
 [test_frameNavigation.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || (os == 'mac' || os == 'win') #TIMED_OUT, SSL_REQUIRED, OSX/Win: Bug 1241634

--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -2,16 +2,17 @@
 support-files =
   browser_frame_elements.html
   page_privatestorageevent.html
   position.html
   test-console-api.html
   test_bug1004814.html
   worker_bug1004814.js
   geo_leak_test.html
+  !/dom/tests/mochitest/geolocation/network_geolocation.sjs
 
 [browser_test_toolbars_visibility.js]
 support-files =
   test_new_window_from_content_child.html
 [browser_bug1008941_dismissGeolocationHanger.js]
 skip-if = buildapp == 'mulet'
 [browser_test__content.js]
 skip-if = e10s

--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -23,16 +23,20 @@ support-files =
   queryCaretRectWin.html
   selectAtPoint.html
   sizemode_attribute.xul
   window_activation.xul
   window_callback_wrapping.xul
   window_docshell_swap.xul
   window_focus.xul
   window_focus_docnav.xul
+  !/dom/tests/mochitest/general/file_clonewrapper.html
+  !/dom/tests/mochitest/general/file_moving_nodeList.html
+  !/dom/tests/mochitest/general/file_moving_xhr.html
+  !/dom/tests/mochitest/geolocation/network_geolocation.sjs
 
 [test_DOMWindowCreated.xul]
 [test_DOM_element_instanceof.xul]
 [test_activation.xul]
 tags = fullscreen
 [test_bug799299.xul]
 [test_bug800817.xul]
 [test_bug830396.xul]

--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@@ -13,16 +13,26 @@ support-files =
   worker_wrapper.js
   message_receiver.html
   reroute.html
   reroute.js
   reroute.js^headers^
   sw_reroute.js
   empty.js
   empty.js^headers^
+  !/dom/base/test/file_XHR_binary1.bin
+  !/dom/base/test/file_XHR_binary1.bin^headers^
+  !/dom/base/test/file_XHR_binary2.bin
+  !/dom/base/test/file_XHR_pass1.xml
+  !/dom/base/test/file_XHR_pass2.txt
+  !/dom/base/test/file_XHR_pass3.txt
+  !/dom/base/test/file_XHR_pass3.txt^headers^
+  !/dom/base/test/responseIdentical.sjs
+  !/dom/html/test/form_submit_server.sjs
+  !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
 
 [test_headers.html]
 [test_headers_sw_reroute.html]
 skip-if = buildapp == 'b2g' # Bug 1137683
 [test_headers_mainthread.html]
 skip-if = (e10s && debug && os == 'win')
 [test_fetch_app_protocol.html]
 skip-if = (buildapp != 'b2g' && buildapp != 'mulet')

--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@@ -40,16 +40,22 @@ support-files =
   frameStorageAllowed.html
   frameStoragePrevented.html
   frameStorageChrome.html
   frameStorageNullprincipal.sjs
   workerStorageAllowed.js
   workerStoragePrevented.js
   storagePermissionsUtils.js
   frameSelectEvents.html
+  !/image/test/mochitest/big.png
+  !/image/test/mochitest/blue.png
+  !/image/test/mochitest/clear.png
+  !/image/test/mochitest/damon.jpg
+  !/image/test/mochitest/over.png
+  !/image/test/mochitest/red.png
 
 [test_497898.html]
 skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage
 [test_bug504220.html]
 [test_bug628069_1.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug628069_2.html]
 [test_bug631440.html]

--- a/dom/workers/test/browser.ini
+++ b/dom/workers/test/browser.ini
@@ -1,10 +1,12 @@
 [DEFAULT]
 support-files =
   bug1047663_tab.html
   bug1047663_worker.sjs
   frame_script.js
   head.js
+  !/dom/base/test/file_empty.html
+  !/dom/base/test/file_bug945152.jar
 
 [browser_bug1047663.js]
 [browser_bug1104623.js]
 run-if = buildapp == 'browser'

--- a/dom/workers/test/chrome.ini
+++ b/dom/workers/test/chrome.ini
@@ -5,62 +5,60 @@ support-files =
   WorkerDebugger.console_debugger.js
   WorkerDebugger.console_worker.js
   WorkerDebugger.initialize_childWorker.js
   WorkerDebugger.initialize_debugger.js
   WorkerDebugger.initialize_worker.js
   WorkerDebugger.postMessage_childWorker.js
   WorkerDebugger.postMessage_debugger.js
   WorkerDebugger.postMessage_worker.js
-  WorkerDebugger_frozen_iframe1.html
-  WorkerDebugger_frozen_iframe2.html
-  WorkerDebugger_frozen_worker1.js
-  WorkerDebugger_frozen_worker2.js
   WorkerDebuggerGlobalScope.createSandbox_debugger.js
   WorkerDebuggerGlobalScope.createSandbox_sandbox.js
   WorkerDebuggerGlobalScope.createSandbox_worker.js
   WorkerDebuggerGlobalScope.enterEventLoop_childWorker.js
   WorkerDebuggerGlobalScope.enterEventLoop_debugger.js
   WorkerDebuggerGlobalScope.enterEventLoop_worker.js
   WorkerDebuggerGlobalScope.reportError_childWorker.js
   WorkerDebuggerGlobalScope.reportError_debugger.js
   WorkerDebuggerGlobalScope.reportError_worker.js
   WorkerDebuggerGlobalScope.setImmediate_debugger.js
   WorkerDebuggerGlobalScope.setImmediate_worker.js
   WorkerDebuggerManager_childWorker.js
   WorkerDebuggerManager_worker.js
   WorkerDebugger_childWorker.js
-  WorkerDebugger_worker.js
+  WorkerDebugger_frozen_iframe1.html
+  WorkerDebugger_frozen_iframe2.html
+  WorkerDebugger_frozen_worker1.js
+  WorkerDebugger_frozen_worker2.js
   WorkerDebugger_sharedWorker.js
   WorkerDebugger_suspended_debugger.js
   WorkerDebugger_suspended_worker.js
+  WorkerDebugger_worker.js
   WorkerTest.jsm
   WorkerTest_subworker.js
   WorkerTest_worker.js
+  bug1062920_worker.js
   chromeWorker_subworker.js
   chromeWorker_worker.js
   dom_worker_helper.js
-  file_url.jsm
-  file_worker.js
+  empty.html
   fileBlobSubWorker_worker.js
   fileBlob_worker.js
   filePosting_worker.js
   fileReadSlice_worker.js
   fileReaderSyncErrors_worker.js
   fileReaderSync_worker.js
   fileSlice_worker.js
   fileSubWorker_worker.js
+  file_url.jsm
   file_worker.js
   jsm_url_worker.js
-  workersDisabled_worker.js
-  file_url.jsm
-  bug1062920_worker.js
-  empty.html
   sharedWorker_privateBrowsing.js
   test_bug883784.jsm
+  workersDisabled_worker.js
 
 [test_WorkerDebugger.initialize.xul]
 [test_WorkerDebugger.postMessage.xul]
 [test_WorkerDebugger.xul]
 [test_WorkerDebuggerGlobalScope.createSandbox.xul]
 [test_WorkerDebuggerGlobalScope.enterEventLoop.xul]
 [test_WorkerDebuggerGlobalScope.reportError.xul]
 [test_WorkerDebuggerGlobalScope.setImmediate.xul]

--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -124,16 +124,38 @@ support-files =
   sharedWorker_lifetime.js
   worker_referrer.js
   websocket_https.html
   websocket_https_worker.js
   worker_fileReader.js
   fileapi_chromeScript.js
   importScripts_3rdParty_worker.js
   xhr_cors_redirect.sjs
+  !/dom/base/test/file_XHRResponseURL.js
+  !/dom/base/test/file_XHRResponseURL.sjs
+  !/dom/base/test/file_XHRResponseURL.text
+  !/dom/base/test/file_XHRResponseURL.text^headers^
+  !/dom/base/test/file_XHRResponseURL_nocors.text
+  !/dom/base/test/file_XHR_timeout.sjs
+  !/dom/base/test/file_websocket_basic_wsh.py
+  !/dom/base/test/file_websocket_hello_wsh.py
+  !/dom/base/test/file_websocket_http_resource.txt
+  !/dom/base/test/file_websocket_permessage_deflate_disabled_wsh.py
+  !/dom/base/test/file_websocket_permessage_deflate_params_wsh.py
+  !/dom/base/test/file_websocket_permessage_deflate_rejected_wsh.py
+  !/dom/base/test/file_websocket_permessage_deflate_wsh.py
+  !/dom/base/test/file_websocket_wsh.py
+  !/dom/base/test/test_XHR_system.html
+  !/dom/base/test/test_XHR_timeout.js
+  !/dom/base/test/test_performance_observer.js
+  !/dom/base/test/test_performance_user_timing.js
+  !/dom/base/test/websocket_helpers.js
+  !/dom/base/test/websocket_tests.js
+  !/dom/tests/mochitest/notification/MockServices.js
+  !/dom/tests/mochitest/notification/NotificationTest.js
 
 [test_404.html]
 [test_atob.html]
 [test_blobConstructor.html]
 [test_blobWorkers.html]
 [test_bug949946.html]
 [test_bug978260.html]
 [test_bug998474.html]

--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -194,16 +194,19 @@ support-files =
   xslt/*
   unresolved_fetch_worker.js
   header_checker.sjs
   openWindow_worker.js
   redirect.sjs
   open_window/client.html
   lorem_script.js
   file_blob_response_worker.js
+  !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
+  !/dom/tests/mochitest/notification/MockServices.js
+  !/dom/tests/mochitest/notification/NotificationTest.js
 
 [test_bug1151916.html]
 [test_claim.html]
 [test_claim_fetch.html]
 [test_claim_oninstall.html]
 [test_close.html]
 [test_controller.html]
 [test_cross_origin_url_after_redirect.html]

--- a/js/xpconnect/tests/chrome/chrome.ini
+++ b/js/xpconnect/tests/chrome/chrome.ini
@@ -7,16 +7,33 @@ support-files =
   file_bug1050049.xml
   file_discardSystemSource.html
   worker_discardSystemSource.js
   file_evalInSandbox.html
   file_expandosharing.jsm
   outoflinexulscript.js
   subscript.js
   utf8_subscript.js
+  !/js/xpconnect/tests/mochitest/bug500931_helper.html
+  !/js/xpconnect/tests/mochitest/bug571849_helper.html
+  !/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html
+  !/js/xpconnect/tests/mochitest/file_bug706301.html
+  !/js/xpconnect/tests/mochitest/file_bug738244.html
+  !/js/xpconnect/tests/mochitest/file_bug760131.html
+  !/js/xpconnect/tests/mochitest/file_bug795275.html
+  !/js/xpconnect/tests/mochitest/file_bug795275.xml
+  !/js/xpconnect/tests/mochitest/file_bug799348.html
+  !/js/xpconnect/tests/mochitest/file_bug860494.html
+  !/js/xpconnect/tests/mochitest/file_documentdomain.html
+  !/js/xpconnect/tests/mochitest/file_doublewrappedcompartments.html
+  !/js/xpconnect/tests/mochitest/file_empty.html
+  !/js/xpconnect/tests/mochitest/file_exnstack.html
+  !/js/xpconnect/tests/mochitest/file_expandosharing.html
+  !/js/xpconnect/tests/mochitest/file_nodelists.html
+  !/js/xpconnect/tests/mochitest/file_evalInSandbox.html
 
 [test_APIExposer.xul]
 [test_bug361111.xul]
 [test_bug448587.xul]
 [test_bug484459.xul]
 skip-if = os == 'win' || os == 'mac' # bug 1131110
 [test_bug500931.xul]
 [test_bug503926.xul]

--- a/modules/libjar/test/mochitest/mochitest.ini
+++ b/modules/libjar/test/mochitest/mochitest.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
 support-files =
   bug403331.zip
   bug403331.zip^headers^
   openredirect.sjs
+  !/dom/base/test/file_bug945152.jar
 
 [test_bug403331.html]
 [test_bug1034143_mapped.html]
 run-if = os == 'linux'
 [test_bug1173171.html]
\ No newline at end of file

--- a/netwerk/cookie/test/unit_ipc/xpcshell.ini
+++ b/netwerk/cookie/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,10 @@
 [DEFAULT]
 head = 
 tail = 
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/netwerk/cookie/test/unit/test_parser_0001.js
+  !/netwerk/cookie/test/unit/test_parser_0019.js
 
 [test_ipc_parser_0001.js]
 [test_ipc_parser_0019.js]

--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@@ -10,16 +10,17 @@ support-files =
   web_packaged_app.sjs
   signed_web_packaged_app.sjs
   signed_web_packaged_app_random.sjs
   file_loadinfo_redirectchain.sjs
   redirect_idn.html^headers^
   redirect_idn.html
   empty.html
   redirect.sjs
+  !/dom/apps/tests/file_app.sjs
 
 [test_arraybufferinputstream.html]
 [test_partially_cached_content.html]
 [test_rel_preconnect.html]
 skip-if = e10s
 [test_uri_scheme.html]
 [test_user_agent_overrides.html]
 skip-if = e10s

--- a/netwerk/test/unit_ipc/xpcshell.ini
+++ b/netwerk/test/unit_ipc/xpcshell.ini
@@ -1,14 +1,63 @@
 [DEFAULT]
 head = head_channels_clone.js head_cc.js
 tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files = child_app_offline.js
-	child_app_offline_notifications.js
+  child_app_offline_notifications.js
+  !/netwerk/test/unit/test_XHR_redirects.js
+  !/netwerk/test/unit/test_bug248970_cookie.js
+  !/netwerk/test/unit/test_bug528292.js
+  !/netwerk/test/unit/test_cache_jar.js
+  !/netwerk/test/unit/test_cacheflags.js
+  !/netwerk/test/unit/test_channel_close.js
+  !/netwerk/test/unit/test_cookie_header.js
+  !/netwerk/test/unit/test_cookiejars.js
+  !/netwerk/test/unit/test_dns_cancel.js
+  !/netwerk/test/unit/test_dns_per_interface.js
+  !/netwerk/test/unit/test_dns_service.js
+  !/netwerk/test/unit/test_duplicate_headers.js
+  !/netwerk/test/unit/test_event_sink.js
+  !/netwerk/test/unit/test_getHost.js
+  !/netwerk/test/unit/test_head.js
+  !/netwerk/test/unit/test_headers.js
+  !/netwerk/test/unit/test_httpsuspend.js
+  !/netwerk/test/unit/test_post.js
+  !/netwerk/test/unit/test_predictor.js
+  !/netwerk/test/unit/test_progress.js
+  !/netwerk/test/unit/test_redirect-caching_canceled.js
+  !/netwerk/test/unit/test_redirect-caching_failure.js
+  !/netwerk/test/unit/test_redirect-caching_passing.js
+  !/netwerk/test/unit/test_redirect_canceled.js
+  !/netwerk/test/unit/test_redirect_different-protocol.js
+  !/netwerk/test/unit/test_redirect_failure.js
+  !/netwerk/test/unit/test_redirect_from_script.js
+  !/netwerk/test/unit/test_redirect_history.js
+  !/netwerk/test/unit/test_redirect_passing.js
+  !/netwerk/test/unit/test_reentrancy.js
+  !/netwerk/test/unit/test_reply_without_content_type.js
+  !/netwerk/test/unit/test_resumable_channel.js
+  !/netwerk/test/unit/test_simple.js
+  !/netwerk/test/unit/test_synthesized_response.js
+  !/netwerk/test/unit/test_xmlhttprequest.js
+  !/netwerk/test/unit/head_channels.js
+  !/netwerk/test/unit/head_cache2.js
+  !/netwerk/test/unit/data/image.png
+  !/netwerk/test/unit/data/system_root.lnk
+  !/netwerk/test/unit/data/test_psl.txt
+  !/netwerk/test/unit/data/test_readline1.txt
+  !/netwerk/test/unit/data/test_readline2.txt
+  !/netwerk/test/unit/data/test_readline3.txt
+  !/netwerk/test/unit/data/test_readline4.txt
+  !/netwerk/test/unit/data/test_readline5.txt
+  !/netwerk/test/unit/data/test_readline6.txt
+  !/netwerk/test/unit/data/test_readline7.txt
+  !/netwerk/test/unit/data/test_readline8.txt
+  !/netwerk/test/unit/data/signed_win.exe
 
 [test_bug528292_wrap.js]
 [test_bug248970_cookie_wrap.js]
 [test_cacheflags_wrap.js]
 [test_cache_jar_wrap.js]
 [test_channel_close_wrap.js]
 [test_cookie_header_wrap.js]
 [test_cookiejars_wrap.js]

--- a/services/crypto/tests/unit/xpcshell.ini
+++ b/services/crypto/tests/unit/xpcshell.ini
@@ -1,13 +1,15 @@
 [DEFAULT]
 head = head_helpers.js ../../../common/tests/unit/head_helpers.js
 tail =
 firefox-appdir = browser
 skip-if = toolkit == 'gonk'
+support-files =
+  !/services/common/tests/unit/head_helpers.js
 
 [test_load_modules.js]
 
 [test_crypto_crypt.js]
 [test_crypto_deriveKey.js]
 [test_crypto_random.js]
 # Bug 676977: test hangs consistently on Android
 skip-if = os == "android"

--- a/services/fxaccounts/tests/xpcshell/xpcshell.ini
+++ b/services/fxaccounts/tests/xpcshell/xpcshell.ini
@@ -1,12 +1,15 @@
 [DEFAULT]
 head = head.js ../../../common/tests/unit/head_helpers.js ../../../common/tests/unit/head_http.js
 tail =
 skip-if = toolkit == 'android'
+support-files =
+  !/services/common/tests/unit/head_helpers.js
+  !/services/common/tests/unit/head_http.js
 
 [test_accounts.js]
 [test_accounts_device_registration.js]
 skip-if = (appname == 'b2g' || appname == 'thunderbird')
 [test_client.js]
 skip-if = toolkit == 'gonk' # times out, bug 1073639
 [test_credentials.js]
 [test_loginmgr_storage.js]

--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -6,16 +6,18 @@ skip-if = toolkit == 'gonk'
 support-files =
   addon1-search.xml
   bootstrap1-search.xml
   fake_login_manager.js
   missing-sourceuri.xml
   missing-xpi-search.xml
   places_v10_from_v11.sqlite
   rewrite-search.xml
+  !/services/common/tests/unit/head_helpers.js
+  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 
 # The manifest is roughly ordered from low-level to high-level. When making
 # systemic sweeping changes, this makes it easier to identify errors closer to
 # the source.
 
 # Ensure we can import everything.
 [test_load_modules.js]
 

--- a/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
@@ -1,6 +1,9 @@
 [DEFAULT]
 head = 
 tail = 
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
+  !/toolkit/components/commandlines/test/unit/data/test_bug410156.url
 
 [test_bug410156.js]

--- a/toolkit/components/commandlines/test/unit_win/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit_win/xpcshell.ini
@@ -1,5 +1,8 @@
 [DEFAULT]
 head = 
-tail = 
+tail =
+support-files =
+  !/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
+  !/toolkit/components/commandlines/test/unit/data/test_bug410156.url
 
 [test_bug410156.js]

--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -1,15 +1,16 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
 skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/engine-rel-searchform.xml
   data/engine-suggestions.xml
+  !/toolkit/components/places/tests/favicons/favicon-normal16.png
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_functional.js]
 [test_autocomplete_on_value_removed_479089.js]

--- a/toolkit/components/satchel/test/browser/browser.ini
+++ b/toolkit/components/satchel/test/browser/browser.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
 support-files =
-  ../subtst_privbrowsing.html
+  !/toolkit/components/satchel/test/subtst_privbrowsing.html
 
 [browser_privbrowsing_perwindowpb.js]

--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -10,16 +10,17 @@ support-files =
   ../search/searchTest.jar
   dictionary.xpi
   experiment.xpi
   extension.xpi
   extension-2.xpi
   system.xpi
   restartless.xpi
   theme.xpi
+  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   experiment.xpi
   extension.xpi
   extension-2.xpi
   system.xpi
   restartless.xpi
   theme.xpi

--- a/toolkit/components/thumbnails/test/browser.ini
+++ b/toolkit/components/thumbnails/test/browser.ini
@@ -3,16 +3,17 @@ support-files =
   background_red.html
   background_red_redirect.sjs
   background_red_scroll.html
   head.js
   privacy_cache_control.sjs
   thumbnails_background.sjs
   thumbnails_crash_content_helper.js
   thumbnails_update.sjs
+  !/browser/base/content/test/general/authenticate.sjs
 
 [browser_thumbnails_bg_bad_url.js]
 [browser_thumbnails_bg_crash_during_capture.js]
 skip-if = buildapp == 'mulet' || !crashreporter || e10s # crashing the remote thumbnailer crashes the remote test tab
 [browser_thumbnails_bg_crash_while_idle.js]
 skip-if = buildapp == 'mulet' || !crashreporter
 [browser_thumbnails_bg_basic.js]
 [browser_thumbnails_bg_queueing.js]

--- a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,11 @@
 [DEFAULT]
 head =
 tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/toolkit/crashreporter/test/unit/crasher_subprocess_head.js
+  !/toolkit/crashreporter/test/unit/crasher_subprocess_tail.js
+  !/toolkit/crashreporter/test/unit/head_crashreporter.js
 
 [test_content_annotation.js]
 [test_content_exception_time_annotation.js]

--- a/toolkit/forgetaboutsite/test/unit/xpcshell.ini
+++ b/toolkit/forgetaboutsite/test/unit/xpcshell.ini
@@ -1,6 +1,8 @@
 [DEFAULT]
 head = head_forgetaboutsite.js ../../../../dom/push/test/xpcshell/head.js
 tail =
 skip-if = toolkit == 'android' || toolkit == 'gonk'
+support-files =
+  !/dom/push/test/xpcshell/head.js
 
 [test_removeDataFromDomain.js]

--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -31,16 +31,23 @@ support-files =
   browser_updatessl.rdf
   browser_updatessl.rdf^headers^
   browser_install.rdf
   browser_install.rdf^headers^
   browser_install.xml
   browser_install1_3.xpi
   browser_eula.xml
   browser_purchase.xml
+  !/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/restartless.xpi
+  !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
+  !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
+  !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
 
 [browser_addonrepository_performance.js]
 [browser_bug557956.js]
 [browser_bug616841.js]
 [browser_cancelCompatCheck.js]
 [browser_checkAddonCompatibility.js]
 [browser_gmpProvider.js]
 [browser_hotfix.js]