--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -4929,17 +4929,17 @@ skip-if = (os == 'android' || os == 'lin
 fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-filter-srgb.html]
 fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-multisampled-readbuffer.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-outside-readbuffer.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-scissor-enabled.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-size-overflow.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-srgb-and-linear-drawbuffers.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__rendering__blitframebuffer-stencil-only.html]
@@ -5613,17 +5613,17 @@ fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__misc__tex-input-validation.html]
 skip-if = (os == 'win') || (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-mipmap-levels.html]
 fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-new-formats.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-srgb-mipmap.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-storage-2d.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-storage-and-subimage-3d.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-storage-compressed-formats.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance2__textures__misc__tex-unpack-params.html]
@@ -7610,17 +7610,16 @@ fail-if = (os == 'mac') || (os == 'linux
 skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_conformance__extensions__webgl-debug-renderer-info.html]
 [generated/test_conformance__extensions__webgl-debug-shaders.html]
 [generated/test_conformance__extensions__webgl-depth-texture.html]
 [generated/test_conformance__extensions__webgl-draw-buffers-framebuffer-unsupported.html]
 [generated/test_conformance__extensions__webgl-draw-buffers-max-draw-buffers.html]
 [generated/test_conformance__extensions__webgl-draw-buffers.html]
 skip-if = (os == 'linux')
-fail-if = (os == 'win')
 [generated/test_conformance__extensions__webgl-shared-resources.html]
 [generated/test_conformance__glsl__bugs__angle-ambiguous-function-call.html]
 [generated/test_conformance__glsl__bugs__angle-constructor-invalid-parameters.html]
 [generated/test_conformance__glsl__bugs__angle-d3d11-compiler-error.html]
 [generated/test_conformance__glsl__bugs__angle-dx-variable-bug.html]
 [generated/test_conformance__glsl__bugs__array-of-struct-with-int-first-position.html]
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__bool-type-cast-bug-int-float.html]

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -75,17 +75,16 @@ skip-if = (os == 'win')
 # Complicated
 
 [generated/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
 fail-if = (os == 'mac' && os_version == '10.6')
 # Asserts on 'B2G ICS Emulator Debug' and linux debug. Crashes on Android.
 skip-if = (os == 'b2g') || (os == 'linux') || (os == 'android')
 
 [generated/test_conformance__extensions__webgl-draw-buffers.html]
-fail-if = (os == 'win')
 # Crashes
 skip-if = (os == 'linux')
 
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec3.html]
 # Crashes from libglsl.so
 # application crashed [@ jemalloc_crash] on Android
 skip-if = (os == 'linux') || (os == 'mac') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec4.html]
@@ -199,27 +198,27 @@ fail-if = (os == 'android') || (os == 'l
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-type-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__glsl3__tricky-loop-conditions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__views-with-offsets.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__rendering__blitframebuffer-outside-readbuffer.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
 [generated/test_2_conformance2__rendering__clear-func-buffer-type-match.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__rendering__fs-color-type-mismatch-color-buffer-type.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__misc__copy-texture-image.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__misc__integer-cubemap-specification-order-bug.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__misc__tex-srgb-mipmap.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__video__tex-2d-r11f_g11f_b10f-rgb-float.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__video__tex-2d-rg16f-rg-float.html]
 fail-if = (os == 'mac') || (os == 'win')