--- a/devtools/client/animationinspector/test/unit/xpcshell.ini
+++ b/devtools/client/animationinspector/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_findOptimalTimeInterval.js]
 [test_formatStopwatchTime.js]
 [test_getCssPropertyName.js]
 [test_timeScale.js]
 [test_timeScale_dimensions.js]

--- a/devtools/client/memory/test/unit/xpcshell.ini
+++ b/devtools/client/memory/test/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools devtools-memory
 head = head.js ../../../framework/test/shared-redux-head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_action_diffing_01.js]
 [test_action_diffing_02.js]
 [test_action_diffing_03.js]
 [test_action_diffing_04.js]
 [test_action_diffing_05.js]
 [test_action-clear-snapshots_01.js]
 [test_action-clear-snapshots_02.js]

--- a/devtools/client/performance/test/unit/xpcshell.ini
+++ b/devtools/client/performance/test/unit/xpcshell.ini
@@ -1,21 +1,21 @@
 [DEFAULT]
 tags = devtools
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_frame-utils-01.js]
 [test_frame-utils-02.js]
 [test_marker-blueprint.js]
 [test_marker-utils.js]
 [test_profiler-categories.js]
-[test_jit-graph-data.js] 
+[test_jit-graph-data.js]
 [test_jit-model-01.js]
 [test_jit-model-02.js]
 [test_perf-utils-allocations-to-samples.js]
 [test_tree-model-01.js]
 [test_tree-model-02.js]
 [test_tree-model-03.js]
 [test_tree-model-04.js]
 [test_tree-model-05.js]

--- a/devtools/client/shared/redux/middleware/test/xpcshell.ini
+++ b/devtools/client/shared/redux/middleware/test/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 tags = devtools
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_middleware-task-01.js]
 [test_middleware-task-02.js]
 [test_middleware-task-03.js]

--- a/devtools/client/shared/test/unit/xpcshell.ini
+++ b/devtools/client/shared/test/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 support-files =
   ../helper_color_data.js
 
 [test_advanceValidate.js]
 [test_attribute-parsing-01.js]
 [test_attribute-parsing-02.js]
 [test_bezierCanvas.js]

--- a/devtools/client/webconsole/net/test/unit/xpcshell.ini
+++ b/devtools/client/webconsole/net/test/unit/xpcshell.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_json-utils.js]
 [test_net-utils.js]

