--- 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 = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
+skip-if = 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/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 tags = psm
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files = page_blank.html
 
 [test_sts_privatebrowsing_perwindowpb.html]

--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/mochitest.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 tags = psm
-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/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+++ b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 head = head_psm.js
 tail =
 tags = psm
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
 
 [test_pkcs11_insert_remove.js]
 [test_pkcs11_module.js]
 [test_pkcs11_no_events_after_removal.js]
 [test_pkcs11_safe_mode.js]
 [test_pkcs11_slot.js]
 [test_pkcs11_token.js]

--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -30,17 +30,16 @@ support-files =
   test_signed_dir/**
   test_startcom_wosign/**
   test_validity/**
   tlsserver/**
 
 [test_add_preexisting_cert.js]
 [test_baseline_requirements_subject_common_name.js]
 [test_cert_blocklist.js]
-skip-if = buildapp == "b2g"
 tags = addons psm
 [test_cert_chains.js]
 run-sequentially = hardcoded ports
 [test_cert_dbKey.js]
 [test_cert_eku.js]
 [test_cert_embedded_null.js]
 [test_cert_keyUsage.js]
 [test_cert_isBuiltInRoot.js]
@@ -50,81 +49,69 @@ run-sequentially = hardcoded ports
 run-sequentially = hardcoded ports
 [test_cert_sha1.js]
 [test_cert_signatures.js]
 [test_cert_trust.js]
 [test_cert_version.js]
 [test_certDB_import.js]
 [test_certDB_import_pkcs12.js]
 [test_certviewer_invalid_oids.js]
-skip-if = toolkit == 'android' || buildapp == 'b2g'
+skip-if = toolkit == 'android'
 [test_constructX509FromBase64.js]
 [test_content_signing.js]
 [test_datasignatureverifier.js]
 [test_der.js]
 [test_enterprise_roots.js]
 skip-if = os != 'win' # tests a Windows-specific feature
 [test_ev_certs.js]
 run-sequentially = hardcoded ports
 [test_forget_about_site_security_headers.js]
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 [test_getchain.js]
 [test_hash_algorithms.js]
 [test_hash_algorithms_wrap.js]
-# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+# bug 1124289 - run_test_in_child violates the sandbox on android
+skip-if = toolkit == 'android'
 [test_hmac.js]
 [test_intermediate_basic_usage_constraints.js]
 [test_js_cert_override_service.js]
 run-sequentially = hardcoded ports
 [test_keysize.js]
 [test_keysize_ev.js]
-# OCSP requests in this test time out on slow B2G Emulator debug builds.
-# See Bug 1147726.
-skip-if = toolkit == 'gonk' && debug
 run-sequentially = hardcoded ports
 [test_local_cert.js]
 [test_logoutAndTeardown.js]
 run-sequentially = hardcoded ports
 [test_name_constraints.js]
 [test_nsCertType.js]
 run-sequentially = hardcoded ports
 [test_nsIX509Cert_utf8.js]
 [test_nsIX509CertValidity.js]
 [test_nss_shutdown.js]
 [test_ocsp_caching.js]
 run-sequentially = hardcoded ports
 [test_ocsp_enabled_pref.js]
 run-sequentially = hardcoded ports
 [test_ocsp_fetch_method.js]
-# OCSP requests in this test time out on slow B2G Emulator debug builds.
-# See Bug 1147725.
-skip-if = toolkit == 'gonk' && debug
 run-sequentially = hardcoded ports
 [test_ocsp_must_staple.js]
 run-sequentially = hardcoded ports
 [test_ocsp_no_hsts_upgrade.js]
 run-sequentially = hardcoded ports
 [test_ocsp_required.js]
 run-sequentially = hardcoded ports
 [test_ocsp_stapling.js]
 run-sequentially = hardcoded ports
 [test_ocsp_stapling_expired.js]
 run-sequentially = hardcoded ports
-skip-if = (toolkit == 'gonk' && debug) # Bug 1029775
 [test_ocsp_stapling_with_intermediate.js]
 run-sequentially = hardcoded ports
 [test_ocsp_timeout.js]
 run-sequentially = hardcoded ports
 [test_ocsp_url.js]
-# OCSP requests in this test time out on slow B2G Emulator debug builds.
-# See Bug 1147725.
-# This test also fails on B2G Emulator opt builds non-reproducibly.
-# See Bug 1178988.
-skip-if = toolkit == 'gonk'
 run-sequentially = hardcoded ports
 [test_password_prompt.js]
 [test_pinning.js]
 run-sequentially = hardcoded ports
 # This test can take longer than 300 seconds on B2G emulator debug builds, so
 # give it enough time to finish. See bug 1081128.
 requesttimeoutfactor = 2
 [test_pinning_dynamic.js]
@@ -133,18 +120,18 @@ requesttimeoutfactor = 2
 [test_signed_apps.js]
 [test_signed_apps-marketplace.js]
 [test_signed_dir.js]
 tags = addons psm
 [test_sss_eviction.js]
 [test_sss_readstate.js]
 [test_sss_readstate_child.js]
 support-files = sss_readstate_child_worker.js
-# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+# bug 1124289 - run_test_in_child violates the sandbox on android
+skip-if = toolkit == 'android'
 [test_sss_readstate_empty.js]
 [test_sss_readstate_garbage.js]
 [test_sss_readstate_huge.js]
 [test_sss_savestate.js]
 [test_startcom_wosign.js]
 [test_sts_fqdn.js]
 [test_sts_holepunch.js]
 [test_sts_ipv4_ipv6.js]