--- a/browser/base/content/test/general/mochitest.ini
+++ b/browser/base/content/test/general/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   audio.ogg
   bug364677-data.xml
   bug364677-data.xml^headers^
   bug395533-data.txt
   contextmenu_common.js
   ctxmenu-image.png
   feed_discovery.html

--- a/browser/components/feeds/test/mochitest.ini
+++ b/browser/components/feeds/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug368464-data.xml
   bug408328-data.xml
   bug436801-data.xml
   bug494328-data.xml
   bug589543-data.xml
   valid-feed.xml
   valid-unsniffable-feed.xml

--- a/editor/composer/test/mochitest.ini
+++ b/editor/composer/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = bug678842_subframe.html
 
 [test_bug348497.html]
 [test_bug384147.html]
 [test_bug389350.html]
 skip-if = toolkit == 'android'
 [test_bug519928.html]
 [test_bug738440.html]

--- a/editor/libeditor/base/tests/mochitest.ini
+++ b/editor/libeditor/base/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = file_bug586662.html
 
 [test_bug408231.html]
 skip-if = toolkit == 'android'
 [test_bug502673.html]
 [test_bug514156.html]
 [test_bug567213.html]
 [test_bug586662.html]

--- a/editor/libeditor/html/tests/mochitest.ini
+++ b/editor/libeditor/html/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   data/cfhtml-chromium.txt
   data/cfhtml-firefox.txt
   data/cfhtml-ie.txt
   data/cfhtml-ooo.txt
   data/cfhtml-nocontext.txt
   file_bug549262.html
   file_bug674770-1.html

--- a/editor/libeditor/text/tests/mochitest.ini
+++ b/editor/libeditor/text/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug318065.html]
 [test_bug471722.html]
 [test_bug527935.html]
 skip-if = toolkit == 'android'
 [test_bug590554.html]
 [test_bug596001.html]
 [test_bug596333.html]

--- a/embedding/test/mochitest.ini
+++ b/embedding/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   320x240.ogv
   bug293834_form.html
   bug449141_page.html
 
 [test_bug293834.html]
 [test_bug449141.html]
 skip-if = toolkit == 'android'

--- a/extensions/cookie/test/mochitest.ini
+++ b/extensions/cookie/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   beltzner.jpg
   beltzner.jpg^headers^
   damonbowling.jpg
   damonbowling.jpg^headers^
   file_domain_hierarchy_inner.html
   file_domain_hierarchy_inner_inner.html
   file_domain_hierarchy_inner_inner_inner.html

--- a/gfx/tests/mochitest.ini
+++ b/gfx/tests/mochitest.ini
@@ -1,3 +1,5 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [mochitest/test_bug509244.html]
 [mochitest/test_bug513439.html]
 [mochitest/test_acceleration.html]

--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   INT32_MIN.bmp
   animated-gif2.gif
   animated-gif_trailing-garbage.gif
   animationPolling.js
   bad.jpg
   big.png
   blue.png

--- a/intl/uconv/tests/mochitest.ini
+++ b/intl/uconv/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug335816.html]
 [test_bug843434.html]
 [test_bug959058-1.html]
 [test_bug959058-2.html]
 [test_long_doc.html]
 skip-if = toolkit == 'android' #bug 775227
 [test_singlebyte_overconsumption.html]

--- a/js/jsd/test/mochitest.ini
+++ b/js/jsd/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug507448.js
   jsd-test.js
   test-bug617870-callhooks.js
   test-bug638178-execlines.js
 
 [test_bug507448.html]
 skip-if = toolkit == 'android' #TIMED_OUT

--- a/js/xpconnect/tests/mochitest/mochitest.ini
+++ b/js/xpconnect/tests/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug500931_helper.html
   bug504877_helper.html
   bug571849_helper.html
   bug589028_helper.html
   bug92773_helper.html
   chrome_wrappers_helper.html
   file1_bug629227.html

--- a/modules/libjar/test/mochitest/mochitest.ini
+++ b/modules/libjar/test/mochitest/mochitest.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug403331.zip
   bug403331.zip^headers^
   openredirect.sjs
 
 [test_bug403331.html]

