--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -4588,16 +4588,17 @@ skip-if = (os == 'android' || os == 'lin
 [generated/test_2_conformance2__state__gl-get-calls.html]
 fail-if = (os == 'mac')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance2__state__gl-getstring.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance2__state__gl-object-get-calls.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance2__transform_feedback__transform_feedback.html]
+fail-if = (os == 'win' && (os_version == '6.1' || os_version == '6.2' || os_version == '10.0'))
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance2__vertex_arrays__vertex-array-object.html]
 fail-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
@@ -4787,52 +4788,42 @@ skip-if = (os == 'android' || os == 'lin
 [generated/test_2_conformance__glsl__bugs__temp-expressions-should-not-crash.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__bugs__undefined-index-should-not-crash.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__bugs__uniforms-should-not-lose-values.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec2.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec3.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec4.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec2.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec3.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec4.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-mat2.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__constructors__glsl-construct-mat3.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__constructors__glsl-construct-mat4.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-index.html]
 skip-if = (os == 'mac') || (os == 'win') || (os == 'linux') || (os == 'android') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec2.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec3.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__functions__glsl-function-abs.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__functions__glsl-function-acos.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__functions__glsl-function-asin.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))
 [generated/test_2_conformance__glsl__functions__glsl-function-atan-xy.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1'))

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -623,58 +623,50 @@ skip-if = (os == 'win')
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_2_conformance__context__context-attribute-preserve-drawing-buffer.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec2.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec3.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-bvec4.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec2.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec3.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec4.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec2.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec3.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-fail-if = (os == 'win' && os_version == '6.2')
 [generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_2_conformance__canvas__drawingbuffer-static-canvas-test.html]
 # Framebuffer size can't be GL_MAX_RENDERBUFFER_SIZE
 skip-if = (os == 'win' && os_version == '6.2')
+[generated/test_2_conformance2__transform_feedback__transform_feedback.html]
+fail-if = (os == 'win' && (os_version == '6.1' || os_version == '6.2' || os_version == '10.0'))
 
 ####################
 # failure on Windows
 [generated/test_2_conformance__canvas__rapid-resizing.html]
 fail-if = (os == 'win' && os_version == '5.1')
 [generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
 fail-if = (os == 'win' && os_version == '5.1')