--- a/accessible/tests/mochitest/tree/Makefile.in
+++ b/accessible/tests/mochitest/tree/Makefile.in
@@ -8,17 +8,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = accessible/tree
 
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_A11Y_FILES =\
 		dockids.html \
-	$(warning test_applicationacc.xul temporarily disabled, see bug 561508) \
+		$(filter disabled-temporarily--bug-561508, test_applicationacc.xul) \
 		test_aria_globals.html \
 		test_aria_grid.html \
 		test_aria_imgmap.html \
 		test_aria_menu.html \
 		test_aria_presentation.html \
 		test_brokencontext.html \
 		test_button.xul \
 		test_canvas.html \

--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -299,17 +299,17 @@ else
 # TODO: Activate after carbon test plugin lands, bug 628651
 # 		browser_maconly_carbon_mismatch_plugin.js \
 
 endif
 
 ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
 _BROWSER_FILES += \
                 browser_private_browsing_window.js \
-                $(warning browser_save_link-perwindowpb.js disabled until bug 722850) \
+                $(filter disabled-until-bug-722850, browser_save_link-perwindowpb.js) \
                 $(NULL)
 else
 _BROWSER_FILES += \
                 browser_save_link.js \
                 $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/places/tests/browser/Makefile.in
+++ b/browser/components/places/tests/browser/Makefile.in
@@ -19,23 +19,23 @@ MOCHITEST_BROWSER_FILES = \
 	browser_423515.js \
 	browser_410196_paste_into_tags.js \
 	browser_sort_in_library.js \
 	browser_library_open_leak.js \
 	browser_library_panel_leak.js \
 	browser_library_search.js \
 	browser_history_sidebar_search.js \
 	browser_bookmarksProperties.js \
-	$(warning browser_forgetthissite_single.js temporarily disabled because of very frequent oranges, see bug 551540) \
+	$(filter disabled-for-very-frequent-oranges--bug-551540, browser_forgetthissite_single.js) \
 	browser_library_left_pane_commands.js \
 	browser_drag_bookmarks_on_toolbar.js \
 	browser_library_middleclick.js \
 	browser_library_views_liveupdate.js \
 	browser_views_liveupdate.js \
-	$(warning browser_sidebarpanels_click.js temporarily disabled cause it breaks the treeview, see bug 658744) \
+	$(filter temporarily-disabled-for-breaking-the-treeview--bug-658744, browser_sidebarpanels_click.js) \
 	sidebarpanels_click_test_page.html \
 	browser_library_infoBox.js \
 	browser_markPageAsFollowedLink.js \
 	framedPage.html \
 	frameLeft.html \
 	frameRight.html \
 	browser_toolbar_migration.js \
 	browser_library_batch_delete.js \

--- a/browser/components/privatebrowsing/test/browser/obsolete/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/obsolete/Makefile.in
@@ -18,25 +18,23 @@ MOCHITEST_BROWSER_FILES =  \
 		browser_privatebrowsing_findbar.js \
 		browser_privatebrowsing_forgetthissite.js \
 		browser_privatebrowsing_import.js \
 		browser_privatebrowsing_newwindow_stopcmd.js \
 		browser_privatebrowsing_pageinfo.js \
 		browser_privatebrowsing_popupmode.js \
 		browser_privatebrowsing_searchbar.js \
 		browser_privatebrowsing_sslsite_transition.js \
-		$(warning browser_privatebrowsing_transition.js disabled since it no longer makes sense) \
+		$(filter disabled-since-it-no-longer-makes-sense, browser_privatebrowsing_transition.js) \
+		$(filter disabled--bug-564934, browser_privatebrowsing_downloadmonitor.js) \
 		browser_privatebrowsing_urlbarundo.js \
 		browser_privatebrowsing_viewsource.js \
 		staller.sjs \
 		$(NULL)
 
-# Disabled until bug 564934 is fixed:
-#		browser_privatebrowsing_downloadmonitor.js \
-
 # Turn off private browsing tests that perma-timeout on Linux.
 ifneq (Linux,$(OS_ARCH))
 MOCHITEST_BROWSER_FILES += \
 		browser_privatebrowsing_beforeunload.js \
 		$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/sessionstore/test/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -127,36 +127,33 @@ MOCHITEST_BROWSER_FILES = \
 	browser_687710_2.js \
 	browser_694378.js \
 	browser_701377.js \
 	browser_705597.js \
 	browser_707862.js \
 	browser_739531.js \
 	browser_739531_sample.html \
 	browser_739805.js \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_empty.html) \
