--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -1,27 +1,27 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   file_empty.html
   file_bug945152.jar
   file_bug945152_worker.js
   file_bug1008126_worker.js
   mozbrowser_api_utils.js
 
 [test_anonymousContent_xul_window.xul]
 [test_bug715041.xul]
 [test_bug715041_removal.xul]
-[test_domrequesthelper.xul]
-[test_navigator_resolve_identity_xrays.xul]
-support-files = file_navigator_resolve_identity_xrays.xul
-[test_sendQueryContentAndSelectionSetEvent.html]
+[test_bug945152.html]
+[test_bug1008126.html]
 [test_bug1016960.html]
 [test_copypaste.xul]
 subsuite = clipboard
+[test_domrequesthelper.xul]
 [test_messagemanager_principal.html]
 [test_messagemanager_send_principal.html]
 skip-if = buildapp == 'mulet'
-[test_bug945152.html]
-[test_bug1008126.html]
+[test_mozbrowser_apis_allowed.html]
+[test_navigator_resolve_identity_xrays.xul]
+support-files = file_navigator_resolve_identity_xrays.xul
 [test_sandboxed_blob_uri.html]
+[test_sendQueryContentAndSelectionSetEvent.html]
 [test_websocket_frame.html]
-[test_mozbrowser_apis_allowed.html]

--- a/dom/base/test/chrome/chrome.ini
+++ b/dom/base/test/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   blockNoPlugins.xml
   blockPluginHard.xml
   bug418986-1.js
   cpows_child.js
   cpows_parent.xul
   file_bug549682.xul
   file_bug616841.xul
@@ -38,17 +38,16 @@ support-files = ../file_bug357450.js
 [test_bug418986-1.xul]
 [test_bug421622.xul]
 [test_bug429785.xul]
 [test_bug430050.xul]
 [test_bug467123.xul]
 [test_bug549682.xul]
 [test_bug571390.xul]
 [test_bug1098074_throw_from_ReceiveMessage.xul]
-skip-if = buildapp == 'mulet'
 [test_bug616841.xul]
 [test_bug635835.xul]
 [test_bug682305.html]
 [test_bug683852.xul]
 [test_bug752226-3.xul]
 [test_bug752226-4.xul]
 [test_bug765993.html]
 [test_bug780199.xul]
@@ -58,17 +57,16 @@ skip-if = buildapp == 'mulet'
 [test_bug816340.xul]
 [test_bug884693.xul]
 [test_bug914381.html]
 [test_bug990812.xul]
 [test_bug1063837.xul]
 [test_bug1139964.xul]
 [test_bug1209621.xul]
 [test_cpows.xul]
-skip-if = buildapp == 'mulet'
 [test_registerElement_content.xul]
 [test_registerElement_ep.xul]
 [test_domparsing.xul]
 [test_fileconstructor.xul]
 [test_fileconstructor_tempfile.xul]
 [test_nsITextInputProcessor.xul]
 [test_title.xul]
 [test_windowroot.xul]

--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -251,72 +251,65 @@ support-files =
 [test_anonymousContent_style_csp.html]
 [test_applet_alternate_content.html]
 [test_appname_override.html]
 [test_async_setTimeout_stack.html]
 [test_async_setTimeout_stack_across_globals.html]
 [test_audioWindowUtils.html]
 [test_audioNotification.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_audioNotificationSilent_audioFile.html]
 tags = audiochannel
 [test_audioNotificationSilent_webAudio.html]
 tags = audiochannel
 [test_audioNotificationStream.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_audioNotificationStopOnNavigation.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_audioNotificationWithEarlyPlay.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_base.xhtml]
 [test_blob_fragment_and_query.html]
 [test_blobconstructor.html]
 [test_blobURL_expiring.html]
 [test_bug5141.html]
 [test_bug28293.html]
 [test_bug28293.xhtml]
 [test_bug51034.html]
 [test_bug116083.html]
 subsuite = clipboard
 [test_bug166235.html]
 subsuite = clipboard
-skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
+skip-if = toolkit == 'android'
 [test_bug199959.html]
 [test_bug218236.html]
 [test_bug218277.html]
 [test_bug238409.html]
 [test_bug254337.html]
 [test_bug270145.xhtml]
 [test_bug276037-1.html]
 [test_bug276037-2.xhtml]
 [test_bug282547.html]
 [test_bug298064.html]
 [test_bug300992.html]
 [test_bug311681.xml]
 [test_bug313646.html]
 [test_bug320799.html]
 [test_bug322317.html]
 [test_bug326337.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug330925.xhtml]
 [test_bug331959.html]
 [test_bug333064.html]
 skip-if = toolkit == 'android'
 [test_bug333198.html]
 [test_bug333673.html]
 [test_bug337631.html]
 [test_bug338541.xhtml]
 [test_bug338583.html]
-# b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(43 total - bug 901343, specialpowers.wrap issue createsystemxhr)
-# e10s - bug 970589, bug 1091934
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_bug338679.html]
 [test_bug339494.html]
 [test_bug339494.xhtml]
 [test_bug340571.html]
 [test_bug343596.html]
 [test_bug345339.html]
 [test_bug346485.html]
 [test_bug352728.html]
@@ -379,29 +372,23 @@ support-files = test_bug402150.html^head
 [test_bug418214.html]
 [test_bug418986-1.html]
 [test_bug419132.html]
 [test_bug419527.xhtml]
 [test_bug420609.xhtml]
 [test_bug420700.html]
 [test_bug421602.html]
 [test_bug422403-1.html]
-skip-if = buildapp == 'b2g' # b2g(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-debug(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-desktop(bug 901343, specialpowers.wrap issue [nsIChannel.open])
 [test_bug422403-2.xhtml]
-skip-if = buildapp == 'b2g'
 [test_bug422537.html]
 [test_bug424212.html]
 [test_bug424359-1.html]
-skip-if = buildapp == 'b2g'
 [test_bug424359-2.html]
