--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -315,18 +315,247 @@ skip-if = (os == 'linux')
 # Intermittent crash on OSX.
 skip-if = (os == 'mac')
 [generated/test_conformance__canvas__viewport-unchanged-upon-resize.html]
 # New OSX r7 machines and 10.10.5 is causing perma failure (bug 1216549)
 skip-if = (os == 'mac')
 [generated/test_conformance__rendering__multisample-corruption.html]
 # application crashed [@ gldAttachDrawable + 0x9e0]. Also crash on Android.
 skip-if = (os == 'mac') || (os == 'android')
+[generated/test_conformance__textures__misc__origin-clean-conformance.html]
+# application crashed
+skip-if = (os == 'mac')
+####################
+# Timeout
+[generated/test_conformance2__textures__canvas__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r11f_g11f_b10f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r16f-red-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r16f-red-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r32f-red-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r8-red-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-r8ui-red_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rg16f-rg-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rg16f-rg-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rg32f-rg-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rg8-rg-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rg8ui-rg_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb16f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb16f-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb32f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb565-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb9_e5-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgb9_e5-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba16f-rgba-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba16f-rgba-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba32f-rgba-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba4-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-srgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r11f_g11f_b10f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r11f_g11f_b10f-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r16f-red-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r16f-red-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r32f-red-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r8-red-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-r8ui-red_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rg16f-rg-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rg16f-rg-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rg32f-rg-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rg8-rg-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rg8ui-rg_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb16f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb16f-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb32f-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb565-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb565-rgb-unsigned_short_5_6_5.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb5_a1-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb8ui-rgb_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb9_e5-rgb-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgb9_e5-rgb-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba16f-rgba-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba16f-rgba-half_float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba32f-rgba-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba4-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba4-rgba-unsigned_short_4_4_4_4.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-rgba8ui-rgba_integer-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-srgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__image_bitmap_from_image_bitmap__tex-3d-srgb8_alpha8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__image_bitmap_from_image_bitmap__tex-2d-rgb-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__image_bitmap_from_image_bitmap__tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__image_bitmap_from_image_bitmap__tex-2d-rgba-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__image_bitmap_from_image_bitmap__tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__image_bitmap_from_image_bitmap__tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
+skip-if = (os == 'mac')
 
 ####################
+# failures
+[generated/test_conformance2__buffers__buffer-copying-contents.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__buffers__buffer-copying-restrictions.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__buffers__buffer-type-restrictions.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__extensions__ext-color-buffer-float.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__glsl3__forbidden-operators.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__glsl3__shader-with-1024-character-define.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__glsl3__shader-with-1024-character-identifier.frag.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__misc__expando-loss-2.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__misc__instanceof-test.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__misc__uninitialized-test-2.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__reading__read-pixels-from-fbo-test.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__reading__read-pixels-pack-parameters.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__rendering__draw-buffers.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__samplers__sampler-drawing-test.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__samplers__samplers.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__state__gl-get-calls.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__state__gl-object-get-calls.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__compressed-tex-image.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__copy-texture-image.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__gl-get-tex-parameter.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__tex-mipmap-levels.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__tex-storage-compressed-formats.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__misc__tex-unpack-params.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-rgb565-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-rgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-rgba4-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-rgba8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-srgb8-rgb-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__textures__video__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__attribs__gl-vertexattribpointer.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__buffers__buffer-data-and-buffer-sub-data.html]
+skip-if = (os == 'mac')
+[generated/test_conformance2__vertex_arrays__vertex-array-object.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__canvas__to-data-url-test.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__misc__bad-arguments-test.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__misc__cube-incomplete-fbo.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__misc__tex-sub-image-2d-bad-args.html]
+skip-if = (os == 'mac')
+[generated/test_conformance__textures__misc__texture-copying-feedback-loops.html]
+skip-if = (os == 'mac')
+####################
 # 10.6
 [generated/test_conformance__glsl__constructors__glsl-construct-mat3.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__constructors__glsl-construct-mat4.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__matrices__glsl-mat4-to-mat3.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 [generated/test_conformance__glsl__misc__glsl-function-nodes.html]