+	$(filter disabled-for-intermittent-failures--bug-766044, browser_459906_sample.html) \
+	$(filter disabled-for-intermittent-failures--bug-765389, browser_461743_sample.html) \
 	$(NULL)
 
-$(warning browser_459906.js is disabled for intermittent failures. Bug 766044)
-#	browser_459906_empty.html \
-#	browser_459906_sample.html \
-$(warning browser_461743.js is disabled for intermittent failures. Bug 765389)
-#	browser_461743_sample.html \
-
 # Disabled on Windows for frequent intermittent failures
 ifneq ($(OS_ARCH), WINNT)
 MOCHITEST_FILES += \
 	browser_464620_a.js \
 	browser_464620_a.html \
 	browser_464620_b.js \
 	browser_464620_b.html \
 	browser_464620_xd.html \
 	$(NULL)
 else
-$(warning browser_464620_a.js is disabled on Windows for intermittent failures. Bug 552424)
-$(warning browser_464620_b.js is disabled on Windows for intermittent failures. Bug 552424)
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_a.js)
+$(filter disabled-for-intermittent-failures-on-windows--bug-552424, browser_464620_b.js)
 endif
 
 ifneq ($(OS_ARCH),Darwin)
 MOCHITEST_BROWSER_FILES += \
 	browser_597071.js \
 	browser_625016.js \
 	$(NULL)
 endif

--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -63,17 +63,17 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_scripts-searching-04.js \
 	browser_dbg_scripts-searching-05.js \
 	browser_dbg_scripts-searching-06.js \
 	browser_dbg_scripts-searching-07.js \
 	browser_dbg_scripts-searching-08.js \
 	browser_dbg_scripts-searching-popup.js \
 	browser_dbg_pause-resume.js \
 	browser_dbg_update-editor-mode.js \
-	$(warning browser_dbg_select-line.js temporarily disabled due to oranges, see bug 726609) \
+	$(filter temporarily-disabled-due-to-oranges--bug-726609, browser_dbg_select-line.js) \
 	browser_dbg_clean-exit.js \
 	browser_dbg_bug723069_editor-breakpoints.js \
 	browser_dbg_bug723071_editor-breakpoints-pane.js \
 	browser_dbg_bug740825_conditional-breakpoints-01.js \
 	browser_dbg_bug740825_conditional-breakpoints-02.js \
 	browser_dbg_bug727429_watch-expressions-01.js \
 	browser_dbg_bug727429_watch-expressions-02.js \
 	browser_dbg_bug731394_editor-contextmenu.js \
@@ -83,21 +83,20 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_pause-exceptions.js \
 	browser_dbg_multiple-windows.js \
 	browser_dbg_menustatus.js \
 	browser_dbg_bfcache.js \
 	browser_dbg_breakpoint-new-script.js \
 	browser_dbg_bug737803_editor_actual_location.js \
 	browser_dbg_progress-listener-bug.js \
 	browser_dbg_chrome-debugging.js \
+	$(filter disabled-for-intermittent-failures--bug-753225, browser_dbg_createRemote.js) \
 	head.js \
 	$(NULL)
 
-$(warning browser_dbg_createRemote.js is disabled for intermittent failures. Bug 753225)
-
 MOCHITEST_BROWSER_PAGES = \
 	browser_dbg_tab1.html \
 	browser_dbg_tab2.html \
 	browser_dbg_debuggerstatement.html \
 	browser_dbg_stack.html \
 	browser_dbg_script-switching.html \
 	test-script-switching-01.js \
 	test-script-switching-02.js \

--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -18,17 +18,17 @@ include $(topsrcdir)/config/rules.mk
                  browser_styleeditor_cmd_edit.html \
                  browser_styleeditor_import.js \
                  browser_styleeditor_init.js \
                  browser_styleeditor_loading.js \
                  browser_styleeditor_new.js \
                  browser_styleeditor_passedinsheet.js \
                  browser_styleeditor_pretty.js \
                  browser_styleeditor_readonly.js \
