--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -3055,17 +3055,17 @@ skip-if = (os == 'android')
 [generated/test_conformance__rendering__gl-drawarrays.html]
 [generated/test_conformance__rendering__gl-drawelements.html]
 [generated/test_conformance__rendering__gl-scissor-canvas-dimensions.html]
 [generated/test_conformance__rendering__gl-scissor-fbo-test.html]
 [generated/test_conformance__rendering__gl-scissor-test.html]
 [generated/test_conformance__rendering__gl-viewport-test.html]
 [generated/test_conformance__rendering__line-loop-tri-fan.html]
 [generated/test_conformance__rendering__many-draw-calls.html]
-skip-if = (os == 'android')
+skip-if = (os == 'android') || debug
 [generated/test_conformance__rendering__more-than-65536-indices.html]
 [generated/test_conformance__rendering__multisample-corruption.html]
 skip-if = (os == 'mac') || (os == 'android')
 [generated/test_conformance__rendering__negative-one-index.html]
 [generated/test_conformance__rendering__point-no-attributes.html]
 [generated/test_conformance__rendering__point-size.html]
 [generated/test_conformance__rendering__point-with-gl-pointcoord-in-fragment-shader.html]
 [generated/test_conformance__rendering__polygon-offset.html]

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -238,18 +238,19 @@ skip-if = (os == 'android')
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__floored-division-accuracy.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__variables__gl-fragcoord.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__rendering__many-draw-calls.html]
-# Crashes
-skip-if = (os == 'android')
+# Crashes on Android
+# Times-out on DEBUG builds
+skip-if = (os == 'android') || debug
 [generated/test_conformance__textures__tex-image-webgl.html]
 # Crashes
 skip-if = (os == 'android')
 [generated/test_conformance__uniforms__out-of-bounds-uniform-array-access.html]
 # Crashes
 skip-if = (os == 'android') || (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__samplers__glsl-function-texture2dproj.html]
 # Crashes