--- a/browser/base/content/test/chrome/chrome.ini
+++ b/browser/base/content/test/chrome/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_aboutCrashed.xul]

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

--- a/browser/components/places/tests/chrome/chrome.ini
+++ b/browser/components/places/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = head.js
 
 [test_0_bug510634.xul]
 [test_0_multiple_left_pane.xul]
 [test_bug427633_no_newfolder_if_noip.xul]
 [test_bug485100-change-case-loses-tag.xul]
 [test_bug549192.xul]
 [test_bug549491.xul]

--- a/browser/devtools/app-manager/test/chrome.ini
+++ b/browser/devtools/app-manager/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   hosted_app.manifest
   validator/*
 
 [test_connection_store.html]
 [test_device_store.html]
 [test_projects_store.html]
 [test_remain_connected.html]

--- a/browser/devtools/webide/test/chrome.ini
+++ b/browser/devtools/webide/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   app/index.html
   app/manifest.webapp
   app.zip
   addons/simulators.json
   addons/fxos_1_0_simulator-linux.xpi
   addons/fxos_1_0_simulator-linux64.xpi
   addons/fxos_1_0_simulator-win32.xpi

--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_disableScript.html
 
 [test_bug995943.xul]
 [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/docshell/test/chrome/chrome.ini
+++ b/docshell/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   662200a.html
   662200b.html
   662200c.html
   89419.html
   92598_nostore.html
   bug112564_window.xul
   bug113934_window.xul

--- a/dom/apps/tests/chrome.ini
+++ b/dom/apps/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   asmjs/*
   file_bug_945152.html
   file_bug_945152.sjs
 
 [test_apps_service.xul]
 [test_bug_945152.html]
 run-if = os == 'linux'

--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_url.jsm
   file_empty.html
 
 [test_anonymousContent_xul_window.xul]
 [test_bug715041.xul]
 [test_bug715041_removal.xul]
 [test_domrequesthelper.xul]

--- a/dom/base/test/chrome/chrome.ini
+++ b/dom/base/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   blockNoPlugins.xml
   blockPluginHard.xml
   cpows_child.js
   cpows_parent.xul
   file_bug391728.html
   file_bug391728_2.html
   file_bug549682.xul

--- a/dom/base/test/csp/chrome.ini
+++ b/dom/base/test/csp/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_csp_bug768029.html]
 [test_csp_bug773891.html]

--- a/dom/bindings/test/chrome.ini
+++ b/dom/bindings/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [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/canvas/test/chrome/chrome.ini
+++ b/dom/canvas/test/chrome/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = nonchrome_webgl_debug_renderer_info.html
 
 [test_webgl_debug_renderer_info.html]
 [test_drawWindow_widget_layers.html]
 support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js

--- a/dom/contacts/tests/chrome.ini
+++ b/dom/contacts/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_contacts_shutdown.xul]
 skip-if = os == "android"
 
 [test_contacts_upgrade.xul]
 skip-if = os == "android"
 
 [test_contacts_cache.xul]

--- a/dom/devicestorage/test/chrome.ini
+++ b/dom/devicestorage/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = buildapp == 'mulet'
 
 [test_app_permissions.html]
 [test_fs_app_permissions.html]

--- a/dom/encoding/test/chrome.ini
+++ b/dom/encoding/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = file_stringencoding.jsm
 
 [test_stringencoding.xul]

--- a/dom/events/test/chrome.ini
+++ b/dom/events/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   bug415498-doc1.html
   bug415498-doc2.html
   bug591249_iframe.xul
   bug602962.xul
   file_bug679494.html
   window_bug617528.xul
 

--- a/dom/html/test/chrome.ini
+++ b/dom/html/test/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_anchor_ping.html
 
 [test_allowMedia.html]
 [test_anchor_ping.html]

--- a/dom/html/test/forms/chrome.ini
+++ b/dom/html/test/forms/chrome.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   submit_invalid_file.sjs
 [test_autocompleteinfo.html]
 [test_submit_invalid_file.html]

--- a/dom/identity/tests/mochitest/chrome.ini
+++ b/dom/identity/tests/mochitest/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 support-files=
   file_browserid_rp_ok.html
   file_browserid_rp_noOnlogin.html
   file_declareAudience.html
   file_fxa_rp_ok.html
   file_fxa_rp_noOnready.html
   file_fxa_rp_noOnlogin.html

--- a/dom/indexedDB/test/chrome.ini
+++ b/dom/indexedDB/test/chrome.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = chromeHelpers.js
 
 [test_globalObjects_chrome.xul]
 [test_globalObjects_other.xul]

--- a/dom/ipc/tests/chrome.ini
+++ b/dom/ipc/tests/chrome.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   process_error.xul
   process_error_contentscript.js
 
 [test_process_error.xul]
 skip-if = buildapp == "mulet" || !crashreporter

--- a/dom/media/test/chrome.ini
+++ b/dom/media/test/chrome.ini
@@ -1,12 +1,11 @@
 #Media chrome tests
 
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   basic.vtt
   seek.webm
 
 [test_texttrackcue_chrome.html]
 skip-if = os=='mac' && debug # bug 1130751
 [test_texttrack_chrome.html]
 [test_texttracklist_chrome.html]

--- a/dom/media/webaudio/test/chrome.ini
+++ b/dom/media/webaudio/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_AudioNodeDevtoolsAPI.html]

--- a/dom/phonenumberutils/tests/chrome.ini
+++ b/dom/phonenumberutils/tests/chrome.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_phonenumber.xul]
 [test_phonenumberservice.xul]
 [test_phonenumberutils.xul]

--- a/dom/plugins/test/mochitest/chrome.ini
+++ b/dom/plugins/test/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = buildapp == "mulet"
 support-files =
   hang_test.js
   privatemode_perwindowpb.xul
   utils.js
 
 [test_bug479979.xul]
 [test_bug751809.html]
 [test_busy_hang.xul]

--- a/dom/promise/tests/chrome.ini
+++ b/dom/promise/tests/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_dependentPromises.html]
 [test_on_new_promise.html]
 [test_on_promise_settled.html]
 [test_on_promise_settled_duplicates.html]

--- a/dom/settings/tests/chrome.ini
+++ b/dom/settings/tests/chrome.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_settings_service.js]
 [test_settings_service.xul]
 skip-if= buildapp == 'mulet'
 [test_settings_service_callback.js]
 [test_settings_service_callback.xul]

--- a/dom/system/tests/chrome.ini
+++ b/dom/system/tests/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = worker_constants.js
 
 [test_constants.xul]

--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   489127.html
   DOMWindowCreated_chrome.xul
   DOMWindowCreated_content.html
   MozEnteredDomFullscreen_chrome.xul
   child_focus_frame.html
   file_DOM_element_instanceof.xul
   file_bug799299.xul

--- a/dom/tests/mochitest/general/chrome.ini
+++ b/dom/tests/mochitest/general/chrome.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_innerScreen.xul]
 [test_offsets.css]
 [test_offsets.js]
 [test_offsets.xul]
 skip-if = buildapp == 'mulet'

--- a/dom/tests/mochitest/localstorage/chrome.ini
+++ b/dom/tests/mochitest/localstorage/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   frame_clear_browser_data.html
   page_blank.html
 
 [test_app_uninstall.html]
 [test_clear_browser_data.html]
 [test_localStorageBasePrivateBrowsing_perwindowpb.html]
 [test_localStorageFromChrome.xhtml]

--- a/dom/tests/mochitest/sessionstorage/chrome.ini
+++ b/dom/tests/mochitest/sessionstorage/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_sessionStorageFromChrome.xhtml]

--- a/dom/tests/mochitest/webapps/chrome.ini
+++ b/dom/tests/mochitest/webapps/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   cross_origin.html
   head.js
   install_and_redirect_helper.xul
   apps/*
 
 [test_bug_765063.xul]
 [test_bug_771294.xul]

--- a/dom/tests/mochitest/whatwg/chrome.ini
+++ b/dom/tests/mochitest/whatwg/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_postMessage_chrome.html]

--- a/dom/workers/test/chrome.ini
+++ b/dom/workers/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   WorkerDebuggerManager_childWorker.js
   WorkerDebuggerManager_parentWorker.js
   WorkerDebugger_childWorker.js
   WorkerDebugger_parentWorker.js
   WorkerDebugger_sharedWorker.js
   WorkerTest.jsm
   WorkerTest_subworker.js

--- a/dom/xbl/test/chrome.ini
+++ b/dom/xbl/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_bug944407.xml
   file_bug950909.xml
   file_fieldScopeChain.xml
 
 [test_bug378518.xul]
 [test_bug398135.xul]
 [test_bug398492.xul]

--- a/dom/xul/templates/tests/chrome/chrome.ini
+++ b/dom/xul/templates/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = buildapp == 'mulet'
 support-files =
   animals.rdf
   animals.sqlite
   animals.xml
   bug441785-1.rdf
   bug441785-2.rdf
   templates_shared.js
 

--- a/dom/xul/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   398289-resource.xul
   bug497875-iframe.xul
   file_bug236853.rdf
   overlay1_bug335375.xul
   overlay2_bug335375.xul
   window_bug583948.xul
   window_bug757137.xul

--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_async_UpdateCurrentDictionary.html]
 [test_bug338427.html]
 [test_bug434998.xul]
 [test_bug678842.html]

--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = green.png
 
 [test_bug46555.html]
 [test_bug366682.html]
 [test_bug471319.html]
 [test_bug483651.html]
 [test_bug489202.xul]
 [test_bug490879.xul]

--- a/extensions/cookie/test/chrome.ini
+++ b/extensions/cookie/test/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = channel_utils.js
 
 [test_app_uninstall_cookies.html]
 [test_app_uninstall_permissions.html]
 [test_permissionmanager_app_isolation.html]

--- a/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_add_remove_dictionaries.xul]
 support-files =
   base/base_utf.dic
   base/base_utf.aff
   map/maputf.dic
   map/maputf.aff

--- a/extensions/universalchardet/tests/chrome.ini
+++ b/extensions/universalchardet/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   CharsetDetectionTests.js
   bug306272_text.html
   bug421271_text.html
   bug426271_text-euc-jp.html
   bug426271_text-utf-8.html
   bug431054_text.html
   bug547487_text.html

--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   animated-gif-finalframe.gif
   animated-gif.gif
   animated-gif2.gif
   animated1.gif
   animated2.gif
   animation.svg
   animationPolling.js

--- a/js/xpconnect/tests/chrome/chrome.ini
+++ b/js/xpconnect/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   bug503926.xul
   file_bug618176.xul
   file_bug996069.html
   file_bug1050049.xml
   file_discardSystemSource.html
   worker_discardSystemSource.js
   file_evalInSandbox.html

--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -17,56 +17,44 @@ support-files =
   printpreview_helper.xul
   transformed_scrolling_repaints_3_window.html
   file_bug1018265.xul
 
 [test_bug370436.html]
 [test_bug396367-1.html]
 [test_bug396367-2.html]
 [test_bug420499.xul]
-skip-if = buildapp == 'b2g'
 [test_bug458898.html]
 [test_bug495648.xul]
-skip-if = buildapp == 'b2g'
 [test_bug504311.xul]
-skip-if = buildapp == 'b2g'
 [test_bug514660.xul]
-skip-if = buildapp == 'b2g'
 [test_bug533845.xul]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+skip-if = buildapp == 'mulet'
 [test_bug551434.html]
 [test_bug708062.html]
 [test_bug812817.xul]
-skip-if = buildapp == 'b2g'
 [test_bug847890_paintFlashing.html]
 [test_bug1018265.xul]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+skip-if = buildapp == 'mulet'
 [test_bug1041200.xul]
-skip-if = buildapp == 'b2g'
 support-files=bug1041200_window.html
 [test_chrome_content_integration.xul]
-skip-if = buildapp == 'b2g'
 [test_chrome_over_plugin.xul]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+skip-if = buildapp == 'mulet'
 [test_default_background.xul]
-skip-if = buildapp == 'b2g'
 [test_dialog_with_positioning.html]
 [test_fixed_bg_scrolling_repaints.html]
 [test_leaf_layers_partition_browser_window.xul]
-skip-if = (!debug) || (toolkit == "cocoa") || (buildapp == 'b2g') # Disabled on Mac because of Bug 748219
+skip-if = (!debug) || (toolkit == "cocoa") # Disabled on Mac because of Bug 748219
 [test_no_clip_iframe.xul]
-skip-if = buildapp == 'b2g'
 [test_passpointerevents.html]
 [test_passpointerevents_dynamic.html]
 [test_prerendered_transforms.html]
 [test_printpreview.xul]
-skip-if = buildapp == 'b2g'
 [test_printpreview_bug396024.xul]
-skip-if = buildapp == 'b2g'
 [test_printpreview_bug482976.xul]
-skip-if = buildapp == 'b2g'
 [test_scroll_selection_into_view.html]
 support-files=scroll_selection_into_view_window.html
 [test_scrolling_repaints.html]
 [test_transformed_scrolling_repaints.html]
 [test_transformed_scrolling_repaints_2.html]
 [test_transformed_scrolling_repaints_3.html]
 [test_will_change.html]

--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   bug536567_iframe.html
   bug536567_subframe.html
   bug665540_window.xul
 
 [test_bug536567_perwindowpb.html]
 [test_bug665540.html]
 skip-if = buildapp == 'mulet'

--- a/layout/generic/test/chrome.ini
+++ b/layout/generic/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_bug514732_window.xul
   frame_selection_underline-ref.xhtml
   frame_selection_underline.css
   frame_selection_underline.xhtml
 
 [test_backspace_delete.xul]
 [test_bug348681.html]

--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = GentiumPlus-R.woff
 
 [test_bug467669.css]
 [test_bug467669.xul]
 [test_bug695639.css]
 [test_bug695639.xul]
 [test_bug708874.css]
 [test_bug708874.xul]

--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   bug535806-css.css
   bug535806-html.html
   bug535806-xul.xul
   hover_helper.html
 
 [test_addSheet.html]
 [test_additional_sheets.html]

--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   window_resizer.xul
   window_resizer_element.xul
 
 [test_bug159346.xul]
 skip-if = buildapp == 'mulet'
 [test_bug372685.xul]
 [test_bug381167.xhtml]

--- a/modules/libjar/test/chrome/chrome.ini
+++ b/modules/libjar/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   signed-added.zip
   signed-badca.zip
   signed-tampered.zip
   signed.zip
   unsigned.zip
 
 [test_bug386153.html]

--- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini
+++ b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_chrome.js]

--- a/security/manager/ssl/tests/mochitest/bugs/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/bugs/chrome.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug234856.html]
 [test_bug413909.html]
 skip-if = buildapp == 'mulet'
 [test_bug480619.html]
 [test_bug644006.html]
 [test_certificate_overrides.html]

--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = page_blank.html
 
 [test_sts_privatebrowsing_perwindowpb.html]

--- a/services/fxaccounts/tests/mochitest/chrome.ini
+++ b/services/fxaccounts/tests/mochitest/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files=
   file_invalidEmailCase.sjs
 
 [test_invalidEmailCase.html]
 

--- a/testing/mochitest/chrome/chrome.ini
+++ b/testing/mochitest/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = test-dir/test-file
 
 [test_sample.xul]
 [test_sanityChromeUtils.xul]
 skip-if = buildapp == 'mulet'
 [test_sanityPluginUtils.html]
 skip-if = buildapp == 'mulet'
 [test_sanityException.xul]

--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = buildapp == 'mulet'
 support-files =
   crash-dump-diff1.json
   crash-dump-diff2.json
   crash-dump-good.json
   memory-reports-bad.json
   memory-reports-diff1.json
   memory-reports-diff2.json
   memory-reports-good.json

--- a/toolkit/components/console/tests/chrome.ini
+++ b/toolkit/components/console/tests/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_hugeURIs.xul]

--- a/toolkit/components/ctypes/tests/chrome/chrome.ini
+++ b/toolkit/components/ctypes/tests/chrome/chrome.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   xpcshellTestHarnessAdaptor.js
   ctypes_worker.js
   ../unit/test_jsctypes.js
 
 [test_ctypes.xul]

--- a/toolkit/components/feeds/test/chrome.ini
+++ b/toolkit/components/feeds/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug675492.xul]

--- a/toolkit/components/formautofill/test/chrome/chrome.ini
+++ b/toolkit/components/formautofill/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 # The following files starting with ".." are installed in the current folder.
 support-files =
   ../head_common.js
   ../loader_common.js
   head.js
   test_infrastructure.js
   test_requestAutocomplete_cancel.js
   loader_parent.js

--- a/toolkit/components/osfile/tests/mochi/chrome.ini
+++ b/toolkit/components/osfile/tests/mochi/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   main_test_osfile_async.js
   worker_handler.js
   worker_test_osfile_comms.js
   worker_test_osfile_front.js
   worker_test_osfile_shared.js
   worker_test_osfile_unix.js
   worker_test_osfile_win.js

--- a/toolkit/components/passwordmgr/test/chrome.ini
+++ b/toolkit/components/passwordmgr/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   formsubmit.sjs
   notification_common.js
   pwmgr_common.js
 
 [test_privbrowsing_perwindowpb.html]
 # Too many intermittent failures (bug 919016)
 skip-if = true

--- a/toolkit/components/perf/chrome.ini
+++ b/toolkit/components/perf/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_pm.xul]

--- a/toolkit/components/places/tests/chrome/chrome.ini
+++ b/toolkit/components/places/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = history_post.sjs
 
 [test_303567.xul]
 [test_341972a.xul]
 [test_341972b.xul]
 [test_342484.xul]
 [test_371798.xul]
 [test_381357.xul]

--- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   allowlistAnnotatedFrame.html
   classifiedAnnotatedFrame.html
 
 [test_lookup_system_principal.html]
 [test_classified_annotations.html]
 [test_allowlisted_annotations.html]

--- a/toolkit/components/viewsource/test/chrome.ini
+++ b/toolkit/components/viewsource/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_428653.xul]

--- a/toolkit/components/workerloader/tests/chrome.ini
+++ b/toolkit/components/workerloader/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   moduleA-depends.js
   moduleB-dependency.js
   moduleC-circular.js
   moduleD-circular.js
   moduleE-throws-during-require.js
   moduleF-syntax-error.js
   moduleG-throws-later.js

--- a/toolkit/components/xulstore/tests/chrome/chrome.ini
+++ b/toolkit/components/xulstore/tests/chrome/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   window_persistence.xul
   animals.rdf
 
 [test_persistence.xul]

--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   ../widgets/popup_shared.js
   ../widgets/tree_shared.js
   RegisterUnregisterChrome.js
   bug263683_window.xul
   bug304188_window.xul
   bug331215_window.xul
   bug360437_window.xul

--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   tree_shared.js
   popup_shared.js
   window_menubar.xul
   seek_with_sound.ogg
 
 [test_contextmenu_nested.xul]
 skip-if = os == 'linux' # Bug 1116215

--- a/toolkit/devtools/server/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/server/tests/mochitest/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   director-helpers.js
   inspector-helpers.js
   inspector-styles-data.css
   inspector-styles-data.html
   inspector-traversal-data.html
   nonchrome_unsafeDereference.html
   inspector_getImageData.html

--- a/toolkit/devtools/webconsole/test/chrome.ini
+++ b/toolkit/devtools/webconsole/test/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   common.js
   data.json
   data.json^headers^
   network_requests_iframe.html
   sandboxed_iframe.html
 
 [test_basics.html]

--- a/toolkit/identity/tests/chrome/chrome.ini
+++ b/toolkit/identity/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   sandbox_content.html
   sandbox_content.sjs
   sandbox_content_alert.html
   sandbox_content_framed.html
   sandbox_content_perms.html
   sandbox_content_popup.html
   sandbox_content_redirect.html

--- a/toolkit/modules/tests/chrome/chrome.ini
+++ b/toolkit/modules/tests/chrome/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug544442_checkCert.xul]

--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   unknownContentType_dialog_layout_data.pif
   unknownContentType_dialog_layout_data.pif^headers^
   unknownContentType_dialog_layout_data.txt
   unknownContentType_dialog_layout_data.txt^headers^
   utils.js
 
 [test_backspace_key_removes.xul]

--- a/toolkit/mozapps/update/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/update/tests/chrome/chrome.ini
@@ -1,14 +1,14 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = buildapp == 'mulet'
 support-files =
   utils.js
   update.sjs
 generated-files =
   utils.js
   update.sjs
 
 ; mochitest-chrome tests must start with "test_" and are executed in sorted

--- a/toolkit/profile/test/chrome.ini
+++ b/toolkit/profile/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_create_profile.xul]

--- a/toolkit/themes/osx/mochitests/chrome.ini
+++ b/toolkit/themes/osx/mochitests/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug510426.xul]

--- a/toolkit/webapps/tests/chrome.ini
+++ b/toolkit/webapps/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == "mac" && os_version == "10.6" # see bug 993690
+skip-if = buildapp == 'mulet' || os == "mac" && os_version == "10.6" # see bug 993690
 support-files =
   head.js
   app.sjs
   data/*
 
 [test_custom_origin.xul]
 skip-if = asan
 [test_custom_origin_uninstall_install.xul]

--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   empty_window.xul
   utils.js
 
 [test_bug343416.xul]
 [test_bug429954.xul]
 support-files = window_bug429954.xul
 [test_bug444800.xul]

--- a/xpfe/appshell/test/chrome.ini
+++ b/xpfe/appshell/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_hiddenPrivateWindow.xul]