--- a/image/test/crashtests/crashtests.list
+++ b/image/test/crashtests/crashtests.list
@@ -1,40 +1,40 @@
 # Bug 668068 - Maximum (256) width and height icons that we currently interpret as 0-width and 0-height.
 load 256-height.ico
 load 256-width.ico
 
 load 83804-1.gif
 load 89341-1.gif
 load 463696.bmp
 load 570451.png
-skip-if(Android||B2G) load 694165-1.xhtml # Bug 876275
+skip-if(Android) load 694165-1.xhtml
 load 681190.html
 load 732319-1.html
 load 844403-1.html
 load 856616.gif
-skip-if(B2G) load 944353.jpg
+load 944353.jpg
 load 1205923-1.html
 # Ensure we handle detecting that an image is animated, then failing to decode
 # it. (See bug 1210745.)
 load 1210745-1.gif
 load 1212954-1.svg
 load 1235605.gif
 load 1241728-1.html
 load 1241729-1.html
 load 1242093-1.html
 load 1242778-1.png
 load 1249576-1.png
 load 1253362-1.html
 load colormap-range.gif
 HTTP load delayedframe.sjs # A 3-frame animated GIF with an inordinate delay between the second and third frame
 
 # Animated gifs with a very large canvas, but tiny actual content.
-skip-if(B2G) load delaytest.html?523528-1.gif
-skip-if(B2G) load delaytest.html?523528-2.gif
+load delaytest.html?523528-1.gif
+load delaytest.html?523528-2.gif
 
 # Bug 1160801 - Ensure that we handle invalid disposal types.
 load invalid-disposal-method-1.gif
 load invalid-disposal-method-2.gif
 load invalid-disposal-method-3.gif
 
 load invalid-icc-profile.jpg # This would have exposed the leak discovered in bug 642902
 

--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 
 [test_bug415761.html]
 skip-if = os != "win" || os_version == "6.2"
 support-files =
   bug415761.ico

--- a/image/test/mochitest/mochitest.ini
+++ b/image/test/mochitest/mochitest.ini
@@ -77,82 +77,77 @@ support-files =
   source.png
   transparent.gif
   transparent.png
   over.png
   6M-pixels.png
   12M-pixels-1.png
   12M-pixels-2.png
 
-[test_ImageContentLoaded.html]
+[test_animation.html]
+skip-if = os == 'android'
+[test_animation_operators.html]
+[test_animation2.html]
+skip-if = os == 'android'
+[test_animSVGImage.html]
+skip-if = os == 'android'
+[test_animSVGImage2.html]
+skip-if = os == 'android'
+[test_background_image_anim.html]
+skip-if = os == 'android'
 [test_bug399925.html]
-skip-if = buildapp == 'b2g' && debug # Bug 1182951
-# [test_bug435296.html]
-# disabled - See bug 578591
+[test_bug435296.html]
+skip-if = true # disabled - See bug 578591
 [test_bug466586.html]
 [test_bug468160.html]
-# [test_bug478398.html]
-# disabled - See bug 579139
+[test_bug478398.html]
+skip-if = true # disabled - See bug 579139
 [test_bug490949.html]
 [test_bug496292.html]
 [test_bug497665.html]
 [test_bug552605-1.html]
 [test_bug552605-2.html]
 [test_bug553982.html]
 [test_bug601470.html]
 [test_bug614392.html]
 [test_bug657191.html]
 [test_bug671906.html]
 [test_bug733553.html]
 [test_bug767779.html]
 [test_bug865919.html]
 [test_bug89419-1.html]
 [test_bug89419-2.html]
+[test_bug1132427.html]
+skip-if = os == 'android'
 [test_bug1180105.html]
 [test_bug1217571.html]
-[test_animation.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_animation2.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_animation_operators.html]
+[test_bullet_animation.html]
+skip-if = os == 'android'
+[test_changeOfSource.html]
+skip-if = os == 'android'
+[test_changeOfSource2.html]
+skip-if = os == 'android'
 [test_drawDiscardedImage.html]
-skip-if = toolkit == "gonk" #Bug 997034 - canvas.toDataURL() often causes lost connection to device.
 [test_error_events.html]
