diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/favicons/xpcshell.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/favicons/xpcshell.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,31 @@
+[DEFAULT]
+head = head_favicons.js
+tail =
+support-files =
+  expected-favicon-big16.ico.png
+  expected-favicon-big32.jpg.png
+  expected-favicon-big4.jpg.png
+  expected-favicon-big48.ico.png
+  expected-favicon-big64.png.png
+  expected-favicon-scale160x3.jpg.png
+  expected-favicon-scale3x160.jpg.png
+  favicon-big16.ico
+  favicon-big32.jpg
+  favicon-big4.jpg
+  favicon-big48.ico
+  favicon-big64.png
+  favicon-normal16.png
+  favicon-normal32.png
+  favicon-scale160x3.jpg
+  favicon-scale3x160.jpg
+
+[test_expireAllFavicons.js]
+[test_favicons_conversions.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
+[test_getFaviconDataForPage.js]
+[test_getFaviconURLForPage.js]
+[test_moz-anno_favicon_mime_type.js]
+[test_query_result_favicon_changed_on_child.js]
+[test_replaceFaviconData.js]
+[test_replaceFaviconDataFromDataURL.js]