diff -r 000000000000 -r 6474c204b198 security/manager/ssl/tests/unit/xpcshell.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/ssl/tests/unit/xpcshell.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,84 @@
+[DEFAULT]
+head = head_psm.js
+tail =
+support-files =
+  test_certificate_usages/**
+  test_signed_apps/**
+  tlsserver/**
+  test_cert_signatures/**
+  test_ev_certs/**
+  test_getchain/**
+  test_intermediate_basic_usage_constraints/**
+  test_name_constraints/**
+  test_cert_trust/**
+  test_cert_version/**
+  test_cert_eku/**
+  test_ocsp_url/**
+
+[test_datasignatureverifier.js]
+[test_hash_algorithms.js]
+[test_hmac.js]
+
+[test_sts_preloadlist_perwindowpb.js]
+# Bug 978426: Test fails consistently only on B2G ARM
+skip-if = buildapp == "b2g" && processor = "arm"
+
+[test_sts_preloadlist_selfdestruct.js]
+[test_sts_holepunch.js]
+[test_sts_ipv4_ipv6.js]
+
+[test_certificate_usages.js]
+[test_ocsp_stapling.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_ocsp_stapling_expired.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_ocsp_stapling_with_intermediate.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_ocsp_caching.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_ocsp_required.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_ocsp_timeout.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+# Bug 1005266: intermittent failures on Windows
+skip-if = os == "win"
+[test_cert_signatures.js]
+[test_ev_certs.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+skip-if = os == "android" || buildapp == "b2g"
+[test_getchain.js]
+[test_cert_overrides.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
+[test_intermediate_basic_usage_constraints.js]
+[test_name_constraints.js]
+[test_cert_trust.js]
+[test_cert_version.js]
+[test_signed_apps.js]
+[test_signed_apps-marketplace.js]
+[test_cert_eku.js]
+# Bug 989485 : this test this fails on slow devices
+skip-if = os == "android" || (buildapp == "b2g" && processor == "arm")
+requesttimeoutfactor = 4
+[test_ocsp_url.js]
+run-sequentially = hardcoded ports
+# Bug  676972: this test times out on Android and B2G
+skip-if = os == "android" || buildapp == "b2g"
+[test_pinning.js]
+run-sequentially = hardcoded ports
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g"
\ No newline at end of file