-[test_short_gif_header.html]
-[test_image_buffer_limit.html]
-#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'
-[test_animSVGImage2.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_background_image_anim.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_bullet_animation.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_changeOfSource.html]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_changeOfSource2.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+[test_ImageContentLoaded.html]
 [test_has_transparency.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_net_failedtoprocess.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_removal_ondecode.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_removal_onload.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
+[test_short_gif_header.html]
 [test_staticClone.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_svg_animatedGIF.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_svg_filter_animation.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_synchronized_animation.html]
-#skip-if = buildapp == 'b2g' || os == 'android'
+#skip-if = os == 'android'
 disabled = bug 1295501
 [test_undisplayed_iframe.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 [test_xultree_animation.xhtml]
-skip-if = buildapp == 'b2g' || os == 'android'
-[test_bug1132427.html]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'

deleted file mode 100644
--- a/image/test/mochitest/test_image_buffer_limit.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=878577
--->
-<head>
-  <title>Test for Bug 878577 - Hard limit of decoded image buffer size</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="imgutils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-
-<body>
-
-<!--
-  Initial setup: The default size limit is 65M
-  Step 1: Load 6M-pixels.png ok
-  Step 2: Load 12M-pixels-1.png fail
-  Step 3: Remove 6M-pixels.png and clear the decoded image
-  Step 4: Load 12M-pixels-2.png ok
--->
-
-<script>
-
-SimpleTest.waitForExplicitFinish();
-
-function loadImage(url) {
-  info('loading ' + url);
-  var image = new Image(50,50);
-  image.src = url;
-  document.body.appendChild(image);
-  return image;
-}
-
-function fail(msg) {
-  return function() {
-    ok(false, msg);
-    SimpleTest.finish();
-  };
-}
-
-function runTest() {
-  // provide a clean setup
-  clearImageCache();
-
-  var img_6M = loadImage('6M-pixels.png');
-  img_6M.onerror = fail('unable to load 6M-pixels.png');
-  img_6M.onload = function() {
-    ok(true, 'expect success on loading a 6M-pixel image');
-
-    var img_12M = loadImage('12M-pixels-1.png');
-    img_12M.onload = fail('should fail to load due to image buffer size limit');
-    img_12M.onerror = function() {
-      ok(true, 'expect fail on loading a 12M-pixel image');
-
-      // remove image cache
-      info('discard decoded image buffer');
-      img_6M.onerror = null;
-      img_6M.src = null;
-      img_12M.onerror = null;
-      img_12M.src = null;
-      document.body.removeChild(img_6M);
-      document.body.removeChild(img_12M);
-      clearImageCache();
-
-      // Spin the event to give the image a chance to be discarded.
-      SimpleTest.executeSoon(function() {
-        var another_img_12M = loadImage('12M-pixels-2.png');
-        another_img_12M.onerror = fail('unable to load 12M-pixels-2.png');
-        another_img_12M.onload = function() {
-          ok(true, 'expect success on loading another 12M-pixel image');
-          another_img_12M.onerror = null;
-          another_img_12M.onload = null;
-          SimpleTest.finish();
-        }; // another_img_12M.onload
-      });
-
-    }; // img_12M.onerror
-  }; // img_6M.onload
-}
-
-window.addEventListener("load", function() {
-  SpecialPowers.pushPrefEnv({
-    "set": [
-      // XXX prevent displayed imgFrame been released
-      ["image.mem.allow_locking_in_content_processes", true]
-    ]
-  }, runTest);
-});
-
-</script>
-</body>
-</html>
-

--- a/image/test/reftest/downscaling/reftest.list
+++ b/image/test/reftest/downscaling/reftest.list
@@ -24,17 +24,17 @@
 # behavior than other platforms, and may require "fuzzy-if(winWidget,...)".
 
 
 # RUN TESTS NOT AFFECTED BY DOWNSCALE-DURING-DECODE:
 # ==================================================
 fuzzy-if(skiaContent,14,416) == downscale-svg-1a.html downscale-svg-1-ref.html?80
 fuzzy(80,468) == downscale-svg-1b.html downscale-svg-1-ref.html?72
 fuzzy-if(skiaContent,8,292) == downscale-svg-1c.html downscale-svg-1-ref.html?64
-fuzzy(17,208) fuzzy-if(B2G,255,207) == downscale-svg-1d.html downscale-svg-1-ref.html?53 # right side is 1 pixel off for B2G, probably regression from 974242
+fuzzy(17,208) == downscale-svg-1d.html downscale-svg-1-ref.html?53
 fuzzy(78,216) fuzzy-if(skiaContent,110,181) == downscale-svg-1e.html downscale-svg-1-ref.html?40
 fuzzy(51,90) fuzzy-if(skiaContent,142,77) == downscale-svg-1f.html downscale-svg-1-ref.html?24
 
 # RUN TESTS WITH DOWNSCALE-DURING-DECODE DISABLED:
 # ================================================
 default-preferences pref(image.downscale-during-decode.enabled,false)
 
 fuzzy-if(winWidget,16,20) fuzzy-if(cocoaWidget,106,31) == downscale-1.html downscale-1-ref.html

--- a/image/test/reftest/gif/reftest.list
+++ b/image/test/reftest/gif/reftest.list
@@ -1,9 +1,9 @@
-# GIF tests 
+# GIF tests
 
 # tests for bug 519589
 == 1bit-255-trans.gif 1bit-255-trans.png
 == in-colormap-trans.gif in-colormap-trans.png
 == out-of-colormap-trans.gif out-of-colormap-trans.png
 
 # a GIF file that uses the comment extension
 == comment.gif comment.png
@@ -30,24 +30,24 @@ skip == test_bug641198.html animation2a-
 
 # webcam-simulacrum.mgif is a hand-edited file containing red.gif and blue.gif,
 # concatenated together with the relevant headers for
 # multipart/x-mixed-replace. Specifically, with the headers in
 # webcam-simulacrum.mjpg^headers^, the web browser will get the following:
 #
 # HTTP 200 OK
 # Content-Type: multipart/x-mixed-replace;boundary=BOUNDARYOMG
-# 
+#
 # --BOUNDARYOMG\r\n
 # Content-Type: image/gif\r\n
 # \r\n
 # <contents of red.gif> (no newline)
 # --BOUNDARYOMG\r\n
 # Content-Type: image/gif\r\n
 # \r\n
 # <contents of blue.gif> (no newline)
 # --BOUNDARYOMG--\r\n
-# 
+#
 # (The boundary is arbitrary, and just has to be defined as something that
 # won't be in the text of the contents themselves. --$(boundary)\r\n means
 # "Here is the beginning of a boundary," and --$(boundary)-- means "All done
 # sending you parts.")
-skip-if(B2G) HTTP == webcam.html blue.gif # bug 773482
+HTTP == webcam.html blue.gif

--- a/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
+++ b/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
@@ -11,13 +11,13 @@
 == ico-size-8x8-1bpp.ico   ico-size-8x8-1bpp.png
 == ico-size-9x9-1bpp.ico   ico-size-9x9-1bpp.png
 == ico-size-15x15-1bpp.ico ico-size-15x15-1bpp.png
 == ico-size-16x16-1bpp.ico ico-size-16x16-1bpp.png
 == ico-size-17x17-1bpp.ico ico-size-17x17-1bpp.png
 == ico-size-31x31-1bpp.ico ico-size-31x31-1bpp.png
 == ico-size-32x32-1bpp.ico ico-size-32x32-1bpp.png
 == ico-size-33x33-1bpp.ico ico-size-33x33-1bpp.png
-skip-if(B2G) == ico-size-256x256-1bpp.ico ico-size-256x256-1bpp.png # bug 773482
+== ico-size-256x256-1bpp.ico ico-size-256x256-1bpp.png
 == ico-partial-transparent-1bpp.ico ico-partial-transparent-1bpp.png
 == ico-transparent-1bpp.ico ico-transparent-1bpp.png
 == ico-not-square-transparent-1bpp.ico ico-not-square-transparent-1bpp.png
 

--- a/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
+++ b/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
@@ -11,13 +11,13 @@
 == ico-size-8x8-8bpp.ico   ico-size-8x8-8bpp.png
 == ico-size-9x9-8bpp.ico   ico-size-9x9-8bpp.png
 == ico-size-15x15-8bpp.ico ico-size-15x15-8bpp.png
 == ico-size-16x16-8bpp.ico ico-size-16x16-8bpp.png
 == ico-size-17x17-8bpp.ico ico-size-17x17-8bpp.png
 == ico-size-31x31-8bpp.ico ico-size-31x31-8bpp.png
 == ico-size-32x32-8bpp.ico ico-size-32x32-8bpp.png
 == ico-size-33x33-8bpp.ico ico-size-33x33-8bpp.png
-skip-if(B2G) == ico-size-256x256-8bpp.ico ico-size-256x256-8bpp.png # bug 773482
+== ico-size-256x256-8bpp.ico ico-size-256x256-8bpp.png
 == ico-partial-transparent-8bpp.ico ico-partial-transparent-8bpp.png
 == ico-transparent-8bpp.ico ico-transparent-8bpp.png
 == ico-not-square-transparent-8bpp.ico ico-not-square-transparent-8bpp.png
 

--- a/image/test/reftest/reftest.list
+++ b/image/test/reftest/reftest.list
@@ -1,28 +1,28 @@
 # Check for 24-bit color mode (test for bug 414720)
 skip-if(Android) == colordepth.html about:blank
 
 # "PngSuite, the official set of PNG test images"
 # Images by Willem van Schaik
 #
 # http://www.schaik.com/pngsuite/pngsuite.html
 # http://www.libpng.org/pub/png/pngsuite.html
-skip-if(B2G) include pngsuite-basic-n/reftest.list      # bug 783632
-skip-if(B2G) include pngsuite-basic-i/reftest.list      # bug 783632
-skip-if(B2G) include pngsuite-ancillary/reftest.list    # bug 783632
-skip-if(B2G) include pngsuite-background/reftest.list   # bug 783632
-skip-if(B2G) include pngsuite-chunkorder/reftest.list   # bug 783632
-skip-if(B2G) include pngsuite-corrupted/reftest.list    # bug 783632
-skip-if(B2G) include pngsuite-filtering/reftest.list    # bug 783632
-skip-if(B2G) include pngsuite-gamma/reftest.list        # bug 783632
-skip-if(B2G) include pngsuite-oddsizes/reftest.list     # bug 783632
-skip-if(B2G) include pngsuite-palettes/reftest.list     # bug 783632
-skip-if(B2G) include pngsuite-transparency/reftest.list # bug 783632
-skip-if(B2G) include pngsuite-zlib/reftest.list         # bug 783632
+include pngsuite-basic-n/reftest.list
+include pngsuite-basic-i/reftest.list
+include pngsuite-ancillary/reftest.list
+include pngsuite-background/reftest.list
+include pngsuite-chunkorder/reftest.list
+include pngsuite-corrupted/reftest.list
+include pngsuite-filtering/reftest.list
+include pngsuite-gamma/reftest.list
+include pngsuite-oddsizes/reftest.list
+include pngsuite-palettes/reftest.list
+include pngsuite-transparency/reftest.list
+include pngsuite-zlib/reftest.list
 
 # BMP tests
 skip-if(Android) include bmp/reftest.list
 
 # ICO tests
 skip-if(Android) include ico/reftest.list
 
 # JPEG tests
@@ -42,9 +42,9 @@ include color-management/reftest.list
 
 # Downscaling tests
 include downscaling/reftest.list
 
 # Blob URI tests
 include blob/reftest.list
 
 # Lossless encoders
-skip-if(Android||B2G) include encoders-lossless/reftest.list # bug 783621
+skip-if(Android) include encoders-lossless/reftest.list

--- a/image/test/unit/xpcshell.ini
+++ b/image/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'gonk'
 support-files =
   async_load_tests.js
   bug413512.ico
   bug815359.ico
   image1.png
   image1png16x16.jpg
   image1png64x64.jpg
   image2.jpg