diff --git a/image/test/mochitest/chrome.ini b/image/test/mochitest/chrome.ini
index c826ad08f59..4957fe03fec 100644
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -19,7 +19,6 @@ support-files =
   imgutils.js
   invalid.jpg
   lime-anim-100x100-2.svg
-  lime-anim-100x100.svg
   lime100x100.svg
   opaque.bmp
   purple.gif
@@ -32,7 +31,6 @@ support-files =
   bug1132427.html
   bug1132427.gif
 
-[test_animSVGImage.html]
 [test_animSVGImage2.html]
 [test_animation.html]
 disabled = bug 1100497
diff --git a/image/test/mochitest/mochitest.ini b/image/test/mochitest/mochitest.ini
index e83f72bca28..825ed9da5fd 100644
--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -47,6 +47,7 @@ support-files =
   keep.gif
   keep.png
   lime100x100.svg
+  lime-anim-100x100.svg
   red.png
   restore-previous.gif
   restore-previous.png
@@ -101,3 +102,5 @@ skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost c
 #skip-if = toolkit != "gonk" #Image buffer limit is only set for Firefox OS currently.
 disabled = bug 1060869
 [test_image_crossorigin_data_url.html]
+[test_animSVGImage.html]
+skip-if = buildapp == 'b2g' || os == 'android'
diff --git a/image/test/mochitest/test_animSVGImage.html b/image/test/mochitest/test_animSVGImage.html
index 8ab46a13ea3..6377e26114e 100644
--- a/image/test/mochitest/test_animSVGImage.html
+++ b/image/test/mochitest/test_animSVGImage.html
@@ -5,10 +5,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=610419
 -->
 <head>
   <title>Test for Bug 610419</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
   <script type="application/javascript" src="imgutils.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=610419">Mozilla Bug 610419</a>
@@ -22,12 +22,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=610419
 <script type="application/javascript;version=1.8">
 /** Test for Bug 610419**/
 
+SimpleTest.requestFlakyTimeout("Pre-existing timeouts when converting from mochitest-chrome");
 SimpleTest.waitForExplicitFinish();
 
 const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
 const gImg = document.getElementsByTagName("img")[0];
 
 var gMyDecoderObserver; // value will be set in main()