-                 $(warning browser_styleeditor_reopen.js is disabled for intermittent failures. Bug 707891) \
+		 $(filter disabled-for-intermittent-failures--bug-707891, browser_styleeditor_reopen.js) \
                  browser_styleeditor_sv_keynav.js \
                  browser_styleeditor_sv_resize.js \
                  four.html \
                  head.js \
                  helpers.js \
                  media.html \
                  media-small.css \
                  minified.html \

--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -32,17 +32,17 @@ MOCHITEST_FILES = 	test_bug1682.html \
 		test_bug359657.html \
 		test_bug369370.html \
 		bug369370-popup.png \
 		test_bug380383.html \
 		test_bug391777.html \
 		test_bug402680.html \
 		test_bug403868.html \
 		test_bug403868.xhtml \
-		$(warning test_bug435128.html disabled because it takes 60 seconds) \
+		$(filter disabled-for-timeouts, test_bug435128.html) \
 		test_bug463104.html \
 		test_form-parsing.html \
 		test_viewport.html \
 		test_documentAll.html \
 		test_document-element-inserted.html \
 		test_bug445004.html \
 		bug445004-inner.js \
 		bug445004-outer-rel.html \

--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -125,38 +125,38 @@ MOCHITEST_FILES = \
 		test_bug463162.xhtml \
 		test_decoder_disable.html \
 		test_media_selection.html \
 		test_playback.html \
 		test_seekLies.html \
 		test_media_sniffer.html \
 		contentType.sjs \
 		test_streams_srcObject.html \
+		$(filter disabled-for-intermittent-failures--bug-608634, test_error_in_video_document.html) \
 		$(NULL)
 
-$(warning test_error_in_video_document.html is disabled for intermittent failures. Bug 608634)
-
 # Disabled on Windows for frequent intermittent failures
 ifneq ($(OS_ARCH), WINNT)
 MOCHITEST_FILES += \
 		test_streams_element_capture.html \
 		test_streams_element_capture_reset.html \
 		test_streams_element_capture_createObjectURL.html \
 		test_timeupdate_small_files.html \
 		$(NULL)
 else
-$(warning test_streams_element_capture{,_reset}.html is disabled on Windows for timeouts. Bug 752796)
-$(warning test_timeupdate_small_files.html is disabled on Windows for timeouts. Bug 786539)
+$(filter disabled-on-windows-for-timeouts--bug-752796, test_streams_element_capture.html)
+$(filter disabled-on-windows-for-timeouts--bug-752796, test_streams_element_capture_reset.html)
+$(filter disabled-on-windows-for-timeouts--bug-786539, test_timeupdate_small_files.html)
 endif
 
 # Don't run in suite
 ifndef MOZ_SUITE
 MOCHITEST_FILES += test_play_twice.html
 else
-$(warning test_play_twice.html is disabled pending investigation. Bug 598252)
+$(filter disabled-pending-investigation--bug-598252, test_play_twice.html)
 endif
 
 # These tests are disabled until we figure out random failures.
 # When these tests are fixed, we should also make them backend-independent.
 #		test_resume.html \
 # Bug 492821:
 #   test_videoDocumentTitle.html
 # Bug 493692:

--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -38,17 +38,17 @@ MOCHITEST_FILES = \
 		test_fragments.html \
 		fragments-helper.svg \
 		getCTM-helper.svg \
 		test_getCTM.html \
 		test_getElementById.xhtml \
 		test_getSubStringLength.xhtml \
 		getSubStringLength-helper.svg \
 		test_isSupported.xhtml \
-		$(warning test_lang.xhtml is disabled for intermittent failures. Bug 701060) \
+		$(filter disabled-for-intermittent-failures--bug-701060, test_lang.xhtml) \
 		test_nonAnimStrings.xhtml \
 		test_pathAnimInterpolation.xhtml \
 		test_pathSeg.xhtml \
 		test_pointAtLength.xhtml \
 		test_pointer-events.xhtml \
 		test_pointer-events-2.xhtml \
 		test_pointer-events-3.xhtml \
 		test_scientific.html \

--- a/dom/plugins/test/mochitest/Makefile.in
+++ b/dom/plugins/test/mochitest/Makefile.in
@@ -117,17 +117,17 @@ MOCHITEST_CHROME_FILES += \
   plugin_visibility_loader.html \
   $(NULL)
 endif
 endif
 
 ifdef MOZ_CRASHREPORTER
 MOCHITEST_FILES += \
   test_crashing.html \