--- a/devtools/client/webide/test/chrome.ini
+++ b/devtools/client/webide/test/chrome.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 tags = devtools
-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
@@ -42,17 +41,17 @@ support-files =
   head.js
   hosted_app.manifest
   templates.json
   ../../shared/test/browser_devices.json
   validator/*
 
 [test_basic.html]
 [test_newapp.html]
-skip-if = buildapp == 'b2g' || (os == "win" && os_version == "10.0") # Bug 1197053
+skip-if = (os == "win" && os_version == "10.0") # Bug 1197053
 [test_import.html]
 [test_duplicate_import.html]
 [test_runtime.html]
 [test_manifestUpdate.html]
 [test_addons.html]
 skip-if = true # Bug 1201392 - Update add-ons after migration
 [test_device_runtime.html]
 [test_device_permissions.html]

--- a/devtools/server/tests/browser/browser.ini
+++ b/devtools/server/tests/browser/browser.ini
@@ -81,20 +81,17 @@ skip-if = e10s # Bug 1183605 - devtools/
 #[browser_perf-front-profiler-05.js] bug 1077464
 #[browser_perf-front-profiler-06.js]
 [browser_storage_dynamic_windows.js]
 [browser_storage_listings.js]
 [browser_storage_updates.js]
 [browser_stylesheets_getTextEmpty.js]
 [browser_stylesheets_nested-iframes.js]
 [browser_timeline.js]
-skip-if = buildapp == 'mulet'
 [browser_timeline_actors.js]
-skip-if = buildapp == 'mulet'
 [browser_timeline_iframes.js]
-skip-if = buildapp == 'mulet'
 [browser_directorscript_actors_exports.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_directorscript_actors_error_events.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_directorscript_actors.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_register_actor.js]

--- a/devtools/server/tests/mochitest/chrome.ini
+++ b/devtools/server/tests/mochitest/chrome.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 tags = devtools
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   animation-data.html
   Debugger.Source.prototype.element.js
   Debugger.Source.prototype.element-2.js
   Debugger.Source.prototype.element.html
   director-helpers.js
   hello-actor.js
   inspector_css-properties.html
@@ -21,59 +21,45 @@ support-files =
   memory-helpers.js
   nonchrome_unsafeDereference.html
   small-image.gif
   setup-in-child.js
   setup-in-parent.js
 
 [test_animation_actor-lifetime.html]
 [test_connection-manager.html]
-skip-if = buildapp == 'mulet'
 [test_connectToChild.html]
-skip-if = buildapp == 'mulet'
 [test_css-logic.html]
 [test_css-logic-media-queries.html]
 [test_css-logic-specificity.html]
 [test_css-properties_01.html]
 [test_css-properties_02.html]
 [test_Debugger.Source.prototype.introductionScript.html]
 [test_Debugger.Source.prototype.introductionType.html]
 [test_Debugger.Source.prototype.element.html]
 [test_Debugger.Script.prototype.global.html]
 [test_device.html]
-skip-if = buildapp == 'mulet'
 [test_director.html]
 [test_director_connectToChild.html]
-skip-if = buildapp == 'mulet'
 [test_executeInGlobal-outerized_this.html]
 [test_framerate_01.html]
-skip-if = buildapp == 'mulet'
 [test_framerate_02.html]
-skip-if = buildapp == 'mulet'
 [test_framerate_03.html]
-skip-if = buildapp == 'mulet'
 [test_framerate_04.html]
-skip-if = buildapp == 'mulet'
 [test_framerate_05.html]
-skip-if = buildapp == 'mulet'
 [test_framerate_06.html]
-skip-if = buildapp == 'mulet'
 [test_getProcess.html]
-skip-if = buildapp == 'mulet'
 [test_inspector-anonymous.html]
 [test_inspector-changeattrs.html]
 [test_inspector-changevalue.html]
 [test_inspector-dead-nodes.html]
 [test_inspector-duplicate-node.html]
 [test_inspector_getImageData.html]
-skip-if = buildapp == 'mulet'
 [test_inspector_getImageDataFromURL.html]
-skip-if = buildapp == 'mulet'
 [test_inspector_getImageData-wait-for-load.html]
-skip-if = buildapp == 'mulet'
 [test_inspector_getNodeFromActor.html]
 [test_inspector-hide.html]
 [test_inspector-insert.html]
 [test_inspector-mutations-attr.html]
 [test_inspector-mutations-events.html]
 [test_inspector-mutations-childlist.html]
 [test_inspector-mutations-frameload.html]
 [test_inspector-mutations-value.html]

--- a/devtools/server/tests/unit/xpcshell.ini
+++ b/devtools/server/tests/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 support-files =
   babel_and_browserify_script_with_source_map.js
   source-map-data/sourcemapped.coffee
   source-map-data/sourcemapped.map
   post_init_global_actors.js
   post_init_tab_actors.js
   pre_init_global_actors.js
@@ -102,89 +102,56 @@ support-files =
 [test_protocol_children.js]
 [test_protocol_formtype.js]
 [test_protocol_longstring.js]
 [test_protocol_simple.js]
 [test_protocol_stack.js]
 [test_protocol_unregister.js]
 [test_breakpoint-01.js]
 [test_register_actor.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-02.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-03.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-04.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-05.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-06.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-07.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-08.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-09.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-10.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-11.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-12.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-13.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-14.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-15.js]
 [test_breakpoint-16.js]
 [test_breakpoint-17.js]
 [test_breakpoint-18.js]
 [test_breakpoint-19.js]
 skip-if = true
 reason = bug 1104838
 [test_breakpoint-20.js]
 [test_breakpoint-21.js]
 [test_conditional_breakpoint-01.js]
 [test_conditional_breakpoint-02.js]
 [test_conditional_breakpoint-03.js]
 [test_eventlooplag_actor.js]
-skip-if = toolkit != "gonk"
+skip-if = true
+reason = only ran on B2G
 [test_listsources-01.js]
 [test_listsources-02.js]
 [test_listsources-03.js]
 [test_listsources-04.js]
 [test_new_source-01.js]
 [test_sourcemaps-01.js]
 [test_sourcemaps-02.js]
 [test_sourcemaps-03.js]
 [test_sourcemaps-04.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_sourcemaps-05.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_sourcemaps-06.js]
 [test_sourcemaps-07.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_sourcemaps-08.js]
 [test_sourcemaps-09.js]
 [test_sourcemaps-10.js]
 [test_sourcemaps-11.js]
 [test_sourcemaps-12.js]
 [test_sourcemaps-13.js]
 [test_sourcemaps-16.js]
 [test_sourcemaps-17.js]
@@ -215,27 +182,21 @@ reason = bug 820380
 [test_framebindings-01.js]
 [test_framebindings-02.js]
 [test_framebindings-03.js]
 [test_framebindings-04.js]
 [test_framebindings-05.js]
 [test_framebindings-06.js]
 [test_framebindings-07.js]
 [test_pause_exceptions-01.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_pause_exceptions-02.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_longstringactor.js]
 [test_longstringgrips-01.js]
 [test_longstringgrips-02.js]
 [test_source-01.js]
-skip-if = toolkit == "gonk"
-reason = bug 820380
 [test_breakpoint-actor-map.js]
 [test_profiler_activation-01.js]
 [test_profiler_activation-02.js]
 [test_profiler_close.js]
 [test_profiler_data.js]
 [test_profiler_events-01.js]
 [test_profiler_events-02.js]
 [test_profiler_getbufferinfo.js]

--- a/devtools/shared/acorn/tests/unit/xpcshell.ini
+++ b/devtools/shared/acorn/tests/unit/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 tags = devtools
 head = head_acorn.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_import_acorn.js]
 [test_same_ast.js]
 [test_lenient_parser.js]

--- a/devtools/shared/discovery/tests/unit/xpcshell.ini
+++ b/devtools/shared/discovery/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
 
 [test_discovery.js]
-skip-if = toolkit == 'gonk' # Disabled per Bug 1140913

--- a/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
+++ b/devtools/shared/heapsnapshot/tests/mochitest/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 tags = devtools devtools-memory
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
 
 [test_DominatorTree_01.html]
 [test_SaveHeapSnapshot.html]
 

--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools heapsnapshot devtools-memory
 head = head_heapsnapshot.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 support-files =
   Census.jsm
   dominator-tree-worker.js
   heap-snapshot-worker.js
   Match.jsm
 
 [test_census_diff_01.js]

--- a/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
+++ b/devtools/shared/jsbeautify/tests/unit/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head_jsbeautify.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test.js]

--- a/devtools/shared/performance/test/xpcshell.ini
+++ b/devtools/shared/performance/test/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_perf-utils-allocations-to-samples.js]

--- a/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
+++ b/devtools/shared/pretty-fast/tests/unit/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 tags = devtools
 head = head_pretty-fast.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test.js]

--- a/devtools/shared/qrcode/tests/unit/xpcshell.ini
+++ b/devtools/shared/qrcode/tests/unit/xpcshell.ini
@@ -1,8 +1,7 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'gonk' && debug # Bug 1206586
 
 [test_encode.js]

--- a/devtools/shared/sourcemap/tests/unit/xpcshell.ini
+++ b/devtools/shared/sourcemap/tests/unit/xpcshell.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 tags = devtools
 head = head_sourcemap.js
 tail =
-skip-if = toolkit == 'gonk' && debug # Bug 1206586
 
 [test_util.js]
 [test_source_node.js]
 [test_source_map_generator.js]
 [test_source_map_consumer.js]
 [test_quick_sort.js]
 [test_dog_fooding.js]
 [test_binary_search.js]

--- a/devtools/shared/tests/mochitest/chrome.ini
+++ b/devtools/shared/tests/mochitest/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 tags = devtools
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 
 [test_eventemitter_basic.html]
 [test_devtools_extensions.html]
 skip-if = os == 'linux' && debug # Bug 1205739

--- a/devtools/shared/tests/unit/xpcshell.ini
+++ b/devtools/shared/tests/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools
 head = head_devtools.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   exposeLoader.js
 
 [test_assert.js]
 [test_csslexer.js]
 [test_css-properties-db.js]
 # This test only enforces that the CSS database is up to date with nightly. The DB is
 # only used when inspecting a target that doesn't support the getCSSDatabase actor.

--- a/devtools/shared/transport/tests/unit/xpcshell.ini
+++ b/devtools/shared/transport/tests/unit/xpcshell.ini
@@ -1,23 +1,21 @@
 [DEFAULT]
 tags = devtools
 head = head_dbg.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 support-files =
   testactors.js
   testactors-no-bulk.js
 
 [test_bulk_error.js]
 [test_client_server_bulk.js]
 [test_dbgsocket.js]
-skip-if = toolkit == "gonk"
-reason = bug 821285
 [test_dbgsocket_connection_drop.js]
 [test_delimited_read.js]
 [test_no_bulk.js]
 [test_packet.js]
 [test_queue.js]
 [test_transport_bulk.js]
 [test_transport_events.js]

--- a/devtools/shared/webconsole/test/chrome.ini
+++ b/devtools/shared/webconsole/test/chrome.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 tags = devtools
-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

--- a/devtools/shared/webconsole/test/unit/xpcshell.ini
+++ b/devtools/shared/webconsole/test/unit/xpcshell.ini
@@ -1,14 +1,14 @@
 [DEFAULT]
 tags = devtools
 head =
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
 
 [test_js_property_provider.js]
 [test_network_helper.js]
 [test_security-info-certificate.js]
 [test_security-info-parser.js]
 [test_security-info-protocol-version.js]
 [test_security-info-state.js]