--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   partial_content.sjs
   user_agent.sjs
   user_agent_update.sjs
 
 [test_partially_cached_content.html]
 [test_uri_scheme.html]
 [test_user_agent_overrides.html]

--- a/parser/htmlparser/tests/mochitest/mochitest.ini
+++ b/parser/htmlparser/tests/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug_502091_iframe.html
   file_bug102699.sjs
   file_bug534293-slow.sjs
   file_bug534293.sjs
   file_bug543062.sjs
   file_bug594730-1.html
   file_bug594730-2.html

--- a/security/manager/ssl/tests/mochitest/bugs/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/bugs/mochitest.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_bug480509.html]
 skip-if = toolkit == 'android'
 [test_bug483440.html]
 skip-if = toolkit == 'android'
 [test_bug484111.html]
 skip-if = toolkit == 'android'

--- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = toolkit == 'android' #TIMED_OUT
+skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 support-files =
   alloworigin.sjs
   backward.html
   bug329869.js
   bug383369step2.html
   bug383369step3.html
   download.auto
   download.auto^headers^

--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   nosts_bootstrap.html
   nosts_bootstrap.html^headers^
   plain_bootstrap.html
   plain_bootstrap.html^headers^
   subdom_bootstrap.html
   subdom_bootstrap.html^headers^
   verify.sjs

--- a/testing/mochitest/MochiKit/mochitest.ini
+++ b/testing/mochitest/MochiKit/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   /MochiKit/Async.js
   /MochiKit/Base.js
   /MochiKit/Color.js
   /MochiKit/Controls.js
   /MochiKit/DateTime.js
   /MochiKit/DOM.js
   /MochiKit/DragAndDrop.js

--- a/testing/mochitest/b2g-debug.json
+++ b/testing/mochitest/b2g-debug.json
@@ -1,13 +1,6 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }
 }

--- a/testing/mochitest/b2g-desktop.json
+++ b/testing/mochitest/b2g-desktop.json
@@ -1,13 +1,6 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }
 }

--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -1,13 +1,6 @@
 {
 "runtests": {
-    "b2g": "",
-    "caps": "",
-    "content": "",
-    "docshell": "",
-    "dom": "",
-    "layout": "",
-    "toolkit/devtools/apps": ""
   },
 "excludetests": {
   }
 }

--- a/testing/mochitest/dynamic/mochitest.ini
+++ b/testing/mochitest/dynamic/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = /dynamic/getMyDirectory.sjs

--- a/testing/mochitest/static/mochitest.ini
+++ b/testing/mochitest/static/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = /static/harness.css
\ No newline at end of file

--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -1,8 +1,10 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_sanity.html]
 [test_sanityException.html]
 [test_sanityException2.html]
 [test_sanityWindowSnapshot.html]
 [test_SpecialPowersExtension.html]
 [test_SpecialPowersExtension2.html]
 support-files = file_SpecialPowersFrame1.html
 [test_SpecialPowersPushPermissions.html]

--- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini
+++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   Async.js
   Base.js
   Color.js
   DateTime.js
   DOM.js
   DragAndDrop.js
   Format.js

--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   SimpleTest/test.css
   test_Base.js
   test_Color.js
   test_DateTime.js
   test_DragAndDrop.js
   test_Format.js
   test_Iter.js

--- a/toolkit/components/alerts/test/mochitest.ini
+++ b/toolkit/components/alerts/test/mochitest.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!
 [test_alerts.html]
 skip-if = toolkit == 'android'
 [test_alerts_noobserve.html]
 [test_multiple_alerts.html]

--- a/toolkit/components/microformats/tests/mochitest.ini
+++ b/toolkit/components/microformats/tests/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = geo.html
 
 [test_Microformats.html]
 [test_Microformats_add.html]
 [test_Microformats_adr.html]
 [test_Microformats_count.html]
 [test_Microformats_geo.html]
 [test_Microformats_getters.html]

