--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@@ -1,67 +1,67 @@
 [DEFAULT]
   support-files =
+    apz_test_native_event_utils.js
     apz_test_utils.js
-    apz_test_native_event_utils.js
+    helper_basic_pan.html
     helper_bug982141.html
     helper_bug1151663.html
+    helper_bug1162771.html
+    helper_bug1271432.html
+    helper_bug1280013.html
     helper_bug1285070.html
+    helper_bug1299195.html
+    helper_click.html
+    helper_div_pan.html
+    helper_drag_click.html
+    helper_drag_scroll.html
+    helper_iframe_pan.html
     helper_iframe1.html
     helper_iframe2.html
+    helper_long_tap.html
+    helper_scroll_inactive_perspective.html
+    helper_scroll_inactive_zindex.html
+    helper_scroll_on_position_fixed.html
+    helper_scrollto_tap.html
     helper_subframe_style.css
-    helper_basic_pan.html
-    helper_div_pan.html
-    helper_iframe_pan.html
-    helper_scrollto_tap.html
+    helper_tall.html
     helper_tap.html
-    helper_long_tap.html
-    helper_scroll_on_position_fixed.html
+    helper_tap_fullzoom.html
     helper_tap_passive.html
-    helper_click.html
-    helper_drag_click.html
-    helper_bug1271432.html
     helper_touch_action.html
     helper_touch_action_regions.html
-    helper_scroll_inactive_perspective.html
-    helper_scroll_inactive_zindex.html
-    helper_bug1280013.html
-    helper_tall.html
-    helper_drag_scroll.html
     helper_touch_action_complex.html
-    helper_tap_fullzoom.html
-    helper_bug1162771.html
-    helper_bug1299195.html
   tags = apz
 [test_bug982141.html]
 [test_bug1151663.html]
+[test_bug1151667.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_bug1253683.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
 [test_bug1277814.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
-[test_wheel_scroll.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
-[test_wheel_transactions.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
-[test_bug1151667.html]
-  skip-if = (os == 'android') || (os == 'b2g') # wheel events not supported on mobile
-[test_layerization.html]
-  skip-if = (os == 'android') || (os == 'b2g') # uses wheel events which are not supported on mobile
-[test_scroll_inactive_flattened_frame.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
-[test_scroll_inactive_bug1190112.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
-[test_scroll_subframe_scrollbar.html]
-  skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_bug1304689.html]
+[test_bug1304689-2.html]
 [test_frame_reconstruction.html]
-[test_interrupted_reflow.html]
+[test_group_mouseevents.html]
+  skip-if = (toolkit == 'android') # mouse events not supported on mobile
+[test_group_pointerevents.html]
 [test_group_touchevents.html]
 [test_group_wheelevents.html]
   skip-if = (toolkit == 'android') # wheel events not supported on mobile
-[test_group_mouseevents.html]
-  skip-if = (toolkit == 'android') # mouse events not supported on mobile
+[test_group_zoom.html]
+  skip-if = (toolkit != 'android') # only android supports zoom
+[test_interrupted_reflow.html]
+[test_layerization.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_scroll_inactive_bug1190112.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_scroll_inactive_flattened_frame.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_scroll_subframe_scrollbar.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
 [test_touch_listeners_impacting_wheel.html]
   skip-if = (toolkit == 'android') || (toolkit == 'cocoa') # wheel events not supported on mobile, and synthesized wheel smooth-scrolling not supported on OS X
-[test_bug1253683.html]
-  skip-if = (os == 'android') || (os == 'b2g') # uses wheel events which are not supported on mobile
-[test_group_zoom.html]
-  skip-if = (toolkit != 'android') # only android supports zoom
-[test_group_pointerevents.html]
-[test_bug1304689.html]
-[test_bug1304689-2.html]
+[test_wheel_scroll.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile
+[test_wheel_transactions.html]
+  skip-if = (os == 'android') # wheel events not supported on mobile

--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -33,17 +33,17 @@ load 385719-1.html
 load 389326-1.html
 load 390476.html
 load 393746-1.xhtml
 load 393749-1.html
 load 393822-1.html
 load 394384-1.html
 load 394246-1.html
 load 394246-2.html
-skip-if(Android||B2G) load 394751.xhtml # bug 922976
+skip-if(Android) load 394751.xhtml # bug 922976
 load 395335-1.xhtml
 load 395458-1.html
 load 396321-1.svg
 load 398042-1.xhtml
 load 398042-2.xhtml
 load 402307-1.html
 load 403464-1.html
 load 404112-1.html
@@ -107,17 +107,17 @@ load 766452-1.html
 load 766452-2.html
 load 768079-1.html
 load 783041-1.html
 load 783041-2.html
 load 783041-3.html
 load 783041-4.html
 load 798853.html # bug 868792
 load 805760-1.html
-skip-if(Android||B2G) load 815489.html # bug 871763, 1216304
+skip-if(Android) load 815489.html # bug 1216304
 load 836225-1.html
 load 839745-1.html
 load 856784-1.html
 load 893572-1.html
 load 893572-2.html
 load 893572-3.html
 load 893572-4.html
 pref(layers.force-active,true) load 914457-1.html

--- a/gfx/tests/mochitest/mochitest.ini
+++ b/gfx/tests/mochitest/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 
 [test_acceleration.html]
 subsuite = gpu
 fail-if = (os == "win" && os_version == "5.1" && e10s) # Bug 1253862
 [test_bug509244.html]
 [test_bug513439.html]
 [test_font_whitelist.html]
 [test_overdraw.html]

--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@@ -1,9 +1,9 @@
 # 468496-1 will also detect bugs in video drivers.
 == 468496-1.html 468496-1-ref.html
 fuzzy(175,443) == 611498-1.html 611498-ref.html
-skip-if(B2G) fuzzy-if(Android,8,1000) == 709477-1.html 709477-1-ref.html # bug 773482
+fuzzy-if(Android,8,1000) == 709477-1.html 709477-1-ref.html
 skip-if(!asyncPan) == 1086723.html 1086723-ref.html
 == 853889-1.html 853889-1-ref.html
 skip-if(Android) fuzzy-if(skiaContent,1,587) == 1143303-1.svg pass.svg
 fuzzy(100,30) == 1149923.html 1149923-ref.html # use fuzzy due to few distorted pixels caused by border-radius
 == 1131264-1.svg pass.svg

--- a/gfx/tests/unit/xpcshell.ini
+++ b/gfx/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = 
 tail = 
-skip-if = toolkit == 'gonk'
 
 [test_nsIScriptableRegion.js]