-  $(warning test_crashing2.html disabled due to random orange; see bug 566049) \
+  $(filter disabled-for-random-orange--bug-566049, test_crashing2.html) \
   test_hanging.html \
   $(NULL)
 
 MOCHITEST_CHROME_FILES += \
   test_crash_notify.xul \
   test_crash_notify_no_report.xul \
   test_crash_submit.xul \
   test_hang_submit.xul \

--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -138,12 +138,12 @@ MOCHITEST_FILES	= \
 		test_sizetocontent_clamp.html \
 		$(NULL)
 
 ifneq (Linux,$(OS_ARCH))
 MOCHITEST_FILES += \
 		test_resize_move_windows.html \
 		$(NULL)
 else
-$(warning test_resize_move_windows.html is disabled on Linux for timeouts. Bug 677841)
+$(filter disabled-on-linux-for-timeouts--bug-677841, test_resize_move_windows.html)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -62,12 +62,12 @@ MOCHITEST_CHROME_FILES += \
 		$(NULL)
 endif
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_CHROME_FILES += \
 		test_MozEnteredDomFullscreen_event.xul \
 		$(NULL)
 else
-$(warning test_MozEnteredDomFullscreen_event.xul is disabled on OS X for intermittent failures. Bug 798848)
+$(filter disabled-on-os-x-for-intermittent-failures--bug-798848, test_MozEnteredDomFullscreen_event.xul)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/tests/mochitest/pointerlock/Makefile.in
+++ b/dom/tests/mochitest/pointerlock/Makefile.in
@@ -33,12 +33,12 @@ MOCHITEST_FILES	= \
 		iframe_differentDOM.html \
 		$(NULL)
 
 ifneq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_FILES += \
 		test_pointerlock-api.html \
 		$(NULL)
 else
-$(warning test_pointerlock-api.html is disabled on Linux for intermittent failures. Bug 788164)
+$(filter disabled-on-linux-for-intermittent-failures--bug-788164, test_pointerlock-api.html)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/tests/mochitest/whatwg/Makefile.in
+++ b/dom/tests/mochitest/whatwg/Makefile.in
@@ -42,20 +42,18 @@ MOCHITEST_FILES	= \
 		test_postMessage_jar.html \
 		postMessage.jar \
 		postMessage.jar^headers^ \
 		test_bug477323.html \
 		test_document_scripts.html \
 		test_postMessage_structured_clone.html \
 		postMessage_structured_clone_helper.js \
 		postMessage_structured_clone_helper.html \
+		$(filter disabled-for-intermittent-failures--bug-696306, test_bug500328.html) \
+		$(filter disabled-for-intermittent-failures--bug-696306, file_bug500328_1.html) \
+		$(filter disabled-for-intermittent-failures--bug-696306, file_bug500328_2.html) \
 		$(NULL)
 
-$(warning test_bug500328.html is disabled for intermittent failures. Bug 696306)
-#		test_bug500328.html \
-#		file_bug500328_1.html \
-#		file_bug500328_2.html \
-
 MOCHITEST_CHROME_FILES	= \
 		test_postMessage_chrome.html \
 		$(NULL)		
 
 include $(topsrcdir)/config/rules.mk

--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -32,17 +32,17 @@ MOCHITEST_FILES =	\
 		test_bug66619.html \
 		test_bug93077-1.html \
 		test_bug93077-2.html \
 		test_bug93077-3.html \
 		test_bug93077-4.html \
 		test_bug93077-5.html \
 		test_bug93077-6.html \
 		test_bug114649.html \
-		$(warning test_bug369950.html disabled due to random orange; see bug 492575) \
+		$(filter disabled-for-random-orange--bug-492575, test_bug369950.html) \
 		test_bug386575.xhtml \
 		test_bug388019.html \
 		test_bug394057.html \
 		test_bug399284.html \
 		test_bug399951.html \
 		test_bug404209.xhtml \
 		test_bug416896.html \
 		test_bug423523.html \
@@ -343,17 +343,17 @@ MOCHITEST_FILES += \
 		$(NULL)
 # THESE TESTS (ABOVE) DO NOT RUN ON WINDOWS
 endif
 
 # test_flush_on_paint.html fails frequently on Mac, bug 688128
 ifeq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 # THESE TESTS (BELOW) DO NOT RUN ON MAC
 MOCHITEST_FILES += \
