old mode 100644
new mode 100755
--- a/dom/canvas/test/webgl-conf/generate-wrappers-and-manifest.py
+++ b/dom/canvas/test/webgl-conf/generate-wrappers-and-manifest.py
@@ -14,17 +14,19 @@ WRAPPER_TEMPLATE_FILE = 'mochi-wrapper.h
 MANIFEST_TEMPLATE_FILE = 'mochitest.ini.template'
 ERRATA_FILE = 'mochitest-errata.ini'
 DEST_MANIFEST_PATHSTR = 'generated-mochitest.ini'
 
 BASE_TEST_LIST_PATHSTR = 'checkout/00_test_list.txt'
 GENERATED_PATHSTR = 'generated'
 WEBGL2_TEST_MANGLE = '2_'
 PATH_SEP_MANGLING = '__'
-WEBGL2_SKIP_IF_CONDITION = "(os == 'android' || os == 'linux')"
+WEBGL2_SKIP_IF_CONDITION = "(os == 'android' || os == 'linux' || " \
+                           "(os == 'win' && os_version == '5.1') || " \
+                           "(os == 'win' && os_version == '6.2'))"
 
 SUPPORT_DIRS = [
     'checkout',
 ]
 
 EXTRA_SUPPORT_FILES = [
     'always-fail.html',
     'iframe-passthrough.css',

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -271,17 +271,18 @@ fail-if = (os == 'android') || (os == 'l
 # Causes consistent *blues*: "DMError: Remote Device Error: unable to
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 # Crashes near on B2G ICS Emulator.
 skip-if = (os == 'android') || (os == 'linux')
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__texture-upload-size.html]
 # application crashed [@ mozilla::WebGLTexture::TexSubImage]
 skip-if = (os == 'win' && debug) || (os == 'android')
-fail-if =(os == 'win')
+# Only got failures on window 7
+fail-if = (os == 'win' && os_version == '6.1')
 
 ########################################################################
 ########################################################################
 # Android
 
 [generated/test_conformance__attribs__gl-disabled-vertex-attrib.html]
 fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-float.html]
@@ -698,16 +699,19 @@ skip-if = (os == 'win')
 # application crashed [@ nvoglv32.dll + 0x999512]
 skip-if = (os == 'win')
 [generated/test_2_conformance2__attribs__gl-vertex-attrib-i-render.html]
 # timed out crash
 skip-if = (os == 'win')
 [generated/test_2_conformance__canvas__canvas-test.html]
 # this test is not always passed every time on opt and debug build
 skip-if = (os == 'win')
+[generated/test_2_conformance__canvas__to-data-url-test.html]
+# TEST-UNEXPECTED-ERROR: Assertion count 1 is greater than expected range 0-0 assertions
+skip-if = (os == 'win')
 
 ####################
 # failure on Windows
 [generated/test_conformance__rendering__point-specific-shader-variables.html]
 fail-if = (os == 'win')
 [generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance__glsl__constructors__glsl-construct-ivec2.html]
@@ -731,18 +735,16 @@ fail-if = (os == 'win')
 [generated/test_2_conformance2__glsl3__short-circuiting-in-loop-condition.html]
 fail-if = (os == 'win')
 [generated/test_2_conformance2__textures__image__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb16f-rgb-half_float.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance__canvas__rapid-resizing.html]
 fail-if = (os == 'win')
-[generated/test_2_conformance__canvas__to-data-url-test.html]
-fail-if = (os == 'win')
 [generated/test_2_conformance2__textures__svg_image__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
 fail-if = (os == 'win')
 [generated/test_2_conformance2__textures__image_data__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
 fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__textures__image__tex-2d-rg8-rg-unsigned_byte.html]
 fail-if = (os == 'win' && !debug)