-skip-if = buildapp == 'b2g'
 [test_bug426308.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk')
 [test_bug426646.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug428847.html]
 [test_bug429157.html]
 [test_bug431082.html]
 [test_bug431701.html]
 [test_bug431833.html]
 [test_bug433533.html]
 [test_bug433662.html]
 [test_bug435425.html]
@@ -422,34 +409,31 @@ support-files = bug444546.sjs
 [test_bug455629.html]
 [test_bug456262.html]
 [test_bug457746.html]
 [test_bug459424.html]
 [test_bug461555.html]
 [test_bug461735.html]
 [test_bug465767.html]
 [test_bug466080.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(bug 901356, also fails on android) b2g-debug(bug 901356, also fails on android) b2g-desktop(bug 901356, also fails on android)
 [test_bug466409.html]
-skip-if = buildapp == 'b2g'
 [test_bug466751.xhtml]
 [test_bug469020.html]
 [test_bug469304.html]
 [test_bug473162-1.html]
 [test_bug473162-2.html]
 [test_bug475156.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762 # b2g(36 total - bug 902611) b2g-debug(36 total - bug 902611) b2g-desktop(36 total - bug 902611)
+skip-if = toolkit == 'android' #bug 855762
 [test_bug482935.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762
+skip-if = toolkit == 'android' #bug 855762
 [test_bug484396.html]
 [test_bug493881.html]
 support-files = test_bug493881.js
 [test_bug498240.html]
 [test_bug498433.html]
-skip-if = buildapp == 'b2g'
 [test_bug498897.html]
 [test_bug499656.html]
 [test_bug499656.xhtml]
 [test_bug500937.html]
 [test_bug503473.html]
 disabled = Disabled due to making the harness time out
 support-files = file_bug503473-frame.sjs
 [test_bug503481.html]
@@ -466,34 +450,31 @@ skip-if = toolkit == 'android' #TIMED_OU
 [test_bug540854.html]
 [test_bug541937.html]
 [test_bug544642.html]
 [test_bug545644.html]
 [test_bug545644.xhtml]
 [test_bug548463.html]
 [test_bug553896.xhtml]
 [test_bug557892.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug558726.html]
 [test_bug559526.html]
 [test_bug560780.html]
 skip-if = (os == "android") # Failure with AccessibleCarets on Android, bug 1230229
 [test_bug562137.html]
 [test_bug562169-1.html]
 [test_bug562169-2.html]
 [test_bug562652.html]
 [test_bug564047.html]
 [test_bug564863.xhtml]
 [test_bug567350.html]
 [test_bug574596.html]
 skip-if = toolkit == 'android'
 [test_bug578096.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(debug-only failure; crash) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
 [test_bug585978.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only timeout
 [test_bug587931.html]
 [test_bug588990.html]
 [test_bug590812.html]
 skip-if = toolkit == 'android' #bug 687032
 [test_bug590870.html]
 [test_bug592366.html]
 [test_bug592829.html]
 [test_bug597345.html]
@@ -517,40 +498,36 @@ skip-if = toolkit == 'android' #bug 6870
 [test_bug638112.html]
 [test_bug647518.html]
 [test_bug650001.html]
 [test_bug650776.html]
 [test_bug650784.html]
 [test_bug656283.html]
 [test_bug664916.html]
 [test_bug666604.html]
-skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
 [test_bug675121.html]
-skip-if = buildapp == 'b2g' # b2g(bug 901378) b2g-debug(bug 901378) b2g-desktop(bug 901378)
 [test_bug675166.html]
 [test_bug682463.html]
 [test_bug682554.html]
 [test_bug682592.html]
-skip-if = buildapp == 'b2g'
 [test_bug684671.html]
 [test_bug685798.html]
 [test_bug686449.xhtml]
 [test_bug687859.html]
 [test_bug690056.html]
 [test_bug692434.html]
 [test_bug693615.html]
 [test_bug693875.html]
 [test_bug694754.xhtml]
 [test_bug696301-1.html]
 [test_bug696301-2.html]
 [test_bug698381.html]
 [test_bug698384.html]
 [test_bug704063.html]
 [test_bug704320.html]
-skip-if = buildapp == 'b2g'  # b2g (https://example.com not working bug 1162353)
 [test_bug704320_policyset.html]
 [test_bug704320_policyset2.html]
 [test_bug704320_preload.html]
 [test_bug707142.html]
 [test_bug708620.html]
 [test_bug711047.html]
 [test_bug711180.html]
 [test_bug719533.html]
@@ -566,17 +543,16 @@ skip-if = buildapp == 'b2g'  # b2g (http
 [test_bug761120.html]
 [test_bug769117.html]
 [test_bug782342.html]
 [test_bug787778.html]
 [test_bug789315.html]
 [test_bug789856.html]
 [test_bug793311.html]
 [test_bug804395.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 901343, specialpowers.wrap issue createsystemxhr
 [test_bug809003.html]
 [test_bug810494.html]
 [test_bug811701.html]
 [test_bug811701.xhtml]
 [test_bug813919.html]
 [test_bug814576.html]
 [test_bug819051.html]
 [test_bug820909.html]
@@ -606,24 +582,22 @@ skip-if = (buildapp == 'b2g' && toolkit 
 [test_bug1037687.html]
 [test_bug1043106.html]
 [test_bug1057176.html]
 [test_bug1060938.html]
 [test_bug1064481.html]
 [test_bug1070015.html]
 [test_bug1075702.html]
 [test_bug1081686.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_bug1091883.html]
 [test_bug1101364.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_bug1118689.html]
-skip-if = buildapp == 'b2g'
 [test_bug1126851.html]
-skip-if = buildapp == 'b2g'
 [test_bug1163743.html]
 [test_bug1165501.html]
 [test_bug1187157.html]
 [test_bug1198095.html]
 [test_bug1238440.html]
 [test_bug1250148.html]
 [test_bug1259588.html]
 [test_bug1263696.html]
@@ -631,35 +605,34 @@ skip-if = buildapp == 'b2g'
 [test_bug1274806.html]
 [test_bug1281963.html]
 [test_bug1295852.html]
 [test_bug1307730.html]
 [test_bug1308069.html]
 [test_bug1314032.html]
 [test_caretPositionFromPoint.html]
 [test_change_policy.html]
-skip-if = buildapp == 'b2g' #no ssl support
 [test_classList.html]
 [test_clearTimeoutIntervalNoArg.html]
 [test_constructor-assignment.html]
 [test_constructor.html]
 [test_copyimage.html]
 subsuite = clipboard
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || (toolkit != 'cocoa' && toolkit != 'gonk' && toolkit != 'gtk2' && toolkit != 'gtk3' && toolkit != 'windows') #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
+skip-if = toolkit == 'android' #bug 904183
 [test_copypaste.html]
 subsuite = clipboard
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
+skip-if = toolkit == 'android' #bug 904183
 [test_copypaste.xhtml]
 subsuite = clipboard
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183) b2g-debug(bug 904183) b2g-desktop(bug 904183)
+skip-if = toolkit == 'android' #bug 904183
 [test_createHTMLDocument.html]
 [test_declare_stylesheet_obsolete.html]
 [test_dialogArguments.html]
 tags = openwindow
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # showmodaldialog
+skip-if = toolkit == 'android' || e10s # showmodaldialog
 [test_document.all_iteration.html]
 [test_document.all_unqualified.html]
 [test_document_constructor.html]
 [test_document_importNode_document.html]
 [test_document_register.html]
 [test_domcursor.html]
 [test_domparser_null_char.html]
 [test_domparsing.html]
@@ -702,38 +675,37 @@ skip-if = e10s || os != 'linux' || build
 [test_integer_attr_with_leading_zero.html]
 [test_intersectionobservers.html]
 [test_ipc_messagemanager_blob.html]
 [test_link_prefetch.html]
 skip-if = !e10s # Track Bug 1281415
 [test_link_stylesheet.html]
 [test_messagemanager_targetchain.html]
 [test_meta_viewport0.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport1.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport2.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport3.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport4.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport5.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport6.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_meta_viewport7.html]
-skip-if = (os != 'b2g' && os != 'android')    # meta-viewport tag support is mobile-only
+skip-if = (os != 'android')    # meta-viewport tag support is mobile-only
 [test_mozbrowser_apis_blocked.html]
 [test_mozfiledataurl.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
+skip-if = toolkit == 'android' #TIMED_OUT
 [test_mozMatchesSelector.html]
 [test_mutationobserver_anonymous.html]
 [test_mutationobservers.html]
-skip-if = buildapp == 'b2g' # b2g(bug 901385, showmodaldialog) b2g-debug(bug 901385, showmodaldialog) b2g-desktop(bug 901385, showmodaldialog)
 [test_named_frames.html]
 [test_navigator_hardwareConcurrency.html]
 [test_navigator_language.html]
 [test_navigatorPrefOverride.html]
 [test_noAudioNotification.html]
 tags = audiochannel
 [test_noAudioNotificationOnMutedElement.html]
 tags = audiochannel
@@ -745,35 +717,34 @@ tags = audiochannel
 [test_NodeIterator_mutations_1.xhtml]
 [test_NodeIterator_mutations_2.html]
 [test_NodeIterator_mutations_3.html]
 [test_nodelist_holes.html]
 [test_nonascii_blob_url.html]
 [test_noWebAudioNotification.html]
 tags = audiochannel
 [test_open_null_features.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Fails on b2g-desktop, tracked in bug 1011874
 [test_openDialogChromeOnly.html]
 tags = openwindow
 [test_orientation_alternate.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1312417
 [test_orientation_frame.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1312417
 [test_orientation_frame_lock.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1312417
 [test_orientation_sandbox_no_lock.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1312417
 [test_plugin_freezing.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #CLICK_TO_PLAY
+skip-if = toolkit == 'android' #CLICK_TO_PLAY
 [test_pluginAudioNotification.html]
 tags = audiochannel
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android') # Plugins don't work on Android and/or B2G/Mulet
+skip-if = toolkit == 'android' # Plugins don't work on Android
 [test_pluginMutedBeforePlay.html]
 tags = audiochannel
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android') # Plugins don't work on Android and/or B2G/Mulet
+skip-if = toolkit == 'android' # Plugins don't work on Android
 [test_postMessage_solidus.html]
 [test_postMessages.html]
 support-files = worker_postMessages.js
 [test_processing_instruction_update_stylesheet.xhtml]
 [test_progress_events_for_gzip_data.html]
 [test_range_bounds.html]
 skip-if = toolkit == 'android'
 [test_reentrant_flush.html]
@@ -783,64 +754,61 @@ skip-if = toolkit == 'android'
 [test_screen_orientation.html]
 [test_script_loader_crossorigin_data_url.html]
 [test_setInterval_uncatchable_exception.html]
 skip-if = debug == false
 [test_settimeout_extra_arguments.html]
 [test_settimeout_inner.html]
 [test_setTimeoutWith0.html]
 [test_setting_opener.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_simplecontentpolicy.html]
-skip-if = e10s || buildapp == 'b2g' # Bug 1156489.
+skip-if = e10s # Bug 1156489.
 [test_text_wholeText.html]
 [test_textnode_normalize_in_selection.html]
 [test_textnode_split_in_selection.html]
 [test_title.html]
 [test_treewalker_nextsibling.xml]
 [test_user_select.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_viewport_scroll.html]
 [test_viewsource_forbidden_in_object.html]
 [test_w3element_traversal.html]
 [test_w3element_traversal.xhtml]
 [test_w3element_traversal_svg.html]
 [test_warning_for_blocked_cross_site_request.html]
 [test_webaudioNotification.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_webaudioNotificationStopOnNavigation.html]
 tags = audiochannel
-skip-if = buildapp == 'mulet'
 [test_websocket_basic.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_websocket_hello.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_websocket_permessage_deflate.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_websocket1.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = toolkit == 'android'
 [test_websocket2.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = toolkit == 'android'
 [test_websocket3.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = toolkit == 'android'
 [test_websocket4.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = toolkit == 'android'
 [test_websocket5.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = toolkit == 'android'
 [test_window_constructor.html]
 [test_window_cross_origin_props.html]
 [test_window_define_nonconfigurable.html]
 skip-if = release_or_beta
 [test_window_define_symbol.html]
 [test_window_element_enumeration.html]
 [test_window_enumeration.html]
 [test_window_extensible.html]
 [test_window_indexing.html]
 [test_window_named_frame_enumeration.html]
 [test_window_orientation.html]
-skip-if = toolkit != 'gonk'
+skip-if = true # bug 1312417
 [test_window_proto.html]
 [test_writable-replaceable.html]
 [test_x-frame-options.html]
 [test_xbl_userdata.xhtml]
 [test_youtube_flash_embed.html]
 # Please keep alphabetical order.

--- a/dom/base/test/unit/xpcshell.ini
+++ b/dom/base/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head = head_utilities.js
 tail =
-skip-if = toolkit == 'gonk'
 support-files =
   1_original.xml
   1_result.xml
   2_original.xml
   2_result_1.xml
   2_result_2.xml
   2_result_3.xml
   2_result_4.xml

--- a/dom/base/test/unit_ipc/xpcshell.ini
+++ b/dom/base/test/unit_ipc/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 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/base/test/websocket_hybi/mochitest.ini
+++ b/dom/base/test/websocket_hybi/mochitest.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 support-files =
   file_binary-frames_wsh.py
   file_check-binary-messages_wsh.py
 
 [test_receive-arraybuffer.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_receive-blob.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_send-arraybuffer.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'
 [test_send-blob.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
+skip-if = toolkit == 'android'