--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   authenticate.sjs
   formsubmit.sjs
   notification_common.js
   privbrowsing_perwindowpb_iframe.html
   prompt_common.js
   pwmgr_common.js
   subtst_master_pass.html

--- a/toolkit/components/places/tests/browser/mochitest.ini
+++ b/toolkit/components/places/tests/browser/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   399606-httprefresh.html
   399606-location.reload.html
   399606-location.replace.html
   399606-window.location.href.html
   399606-window.location.html
   399606-history.go-0.html
   redirect.sjs

--- a/toolkit/components/places/tests/chrome/mochitest.ini
+++ b/toolkit/components/places/tests/chrome/mochitest.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   sample_feed.atom
   bad_links.atom
   rss_as_html.rss
   rss_as_html.rss^headers^
   link-less-items.rss
   link-less-items-no-site-uri.rss

--- a/toolkit/components/places/tests/mochitest.ini
+++ b/toolkit/components/places/tests/mochitest.ini
@@ -1,2 +1,3 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files = bug94514-postpage.html

--- a/toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini
+++ b/toolkit/components/places/tests/mochitest/bug_411966/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   redirect.js
   TypedPage.htm
   ClickedPage.htm
   ClickedPage.htm^headers^
   TempRedirectPage.htm
   TempRedirectPage.htm^headers^
   PermRedirectPage.htm

--- a/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini
+++ b/toolkit/components/places/tests/mochitest/bug_461710/mochitest.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   visited_page.html
   link_page.html
   link_page-2.html
   link_page-3.html
   iframe.html

--- a/toolkit/components/prompts/test/mochitest.ini
+++ b/toolkit/components/prompts/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   bug619644_inner.html
   bug625187_iframe.html
   prompt_common.js
 
 [test_bug619644.html]
 [test_bug620145.html]
 skip-if = toolkit == 'android' #TIMED_OUT

--- a/toolkit/components/satchel/test/mochitest.ini
+++ b/toolkit/components/satchel/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   satchel_common.js
   subtst_form_submission_1.html
   subtst_privbrowsing.html
 
 [test_bug_511615.html]
 skip-if = toolkit == 'android'
 [test_bug_787624.html]

--- a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   classifierFrame.html
   cleanWorker.js
   evil.css
   evil.js
   evilWorker.js
   import.css
   workerFrame.html

--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   ../../../../content/media/test/audio.wav
   ../../../../browser/base/content/test/general/audio.ogg
   ../../../../content/media/test/seek_with_sound.ogg
   head.js
   tree_shared.js
   videocontrols_direction-1-ref.html
   videocontrols_direction-1a.html

--- a/toolkit/modules/tests/mochitest/mochitest.ini
+++ b/toolkit/modules/tests/mochitest/mochitest.ini
@@ -1,1 +1,3 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_spatial_navigation.html]

--- a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   file_empty.html
 
 [test_bug609794.html]
 [test_bug887098.html]

--- a/toolkit/xre/test/mochitest.ini
+++ b/toolkit/xre/test/mochitest.ini
@@ -1,3 +1,4 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 
 [test_fpuhandler.html]

--- a/uriloader/exthandler/tests/mochitest/mochitest.ini
+++ b/uriloader/exthandler/tests/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   handlerApp.xhtml
   handlerApps.js
   unsafeBidiFileName.sjs
 
 [test_badMimeType.html]
 [test_handlerApps.xhtml]
 skip-if = toolkit == 'android'

--- a/webapprt/test/content/mochitest.ini
+++ b/webapprt/test/content/mochitest.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
+skip-if = buildapp == 'b2g'
 support-files =
   test.webapp
   test.webapp^headers^
 
 [webapprt_sample.html]
 [webapprt_indexeddb.html]

--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@@ -1,8 +1,10 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
 [test_assign_event_data.html]
 skip-if = toolkit == "cocoa" # Bug 933303
 [test_bug565392.html]
 skip-if = toolkit != "windows"
 [test_picker_no_crash.html]
 skip-if = toolkit != "windows"
 support-files = window_picker_no_crash_child.html
 [test_plugin_scroll_invalidation.html]