-		$(warning test_flush_on_paint.html disabled due to random orange; see bug 539356) \
+		$(filter disabled-for-random-orange--bug-539356, test_flush_on_paint.html) \
 		$(NULL)
 # THESE TESTS (ABOVE) DO NOT RUN ON MAC
 endif
 
 MOCHITEST_BROWSER_FILES = \
 	browser_bug617076.js \
 	$(NULL)
 

--- a/layout/generic/test/Makefile.in
+++ b/layout/generic/test/Makefile.in
@@ -38,29 +38,29 @@ MOCHITEST_FILES = \
   test_bug392923.html \
   test_bug394173.html \
   test_bug394239.html \
   test_bug402380.html \
   test_bug404872.html \
   test_bug405178.html \
   test_bug416168.html \
   test_bug421436.html \
-  $(warning test_bug421839-1.html disabled because it calls finish twice which can cause timeouts) \
+  $(filter disabled-for-calling-finish-twice-which-can-cause-timeouts, test_bug421839-1.html) \
   test_bug421839-2.html \
   bug421839-2-page.html \
   test_bug424627.html \
   test_bug438840.html \
   test_bug448860.html \
   test_bug460532.html \
   test_bug468167.html \
   test_bug470212.html \
-  $(warning test_bug488417.html temporarily disabled - see bug 489560) \
+  $(filter disabled-temporarily--bug-489560, test_bug488417.html) \
   test_bug496275.html \
   test_bug503813.html \
-  $(warning test_bug507902.html temporarily disabled - see bug 510001) \
+  $(filter disabled-temporarily--bug-510001, test_bug507902.html) \
   test_bug514732.html \
   test_bug527306.html \
   test_bug579767.html \
   test_bug597333.html \
   test_bug666225.html \
   test_image_selection.html \
   test_image_selection_2.html \
   test_invalidate_during_plugin_paint.html \

--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -57,17 +57,17 @@ MOCHITEST_FILES =	test_acid3_test46.html
 		test_bug382027.html \
 		test_bug383075.html \
 		test_bug387615.html \
 		test_bug389464.html \
 		test_bug391034.html \
 		test_bug391221.html \
 		test_bug397427.html \
 		test_bug399349.html \
-		$(warning test_bug401046.html is disabled for intermittent failures. Bug 701060) \
+		$(filter disabled-for-intermittent-failures--bug-701060, test_bug401046.html) \
 		test_bug405818.html \
 		test_bug412901.html \
 		test_bug437915.html \
 		test_bug450191.html \
 		test_bug453896_deck.html \
 		test_bug470769.html \
 		test_bug499655.html \
 		test_bug499655.xhtml \

--- a/mobile/xul/chrome/tests/Makefile.in
+++ b/mobile/xul/chrome/tests/Makefile.in
@@ -20,57 +20,57 @@ MOCHITEST_BROWSER_FILES = \
   remote_focus.js \
   remote_forms.js \
   remote_formsZoom.js \
   remote_vkb.js \
   browser_addons.js \
   browser_addons_locales.js \
   browser_appmenu.js \
   browser_autocompletesearch.js \
-  $(info browser_awesomescreen.js is disabled because the localepicker is disabled (bug 693524)) \
+  $(filter disabled-because-localepicker-is-disabled--bug-693524, browser_awesomescreen.js) \
   browser_blank_01.html \
   browser_blank_02.html \
   browser_blank_03.html \
   browser_bookmarks.js \
   browser_contacts.js \
   browser_dragger.js \
   browser_escape.js \
   browser_find.js \
   browser_focus.html \
   browser_focus.js \
   browser_forms.html \
-  $(warning browser_forms.js disabled due to failures) \
+  $(filter disabled-for-failures, browser_forms.js) \
   browser_formsZoom.html \
-  $(warning browser_formsZoom.js disabled due to failures) \
-  $(info browser_history.js is disabled because it is random orange on XUL fennec (bug 700537)) \
-  $(info browser_localepicker.js is disabled because the localepicker is disabled (bug 694047)) \
+  $(filter disabled-for-failures, browser_formsZoom.js) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-700537, browser_history.js) \
+  $(filter disabled-because-localepicker-is-disabled--bug-694047, browser_localepicker.js) \
   browser_localepicker_escape.js \
   browser_mainui.js \
   browser_preferences_text.js \
   browser_preferences_fulltoggle.js \
   browser_rect.js \
