diff --git a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
index 0214ebf2e6d..5cd6d94dd64 100644
--- a/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
+++ b/tests/wpt/metadata/html/dom/reflection-embedded.html.ini
@@ -1,7 +1,7 @@
 [reflection-embedded.html]
   type: testharness
   disabled:
-    if os == "osx": https://github.com/servo/servo/issues/11100
+    if os == "mac": https://github.com/servo/servo/issues/11100
   [img.dir: typeof IDL attribute]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/canvas/to-data-url-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/canvas/to-data-url-test.html.ini
index 40eff011db1..11c670ec1ab 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/canvas/to-data-url-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/canvas/to-data-url-test.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/constants-and-properties.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/constants-and-properties.html.ini
index a4e03812036..678d0b3b207 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/constants-and-properties.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/constants-and-properties.html.ini
@@ -1,5 +1,5 @@
 [constants-and-properties.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
index 8fcc9000b60..4ffd392fe67 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
index c6642811124..00aad957000 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
@@ -1,7 +1,7 @@
 [context-attributes-alpha-depth-stencil-antialias.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: gl = getWebGL(1, 1, null, [ 0, 0, 0, 0 \], 1, 0) should be non-null. Was null]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
index 6f9b1392851..1b7cd37a3da 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
index 0e91a8d7602..8e4ce10380d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
index 43b0a285e2d..be0dbc8c0ac 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
@@ -1,7 +1,7 @@
 [context-eviction-with-garbage-collection.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: program != null should be true. Was false.]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html.ini
index 00680d2fa7a..594c48aaffb 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html.ini
@@ -1,5 +1,5 @@
 [context-hidden-alpha.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost-restored.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost-restored.html.ini
index baba2b45532..adda8b8b6a1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost-restored.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost-restored.html.ini
@@ -1,5 +1,5 @@
 [context-lost-restored.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
index 9ad2e949d6b..d40dc369138 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-lost.html.ini
@@ -1,7 +1,7 @@
 [context-lost.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: gl.isContextLost() should be false. Threw exception TypeError: gl.isContextLost is not a function]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-upon-reload.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-upon-reload.html.ini
index cc634c2da1f..477e59cb772 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-upon-reload.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-upon-reload.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
index 9139c9f08f1..f177cdceb1a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-type-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-type-test.html.ini
index 3412bbb5c70..43e33a30281 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-type-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/context-type-test.html.ini
@@ -1,5 +1,5 @@
 [context-type-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/incorrect-context-object-behaviour.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/incorrect-context-object-behaviour.html.ini
index d5aa4a36c68..32069b4ed0f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/incorrect-context-object-behaviour.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/incorrect-context-object-behaviour.html.ini
@@ -1,7 +1,7 @@
 [incorrect-context-object-behaviour.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: contextA.compileShader(shaderB)]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
index 1a8c41785d2..9a33c26ff30 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/methods.html.ini
@@ -1,7 +1,7 @@
 [methods.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Property either does not exist or is not a function: checkFramebufferStatus]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
index 38e1f4423dd..9623ab3b0e0 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/premultiplyalpha-test.html.ini
@@ -1,7 +1,7 @@
 [premultiplyalpha-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/resource-sharing-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/resource-sharing-test.html.ini
index 4db46ef1480..8931c2b92f1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/resource-sharing-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/context/resource-sharing-test.html.ini
@@ -1,7 +1,7 @@
 [resource-sharing-test.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: attempt to use a resource from the wrong context should fail with INVALID_OPERATION]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays-out-of-bounds.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays-out-of-bounds.html.ini
index fb6e91e96dd..f5c3b343f16 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays-out-of-bounds.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays-out-of-bounds.html.ini
@@ -1,5 +1,5 @@
 [angle-instanced-arrays-out-of-bounds.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays.html.ini
index 0d275f64342..8593a9e88b8 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/angle-instanced-arrays.html.ini
@@ -1,5 +1,5 @@
 [angle-instanced-arrays.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-blend-minmax.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-blend-minmax.html.ini
index 8b9241600a1..7b8b6325b4b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-blend-minmax.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-blend-minmax.html.ini
@@ -1,7 +1,7 @@
 [ext-blend-minmax.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: getError expected: INVALID_ENUM. Was NO_ERROR : after evaluating: gl.blendEquation(MIN_EXT)]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-frag-depth.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-frag-depth.html.ini
index 3bab3920ca7..cf7a90b6689 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-frag-depth.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-frag-depth.html.ini
@@ -1,7 +1,7 @@
 [ext-frag-depth.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-sRGB.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-sRGB.html.ini
index 0b16af72377..c89c1acb856 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-sRGB.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-sRGB.html.ini
@@ -1,7 +1,7 @@
 [ext-sRGB.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-shader-texture-lod.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-shader-texture-lod.html.ini
index f70492c7cd5..9f23d9219ef 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-shader-texture-lod.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-shader-texture-lod.html.ini
@@ -1,7 +1,7 @@
 [ext-shader-texture-lod.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html.ini
index 28d84855865..39825a7d9b6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html.ini
@@ -1,7 +1,7 @@
 [ext-texture-filter-anisotropic.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-standard-derivatives.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-standard-derivatives.html.ini
index e4e57076644..074a9cf0a00 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-standard-derivatives.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-standard-derivatives.html.ini
@@ -1,7 +1,7 @@
 [oes-standard-derivatives.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-texture-float-linear.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-texture-float-linear.html.ini
index ff49df01169..c3dbd940efd 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-texture-float-linear.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/extensions/oes-texture-float-linear.html.ini
@@ -1,7 +1,7 @@
 [oes-texture-float-linear.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini
index a3b5826e632..b1c9784d3d7 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-ivec3-return-value.frag.html.ini
@@ -1,7 +1,7 @@
 [shader-with-ivec3-return-value.frag.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
   [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) Shader with ivec3 return value from function call should succeed]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini
index 4880ab860ea..7068707a1a5 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-long-line.html.ini
@@ -1,7 +1,7 @@
 [shader-with-long-line.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
+    if os == "mac": CRASH
   [WebGL test #0: [unexpected vertex shader compile status\] (expected: true) shader that uses long lines should succeed]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
index fa6315142ba..2dc8b16d510 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
@@ -2,7 +2,6 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
-    if os == "osx": CRASH
   [WebGL test #9: gl.isShader(vertexShader) should be true. Threw exception TypeError: gl.isShader is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini
index 499147bb3cf..4c88a94df5b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/more/conformance/quickCheckAPI-G_I.html.ini
@@ -3,5 +3,5 @@
   disabled: https://github.com/servo/servo/issues/10656
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
index f6c104283a2..c86bc3bb37e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
@@ -1,7 +1,6 @@
 [gl-geterror.html]
   type: testharness
   expected:
-    if os == "osx": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini
index 79a7fe62473..86bdba59d8b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d-bad-args.html.ini
@@ -1,7 +1,6 @@
 [tex-sub-image-2d-bad-args.html]
   type: testharness
   expected:
-    if os == "osx": CRASH
     if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): CRASH
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
index e1efb39e003..5ebb3219b43 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-npot-video.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): TIMEOUT
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini
index 9583bdfc1a5..e921f03979d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/typedarrays/data-view-test.html.ini
@@ -2,4 +2,3 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
index 7c106c017d3..ff5f1ebedb2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "osx": TIMEOUT
+    if os == "mac": TIMEOUT
     if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): TIMEOUT