--- a/devtools/shared/security/tests/unit/xpcshell.ini
+++ b/devtools/shared/security/tests/unit/xpcshell.ini
@@ -5,12 +5,15 @@ tail =
 firefox-appdir = browser
 skip-if = toolkit == 'gonk' && debug # Bug 1206586
 
 support-files=
   testactors.js
 
 [test_cert.js]
 [test_encryption.js]
+# Failures on B2G emulator debug, B2G emulator-x86-kk
+# See bug 1234972 and bug 1199472
+skip-if = toolkit == 'gonk' && (debug || android_version > '15')
 [test_oob_cert_auth.js]
-# Failures on B2G emulator debug and Android opt
-# See bug 1141544, bug 1163052, and bug 1166032
-skip-if = (toolkit == 'gonk' && debug) || (toolkit == 'android' && !debug)
+# Failures on B2G emulator debug, B2G emulator-x86-kk and Android opt
+# See bug 1141544, bug 1163052, bug 1166032 and bug 1241831
+skip-if = (toolkit == 'gonk' && (debug || android_version > '15')) || (toolkit == 'android' && !debug)