-  $(info browser_rememberPassword.js is disabled because it is random orange on XUL fennec (bug 698387)) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-698387, browser_rememberPassword.js) \
   browser_scroll.js \
   browser_scroll.html \
   browser_scrollbar.js \
   browser_select.html \
   browser_select.js \
   browser_sessionstore.js \
-  $(info browser_tabs.js is disabled because it is random orange on XUL fennec (bug 700537)) \
-  $(info browser_tapping.js is disabled because it is random orange on XUL fennec (bug 698387)) \
-  $(info browser_tap_content.html is disabled because it is random orange on XUL fennec (bug 698387)) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-700537, browser_tabs.js) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-698387, browser_tapping.js) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-698387, browser_tap_content.html) \
   browser_tapping_edit.js \
   browser_tap_contentedit.html \
   browser_test.js \
   browser_vkb.js \
-  $(warning browser_viewport.js disabled due to failures) \
+  $(filter disabled-for-failures, browser_viewport.js) \
   browser_viewport.sjs \
   browser_scrollbar.sjs \
   browser_title.sjs \
-  $(info browser_thumbnails.js is disabled because it is random orange on XUL fennec (bug 700537)) \
+  $(filter disabled-for-random-orange-on-XUL-fennec--bug-700537, browser_thumbnails.js) \
   browser_install.xml \
   browser_upgrade.rdf\
   browser_localerepository.js \
   browser_localerepository_pref.js \
   browser_localerepository_buildid.js \
   locales_list.sjs \
   mock_autocomplete.json\
   $(NULL)

--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -169,14 +169,14 @@ MOCHITEST_CHROME_FILES += test_panel_foc
                window_panel_focus.xul \
                test_chromemargin.xul \
                window_chromemargin.xul
 else
 MOCHITEST_CHROME_FILES += test_autocomplete_mac_caret.xul
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-MOCHITEST_CHROME_FILES += 	$(warning test_cursorsnap.xul temporarily disabled) \
+MOCHITEST_CHROME_FILES += $(filter disabled-temporarily, test_cursorsnap.xul) \
 		window_cursorsnap_dialog.xul \
 		window_cursorsnap_wizard.xul
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/mozapps/downloads/tests/chrome/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/chrome/Makefile.in
@@ -47,13 +47,13 @@ ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOO
 MOCHITEST_CHROME_FILES += \
   test_backspace_key_removes.xul \
   $(NULL)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 MOCHITEST_CHROME_FILES += \
   test_taskbarprogress_downloadstates.xul \
-  $(warning test_taskbarprogress_service.xul disabled due to very frequent orange, see bug 630567) \
+  $(filter disabled-for-very-frequent-orange--bug-630567, test_taskbarprogress_service.xul) \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -10,17 +10,17 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_plugins
 relativesrcdir  = @relativesrcdir@
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
 _BROWSER_FILES = \
-  $(warning browser_bug435788.js has been disabled due to leaks - see bug 751100) \
+  $(filter disabled-for-leaks--bug-751100, browser_bug435788.js) \
   pfs_bug435788_1.rdf \
   pfs_bug435788_2.rdf \
   GoodExtension.xpi \
   BadExtension.xpi \
   $(NULL)
 
 CPPSRCS = \
   GoodPlugin.cpp \

--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -30,17 +30,17 @@ endif
 
 CPP_UNIT_TESTS += TestAppShellSteadyState.cpp
 
 MOCHITEST_CHROME_FILES =	test_bug343416.xul \
 		test_bug429954.xul \
 		window_bug429954.xul \
 		test_bug444800.xul \
 		test_bug462106.xul \
-		$(warning test_bug478536.xul is disabled for intermittent timeouts. Bug 561929) \
+		$(filter disabled-for-intermittent-timeouts--bug-561929, test_bug478536.xul) \
 		window_bug478536.xul \
 		test_bug517396.xul \
 		test_bug538242.xul \
 		window_bug538242.xul \
 		test_bug593307.xul \
 		window_bug593307_offscreen.xul \
 		window_bug593307_centerscreen.xul \
 		test_keycodes.xul \