diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index 0d8bc69cb77..ab0a2fd399e 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -333,6 +333,14 @@ impl WebGLThread {
                         Ok(msg) => {
                             let exit = self.handle_msg(msg, &webgl_chan);
                             if exit {
+                                // Call remove_context functions in order to correctly delete WebRender image keys.
+                                let context_ids: Vec<WebGLContextId> = self.contexts.keys().map(|id| *id).collect();
+                                for id in context_ids {
+                                    self.remove_webgl_context(id);
+                                }
+
+                                // Block on shutting-down WebRender.
+                                self.webrender_api.shut_down(true);
                                 return;
                             }
                         }
@@ -1101,16 +1109,6 @@ impl WebGLThread {
     }
 }
 
-impl Drop for WebGLThread {
-    fn drop(&mut self) {
-        // Call remove_context functions in order to correctly delete WebRender image keys.
-        let context_ids: Vec<WebGLContextId> = self.contexts.keys().map(|id| *id).collect();
-        for id in context_ids {
-            self.remove_webgl_context(id);
-        }
-    }
-}
-
 /// Helper struct to store cached WebGLContext information.
 struct WebGLContextInfo {
     /// Currently used WebRender image key.
diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini
index 6ea855e6f72..fda6cf1d15d 100644
--- a/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/renderbuffers/framebuffer-object-attachment.html.ini
@@ -1,6 +1,6 @@
 [framebuffer-object-attachment.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
   [WebGL test #45: getError expected: NO_ERROR. Was INVALID_ENUM : ]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini
index 74a111f34ed..e3ee5f5c492 100644
--- a/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/renderbuffers/invalidate-framebuffer.html.ini
@@ -2,7 +2,7 @@
   bug: https://github.com/servo/servo/issues/20529
   expected:
     if os == "linux": ERROR
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
   [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini b/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini
index df42b4866c9..ceb81c8ddb2 100644
--- a/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/renderbuffers/readbuffer.html.ini
@@ -1,2 +1,2 @@
 [readbuffer.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini
index 2a21dac4e5c..1e8a9ac768f 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/read-draw-when-missing-image.html.ini
@@ -1,2 +1,2 @@
 [read-draw-when-missing-image.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini b/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini
index 1d2f20d21b7..6d16639f415 100644
--- a/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/state/gl-object-get-calls.html.ini
@@ -1,7 +1,7 @@
 [gl-object-get-calls.html]
   bug: https://github.com/servo/servo/issues/26128
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
 
   [WebGL test #201: gl.getTexParameter(gl.TEXTURE_2D, gl.TEXTURE_WRAP_R) should be 33071 (of type number). Was null (of type object).]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini
index 26a2a4ad713..f02f5a873db 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r11f_g11f_b10f-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini
index 89a925e0ab1..75972d47136 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini
index 40ed6b72206..14392214e24 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r16f-red-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r16f-red-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini
index 19ad01a3404..8a6579a08a6 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r32f-red-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r32f-red-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini
index 58870f641d2..cffb342d433 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8-red-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r8-red-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini
index 54138aef04c..5a03be8230d 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-r8ui-red_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-r8ui-red_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini
index cf622d08cea..21625030b22 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg16f-rg-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg16f-rg-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini
index bb09913d6e1..f8bbd852216 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg32f-rg-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg32f-rg-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini
index 8da99edb7de..45f817f7dc1 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8-rg-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg8-rg-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini
index 0b616fcd3a3..3676c21495f 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rg8ui-rg_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rg8ui-rg_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini
index 1f63cd85b42..e096610398b 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb10_a2-rgba-unsigned_int_2_10_10_10_rev.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini
index 3330449255f..dfbd1ef1c05 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb16f-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb16f-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini
index 59c5e18e3ae..1c55a127980 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb565-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini
index 275e606626d..978853e9ac4 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini
index 6b6aaf63e65..113eeaa1d59 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb5_a1-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini
index b1f2d170035..8d4e5240d7e 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini
index 2f5225a6965..729ef4788c9 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb8-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini
index 2170ee52d4d..472b6b93dbe 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb8ui-rgb_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini
index ae67bf1da59..d5e7da70dbd 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgb9_e5-rgb-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgb9_e5-rgb-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini
index 3c704931fc4..7e75f62f78c 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba16f-rgba-float.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba16f-rgba-float.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini
index 28112e8ef6b..6c28a250139 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba4-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini
index b72f3aa640c..1ba4d968e57 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini
index cd72d1ad5cb..21eb55b9611 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini
index 00c1ff482e9..c3b892371d8 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8-rgb-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-srgb8-rgb-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini
index 87a3fb33e8b..08396866075 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/image/tex-2d-srgb8_alpha8-rgba-unsigned_byte.html.ini
@@ -1,4 +1,4 @@
 [tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini
index 54541fa3141..e4626b95d88 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image-same-texture.html.ini
@@ -1,2 +1,2 @@
 [copy-texture-image-same-texture.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini
index a4492f17879..47761bb536b 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/copy-texture-image.html.ini
@@ -1,2 +1,2 @@
 [copy-texture-image.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini
index c3ea537d8ba..e4f7defc367 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html.ini
@@ -1,4 +1,4 @@
 [tex-image-with-bad-args-from-dom-elements.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini
index cee75443930..4818e33705d 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-bad-args.html.ini
@@ -1,5 +1,5 @@
 [tex-image-with-bad-args.html]
-  expected: TIMEOUT
+  expected: CRASH
   [WebGL test #5: getError expected: INVALID_OPERATION. Was INVALID_ENUM : TexImage2D taking LUMINANCE_ALPHA/LUMINANCE_ALPHA/HALF_FLOAT]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini
index 76c0beb6d30..aadaec76d99 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-image-with-different-data-source.html.ini
@@ -1,4 +1,4 @@
 [tex-image-with-different-data-source.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini
index cba13478f8f..2e6c673ed08 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html.ini
@@ -1,4 +1,4 @@
 [tex-unpack-params-with-flip-y-and-premultiply-alpha.html]
   expected:
-    if os == "mac": TIMEOUT
+    if os == "mac": CRASH
     if os == "linux": CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini b/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini
index 22cfa4430c4..6f0c3ed644d 100644
--- a/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/textures/misc/texture-npot.html.ini
@@ -1,2 +1,2 @@
 [texture-npot.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
index 3cc868c9d8d..7c2dd76453d 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/switching-objects.html.ini
@@ -1,2 +1,2 @@
 [switching-objects.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini b/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini
index 32055007d4e..087ab66dcda 100644
--- a/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/uniforms/incompatible-texture-type-for-sampler.html.ini
@@ -1,2 +1,2 @@
 [incompatible-texture-type-for-sampler.html]
-  expected: TIMEOUT
+  expected: CRASH