diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 449fda3b7ea..6da269d61cb 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -344,12 +344,17 @@ class CGMethodCall(CGThing):
 
             distinguishingIndex = method.distinguishingIndexForArgCount(argCount)
 
-            # We can't handle unions at the distinguishing index.
+            # We can't handle unions of non-object values at the distinguishing index.
             for (returnType, args) in possibleSignatures:
-                if args[distinguishingIndex].type.isUnion():
-                    raise TypeError("No support for unions as distinguishing "
-                                    "arguments yet: %s",
-                                    args[distinguishingIndex].location)
+                type = args[distinguishingIndex].type
+                if type.isUnion():
+                    if type.nullable():
+                        type = type.inner
+                    for type in type.flatMemberTypes:
+                        if not (type.isObject() or type.isNonCallbackInterface()):
+                            raise TypeError("No support for unions with non-object variants "
+                                            "as distinguishing arguments yet: %s",
+                                            args[distinguishingIndex].location)
 
             # Convert all our arguments up to the distinguishing index.
             # Doesn't matter which of the possible signatures we use, since
@@ -388,6 +393,7 @@ class CGMethodCall(CGThing):
             interfacesSigs = [
                 s for s in possibleSignatures
                 if (s[1][distinguishingIndex].type.isObject() or
+                    s[1][distinguishingIndex].type.isUnion() or
                     s[1][distinguishingIndex].type.isNonCallbackInterface())]
             # There might be more than one of these; we need to check
             # which ones we unwrap to.
@@ -2366,7 +2372,6 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config):
         'dom::bindings::conversions::ConversionBehavior',
         'dom::bindings::conversions::StringificationBehavior',
         'dom::bindings::conversions::root_from_handlevalue',
-        'dom::bindings::error::throw_not_in_union',
         'std::ptr::NonNull',
         'dom::bindings::mozmap::MozMap',
         'dom::bindings::root::DomRoot',
@@ -4450,8 +4455,8 @@ class CGUnionConversionStruct(CGThing):
                 other.append(booleanConversion[0])
             conversions.append(CGList(other, "\n\n"))
         conversions.append(CGGeneric(
-            "throw_not_in_union(cx, \"%s\");\n"
-            "Err(())" % ", ".join(names)))
+            "Ok(ConversionResult::Failure(\"argument could not be converted to any of: %s\".into()))" % ", ".join(names)
+        ))
         method = CGWrapper(
             CGIndenter(CGList(conversions, "\n\n")),
             pre="unsafe fn from_jsval(cx: *mut JSContext,\n"
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index c953df65c1d..7c68de0df18 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -255,14 +255,6 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext, dispatch_event: bool)
     }
 }
 
-/// Throw an exception to signal that a `JSVal` can not be converted to any of
-/// the types in an IDL union type.
-pub unsafe fn throw_not_in_union(cx: *mut JSContext, names: &'static str) {
-    assert!(!JS_IsExceptionPending(cx));
-    let error = format!("argument could not be converted to any of: {}", names);
-    throw_type_error(cx, &error);
-}
-
 /// Throw an exception to signal that a `JSObject` can not be converted to a
 /// given DOM type.
 pub unsafe fn throw_invalid_this(cx: *mut JSContext, proto_id: u16) {
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index 811fc100e6b..69ef20e4fc2 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -240,14 +240,18 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
         self.base.GenerateMipmap(target)
     }
 
-    #[allow(unsafe_code)]
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
-    unsafe fn BufferData(&self, cx: *mut JSContext, target: u32, data: *mut JSObject, usage: u32) -> Fallible<()> {
-        self.base.BufferData(cx, target, data, usage)
+    fn BufferData(
+        &self,
+        target: u32,
+        data: Option<ArrayBufferViewOrArrayBuffer>,
+        usage: u32,
+    ) {
+        self.base.BufferData(target, data, usage)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
-    fn BufferData_(&self, target: u32, size: i64, usage: u32) -> Fallible<()> {
+    fn BufferData_(&self, target: u32, size: i64, usage: u32) {
         self.base.BufferData_(target, size, usage)
     }
 
diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs
index 66a3ce0af40..d874cc7a73a 100644
--- a/components/script/dom/webglbuffer.rs
+++ b/components/script/dom/webglbuffer.rs
@@ -154,6 +154,7 @@ impl WebGLBuffer {
 
 impl Drop for WebGLBuffer {
     fn drop(&mut self) {
-        self.delete();
+        self.mark_for_deletion();
+        assert!(self.is_deleted());
     }
 }
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 4aa6c047a1b..546a0950ea4 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -1165,14 +1165,16 @@ impl WebGLRenderingContext {
             return
         );
 
+        let array_buffer = handle_potential_webgl_error!(
+            self,
+            self.current_vao().element_array_buffer().get().ok_or(InvalidOperation),
+            return
+        );
+
         if count > 0 && primcount > 0 {
-            if let Some(array_buffer) = self.current_vao().element_array_buffer().get() {
-                // This operation cannot overflow in u64 and we know all those values are nonnegative.
-                let val = offset as u64 + (count as u64 * type_size as u64);
-                if val > array_buffer.capacity() as u64 {
-                    return self.webgl_error(InvalidOperation);
-                }
-            } else {
+            // This operation cannot overflow in u64 and we know all those values are nonnegative.
+            let val = offset as u64 + (count as u64 * type_size as u64);
+            if val > array_buffer.capacity() as u64 {
                 return self.webgl_error(InvalidOperation);
             }
         }
@@ -1324,19 +1326,6 @@ impl Drop for WebGLRenderingContext {
     }
 }
 
-#[allow(unsafe_code)]
-unsafe fn fallible_array_buffer_view_to_vec(
-    cx: *mut JSContext,
-    abv: *mut JSObject,
-) -> Result<Vec<u8>, Error> {
-    assert!(!abv.is_null());
-    typedarray!(in(cx) let array_buffer_view: ArrayBufferView = abv);
-    match array_buffer_view {
-        Ok(v) => Ok(v.to_vec()),
-        Err(_) => Err(Error::Type("Not an ArrayBufferView".to_owned())),
-    }
-}
-
 impl WebGLRenderingContextMethods for WebGLRenderingContext {
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1
     fn Canvas(&self) -> DomRoot<HTMLCanvasElement> {
@@ -1892,52 +1881,44 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
         handle_potential_webgl_error!(self, texture.generate_mipmap());
     }
 
-    #[allow(unsafe_code)]
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
-    unsafe fn BufferData(
+    fn BufferData(
         &self,
-        cx: *mut JSContext,
         target: u32,
-        data: *mut JSObject,
+        data: Option<ArrayBufferViewOrArrayBuffer>,
         usage: u32,
-    ) -> ErrorResult {
-        if data.is_null() {
-            return Ok(self.webgl_error(InvalidValue));
-        }
-
-        typedarray!(in(cx) let array_buffer: ArrayBuffer = data);
-        let data_vec = match array_buffer {
-            Ok(data) => data.to_vec(),
-            Err(_) => fallible_array_buffer_view_to_vec(cx, data)?,
+    ) {
+        let data = match data {
+            Some(ArrayBufferViewOrArrayBuffer::ArrayBuffer(data)) => data.to_vec(),
+            Some(ArrayBufferViewOrArrayBuffer::ArrayBufferView(data)) => data.to_vec(),
+            None => return self.webgl_error(InvalidValue),
         };
 
-        let bound_buffer = handle_potential_webgl_error!(self, self.bound_buffer(target), return Ok(()));
+        let bound_buffer = handle_potential_webgl_error!(self, self.bound_buffer(target), return);
         let bound_buffer = match bound_buffer {
             Some(bound_buffer) => bound_buffer,
-            None => return Ok(self.webgl_error(InvalidOperation)),
+            None => return self.webgl_error(InvalidOperation),
         };
 
-        handle_potential_webgl_error!(self, bound_buffer.buffer_data(target, data_vec, usage));
-        Ok(())
+        handle_potential_webgl_error!(self, bound_buffer.buffer_data(target, data, usage));
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
-    fn BufferData_(&self, target: u32, size: i64, usage: u32) -> ErrorResult {
-        let bound_buffer = handle_potential_webgl_error!(self, self.bound_buffer(target), return Ok(()));
+    fn BufferData_(&self, target: u32, size: i64, usage: u32) {
+        let bound_buffer = handle_potential_webgl_error!(self, self.bound_buffer(target), return);
         let bound_buffer = match bound_buffer {
             Some(bound_buffer) => bound_buffer,
-            None => return Ok(self.webgl_error(InvalidOperation)),
+            None => return self.webgl_error(InvalidOperation),
         };
 
         if size < 0 {
-            return Ok(self.webgl_error(InvalidValue));
+            return self.webgl_error(InvalidValue);
         }
 
         // FIXME: Allocating a buffer based on user-requested size is
         // not great, but we don't have a fallible allocation to try.
         let data = vec![0u8; size as usize];
         handle_potential_webgl_error!(self, bound_buffer.buffer_data(target, data, usage));
-        Ok(())
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
@@ -2757,7 +2738,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
     fn IsBuffer(&self, buffer: Option<&WebGLBuffer>) -> bool {
         buffer.map_or(false, |buf| {
-            self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_marked_for_deletion()
+            self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_deleted()
         })
     }
 
@@ -3643,7 +3624,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
         };
         if values.len() < 1 {
-            return self.webgl_error(InvalidOperation);
+            // https://github.com/KhronosGroup/WebGL/issues/2700
+            return self.webgl_error(InvalidValue);
         }
         self.vertex_attrib(indx, values[0], 0f32, 0f32, 1f32);
     }
@@ -3660,7 +3642,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
         };
         if values.len() < 2 {
-            return self.webgl_error(InvalidOperation);
+            // https://github.com/KhronosGroup/WebGL/issues/2700
+            return self.webgl_error(InvalidValue);
         }
         self.vertex_attrib(indx, values[0], values[1], 0f32, 1f32);
     }
@@ -3677,7 +3660,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
         };
         if values.len() < 3 {
-            return self.webgl_error(InvalidOperation);
+            // https://github.com/KhronosGroup/WebGL/issues/2700
+            return self.webgl_error(InvalidValue);
         }
         self.vertex_attrib(indx, values[0], values[1], values[2], 1f32);
     }
@@ -3694,7 +3678,8 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
         };
         if values.len() < 4 {
-            return self.webgl_error(InvalidOperation);
+            // https://github.com/KhronosGroup/WebGL/issues/2700
+            return self.webgl_error(InvalidValue);
         }
         self.vertex_attrib(indx, values[0], values[1], values[2], values[3]);
     }
diff --git a/components/script/dom/webglvertexarrayobjectoes.rs b/components/script/dom/webglvertexarrayobjectoes.rs
index c717108b2aa..ca13b2833f5 100644
--- a/components/script/dom/webglvertexarrayobjectoes.rs
+++ b/components/script/dom/webglvertexarrayobjectoes.rs
@@ -124,8 +124,15 @@ impl WebGLVertexArrayObjectOES {
         }
 
         let context = self.upcast::<WebGLObject>().context();
-        let buffer = context.array_buffer().ok_or(WebGLError::InvalidOperation)?;
-        buffer.increment_attached_counter();
+        let buffer = context.array_buffer();
+        match buffer {
+            Some(ref buffer) => buffer.increment_attached_counter(),
+            None if offset != 0 => {
+                // https://github.com/KhronosGroup/WebGL/pull/2228
+                return Err(WebGLError::InvalidOperation)
+            },
+            _ => {},
+        }
         context.send_command(WebGLCommand::VertexAttribPointer(
             index,
             size,
@@ -146,7 +153,7 @@ impl WebGLVertexArrayObjectOES {
             normalized,
             stride: stride as u8,
             offset: offset as u32,
-            buffer: Some(Dom::from_ref(&*buffer)),
+            buffer: buffer.map(|b| Dom::from_ref(&*b)),
             divisor: data.divisor,
         };
 
diff --git a/components/script/dom/webidls/WebGL2RenderingContext.webidl b/components/script/dom/webidls/WebGL2RenderingContext.webidl
index b14711d107e..88a2fb273b6 100644
--- a/components/script/dom/webidls/WebGL2RenderingContext.webidl
+++ b/components/script/dom/webidls/WebGL2RenderingContext.webidl
@@ -305,10 +305,7 @@ interface WebGL2RenderingContextBase
   /* Buffer objects */
   // WebGL1:
   // BUG: https://github.com/KhronosGroup/WebGL/issues/2216
-  // FIXME(xanewok): https://github.com/servo/servo/issues/20513
-  [Throws]
-  void bufferData(GLenum target, object? data, GLenum usage);
-  [Throws]
+  void bufferData(GLenum target, /*[AllowShared]*/ BufferSource? data, GLenum usage);
   void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
   void bufferSubData(GLenum target, GLintptr dstByteOffset, /*[AllowShared]*/ BufferSource srcData);
   // WebGL2:
diff --git a/components/script/dom/webidls/WebGLRenderingContext.webidl b/components/script/dom/webidls/WebGLRenderingContext.webidl
index d36154c7355..2a5d8cf99d0 100644
--- a/components/script/dom/webidls/WebGLRenderingContext.webidl
+++ b/components/script/dom/webidls/WebGLRenderingContext.webidl
@@ -421,7 +421,8 @@ interface WebGLRenderingContextBase
     const GLenum RGB5_A1                        = 0x8057;
     const GLenum RGB565                         = 0x8D62;
     const GLenum DEPTH_COMPONENT16              = 0x81A5;
-    const GLenum STENCIL_INDEX                  = 0x1901;
+    // https://github.com/KhronosGroup/WebGL/pull/2371
+    // const GLenum STENCIL_INDEX                  = 0x1901;
     const GLenum STENCIL_INDEX8                 = 0x8D48;
     const GLenum DEPTH_STENCIL                  = 0x84F9;
 
@@ -687,10 +688,7 @@ interface WebGLRenderingContext
 {
     // BUG: https://github.com/KhronosGroup/WebGL/issues/2216
 
-    // FIXME(xanewok): https://github.com/servo/servo/issues/20513
-    [Throws]
-    void bufferData(GLenum target, object? data, GLenum usage);
-    [Throws]
+    void bufferData(GLenum target, /*[AllowShared]*/ BufferSource? data, GLenum usage);
     void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
     void bufferSubData(GLenum target, GLintptr offset, /*[AllowShared]*/ BufferSource data);
 
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 6363abb2abc..5ec52bd0ae8 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -11927,16 +11927,6 @@
     [
      {}
     ]
-   ],
-   "webgl/OWNERS": [
-    [
-     {}
-    ]
-   ],
-   "webgl/common.js": [
-    [
-     {}
-    ]
    ]
   },
   "testharness": {
@@ -20881,42 +20871,6 @@
      "/_mozilla/mozilla/worklets/test_worklet.html",
      {}
     ]
-   ],
-   "webgl/bufferSubData.html": [
-    [
-     "/_mozilla/webgl/bufferSubData.html",
-     {}
-    ]
-   ],
-   "webgl/compressedTexImage2D.html": [
-    [
-     "/_mozilla/webgl/compressedTexImage2D.html",
-     {}
-    ]
-   ],
-   "webgl/compressedTexSubImage2D.html": [
-    [
-     "/_mozilla/webgl/compressedTexSubImage2D.html",
-     {}
-    ]
-   ],
-   "webgl/texImage2D.html": [
-    [
-     "/_mozilla/webgl/texImage2D.html",
-     {}
-    ]
-   ],
-   "webgl/texSubImage2D.html": [
-    [
-     "/_mozilla/webgl/texSubImage2D.html",
-     {}
-    ]
-   ],
-   "webgl/uniformMatrixNfv.html": [
-    [
-     "/_mozilla/webgl/uniformMatrixNfv.html",
-     {}
-    ]
    ]
   }
  },
@@ -33008,38 +32962,6 @@
   "mozilla/worklets/throw_exception.js": [
    "6ca4f80fc2728c00848bb4474b62fa3596ed2f18",
    "support"
-  ],
-  "webgl/OWNERS": [
-   "7507064ad72f41047fe1db39c3cb95da7ffea252",
-   "support"
-  ],
-  "webgl/bufferSubData.html": [
-   "a97df9062d6ea964e500059e155b29604edc21b6",
-   "testharness"
-  ],
-  "webgl/common.js": [
-   "416c21ce9330d3f73576b6b5aa01dab06c5798ee",
-   "support"
-  ],
-  "webgl/compressedTexImage2D.html": [
-   "b0a031add0be018f995e4463114d333a0d9eb85a",
-   "testharness"
-  ],
-  "webgl/compressedTexSubImage2D.html": [
-   "539f9e17f8a811c5acb4f07cf6cbd17015726632",
-   "testharness"
-  ],
-  "webgl/texImage2D.html": [
-   "2f769160dfdeaa3b0a73380e5540b30dfc971489",
-   "testharness"
-  ],
-  "webgl/texSubImage2D.html": [
-   "294b30c7607edc38aed19a31e44c5237eee8b970",
-   "testharness"
-  ],
-  "webgl/uniformMatrixNfv.html": [
-   "f75cbcb99724219224c63d0dc595b1c001298500",
-   "testharness"
   ]
  },
  "url_base": "/_mozilla/",
diff --git a/tests/wpt/mozilla/tests/webgl/OWNERS b/tests/wpt/mozilla/tests/webgl/OWNERS
deleted file mode 100644
index 7507064ad72..00000000000
--- a/tests/wpt/mozilla/tests/webgl/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-@emilio
diff --git a/tests/wpt/mozilla/tests/webgl/bufferSubData.html b/tests/wpt/mozilla/tests/webgl/bufferSubData.html
deleted file mode 100644
index a97df9062d6..00000000000
--- a/tests/wpt/mozilla/tests/webgl/bufferSubData.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<title>bufferSubData</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#5.14.5>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script>
-test(function() {
-  var gl = getGl();
-  assert_equals(gl.getError(), WebGLRenderingContext.NO_ERROR);
-
-  var b = gl.createBuffer();
-  gl.bindBuffer(gl.ARRAY_BUFFER, b);
-
-  var a = new Float32Array(1);
-  gl.bufferData(gl.ARRAY_BUFFER, a, gl.STATIC_DRAW);
-
-  var nan = 0 / 0;
-  gl.bufferSubData(gl.ARRAY_BUFFER, nan, a);
-
-  assert_equals(gl.getError(), WebGLRenderingContext.NO_ERROR);
-});
-</script>
diff --git a/tests/wpt/mozilla/tests/webgl/common.js b/tests/wpt/mozilla/tests/webgl/common.js
deleted file mode 100644
index 416c21ce933..00000000000
--- a/tests/wpt/mozilla/tests/webgl/common.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function getGl() {
-  var c = document.createElement("canvas");
-  var gl = c.getContext("experimental-webgl");
-  assert_true(!!gl, "Should be able to get a context.");
-  return gl;
-}
-
-function shouldGenerateGLError(cx, glError, fn) {
-  test(function() {
-    fn();
-    assert_equals(cx.getError(), glError);
-  }, "Calling " + fn + " should generate a " + glError + " error.");
-}
diff --git a/tests/wpt/mozilla/tests/webgl/compressedTexImage2D.html b/tests/wpt/mozilla/tests/webgl/compressedTexImage2D.html
deleted file mode 100644
index b0a031add0b..00000000000
--- a/tests/wpt/mozilla/tests/webgl/compressedTexImage2D.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<title>compressedTexImage2D</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#5.14.8>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script>
-test(function() {
-  var COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
-  var gl = getGl();
-
-  var tex = gl.createTexture();
-  gl.bindTexture(gl.TEXTURE_2D, tex);
-
-  shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
-    gl.compressedTexImage2D(gl.TEXTURE_2D, 0, COMPRESSED_RGB_S3TC_DXT1_EXT, 4, 4, 0, new Uint8Array(8));
-  });
-  shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
-    gl.compressedTexImage2D(gl.TEXTURE_2D, 0, COMPRESSED_RGB_S3TC_DXT1_EXT, 4, 4, 0, new Uint8Array(8), null);
-  });
-  test(function() {
-    assert_throws(new TypeError(), function() {
-      gl.compressedTexImage2D(gl.TEXTURE_2D, 0, COMPRESSED_RGB_S3TC_DXT1_EXT, 4, 4, 0);
-    });
-  }, "Should throw a TypeError when passing too few arguments.");
-});
-</script>
diff --git a/tests/wpt/mozilla/tests/webgl/compressedTexSubImage2D.html b/tests/wpt/mozilla/tests/webgl/compressedTexSubImage2D.html
deleted file mode 100644
index 539f9e17f8a..00000000000
--- a/tests/wpt/mozilla/tests/webgl/compressedTexSubImage2D.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<title>compressedTexSubImage2D</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#5.14.8>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script>
-test(function() {
-  var COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
-  var gl = getGl();
-
-  var tex = gl.createTexture();
-  gl.bindTexture(gl.TEXTURE_2D, tex);
-
-  shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
-    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));
-  });
-  shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
-    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8), null);
-  });
-  test(function() {
-    assert_throws(new TypeError(), function() {
-      gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT);
-    });
-  }, "Should throw a TypeError when passing too few arguments.");
-});
-</script>
diff --git a/tests/wpt/mozilla/tests/webgl/texImage2D.html b/tests/wpt/mozilla/tests/webgl/texImage2D.html
deleted file mode 100644
index 2f769160dfd..00000000000
--- a/tests/wpt/mozilla/tests/webgl/texImage2D.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<title>texImage2D</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#5.14.8>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script>
-test(function() {
-  var gl = getGl();
-  assert_throws(new TypeError(), function() {
-    gl.texImage2D(0, 0, 0, 0, 0, window);
-  });
-  assert_throws(new TypeError(), function() {
-    gl.texImage2D(0, 0, 0, 0, 0, { get width() { throw 7 }, get height() { throw 7 }, data: new Uint8ClampedArray(10) });
-  });
-});
-</script>
diff --git a/tests/wpt/mozilla/tests/webgl/texSubImage2D.html b/tests/wpt/mozilla/tests/webgl/texSubImage2D.html
deleted file mode 100644
index 294b30c7607..00000000000
--- a/tests/wpt/mozilla/tests/webgl/texSubImage2D.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<title>texSubImage2D</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#5.14.8>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script>
-test(function() {
-  var gl = getGl();
-  assert_throws(new TypeError(), function() {
-    gl.texSubImage2D(0, 0, 0, 0, 0, 0, window);
-  });
-  assert_throws(new TypeError(), function() {
-    gl.texSubImage2D(0, 0, 0, 0, 0, 0, { get width() { throw 7 }, get height() { throw 7 }, data: new Uint8ClampedArray(10) });
-  });
-});
-</script>
diff --git a/tests/wpt/mozilla/tests/webgl/uniformMatrixNfv.html b/tests/wpt/mozilla/tests/webgl/uniformMatrixNfv.html
deleted file mode 100644
index f75cbcb9972..00000000000
--- a/tests/wpt/mozilla/tests/webgl/uniformMatrixNfv.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<title>uniformMatrix*fv</title>
-<link rel=author href=mailto:Ms2ger@gmail.com title=Ms2ger>
-<link rel=help href=https://www.khronos.org/registry/webgl/specs/latest/#WebGLRenderingContext>
-<link rel=help href=http://dev.w3.org/2006/webapi/WebIDL/#es-boolean>
-<link rel=help href=http://es5.github.com/#x9.2>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=common.js></script>
-
-<div id=log></div>
-<script id="vshader" type="x-shader/x-vertex">
-uniform mat2 m2;
-uniform mat3 m3;
-uniform mat4 m4;
-</script>
-<script>
-var floatArray = function(n) {
-  var a = [];
-  for (var i = 0; i < n; ++i) {
-    a.push(1);
-  }
-  return a;
-};
-[2, 3, 4].forEach(function(n) {
-  test(function() {
-    var gl = getGl();
-    var f = "uniformMatrix" + n + "fv";
-    var loc = gl.getUniformLocation(gl.createProgram(), "m" + n);
-    gl[f](loc, { valueOf: function() { throw "Error"; } }, floatArray(n));
-  }, "Should not throw for " + n);
-});
-</script>
diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json
index 31f286ebea8..b5fc2a57533 100644
--- a/tests/wpt/webgl/meta/MANIFEST.json
+++ b/tests/wpt/webgl/meta/MANIFEST.json
@@ -10571,9 +10571,7 @@
    "conformance/canvas/rapid-resizing.html": [
     [
      "/_webgl/conformance/canvas/rapid-resizing.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "conformance/canvas/render-after-resize-test.html": [
@@ -10621,17 +10619,13 @@
    "conformance/context/context-creation-and-destruction.html": [
     [
      "/_webgl/conformance/context/context-creation-and-destruction.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "conformance/context/context-creation.html": [
     [
      "/_webgl/conformance/context/context-creation.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "conformance/context/context-eviction-with-garbage-collection.html": [
@@ -27576,7 +27570,7 @@
    "testharness"
   ],
   "conformance/canvas/rapid-resizing.html": [
-   "9991e9beec6e5880a4f939d314acc7a76dd31527",
+   "f423e17f563da0751d96604adc64bbc0537a52bc",
    "testharness"
   ],
   "conformance/canvas/render-after-resize-test.html": [
@@ -27612,11 +27606,11 @@
    "testharness"
   ],
   "conformance/context/context-creation-and-destruction.html": [
-   "3ad7a02d79cfbae4b9d7b6f6ee16cdc5d1a829dd",
+   "a3912fcf7eaaf2992ec4a82de0c7262d929b035d",
    "testharness"
   ],
   "conformance/context/context-creation.html": [
-   "237258cc9d956acf6b821967c8010db22804e6df",
+   "d8685e48fcb8e5f74132501fa31e00163212be54",
    "testharness"
   ],
   "conformance/context/context-eviction-with-garbage-collection.html": [
@@ -46420,7 +46414,7 @@
    "support"
   ],
   "js/js-test-pre.js": [
-   "f2c8167240a232d1a5480a9b7635cc250062bbdb",
+   "294bd4c5a21ccfa8b1ec4369a960304c4b2cf0f6",
    "support"
   ],
   "js/pnglib.js": [
@@ -46636,7 +46630,7 @@
    "support"
   ],
   "js/webgl-test-utils.js": [
-   "5ab8b2cfd0794f3c15d7afad0fe98b0f75cff38b",
+   "0ef194eacc296f083fe86a03cdbdb5f72317b516",
    "support"
   ],
   "py/lint/LICENSE": [
diff --git a/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib-render.html.ini b/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib-render.html.ini
index fc428173245..e0b8587440f 100644
--- a/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib-render.html.ini
+++ b/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib-render.html.ini
@@ -1,6 +1,5 @@
 [gl-vertex-attrib-render.html]
   bug: https://github.com/servo/servo/issues/21132
-  type: testharness
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib.html.ini b/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib.html.ini
deleted file mode 100644
index e8cfa8be8e7..00000000000
--- a/tests/wpt/webgl/meta/conformance/attribs/gl-vertex-attrib.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[gl-vertex-attrib.html]
-  [WebGL test #979: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #978: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #976: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #980: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #975: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #977: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #982: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
-  [WebGL test #981: getError expected: INVALID_VALUE. Was INVALID_OPERATION : ]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/attribs/gl-vertexattribpointer.html.ini b/tests/wpt/webgl/meta/conformance/attribs/gl-vertexattribpointer.html.ini
deleted file mode 100644
index 3a5cca32db1..00000000000
--- a/tests/wpt/webgl/meta/conformance/attribs/gl-vertexattribpointer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[gl-vertexattribpointer.html]
-  [WebGL test #3: getError expected: NO_ERROR. Was INVALID_OPERATION : vertexAttribPointer should succeed if no buffer is bound and `offset` is zero.]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-and-buffer-sub-data.html.ini b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-and-buffer-sub-data.html.ini
deleted file mode 100644
index 49412711fc1..00000000000
--- a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-and-buffer-sub-data.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[buffer-data-and-buffer-sub-data.html]
-  expected: ERROR
-  [WebGL test #27: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
index 32f41771f0e..59852dba1f6 100644
--- a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
+++ b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini
@@ -1,6 +1,5 @@
 [buffer-data-array-buffer-delete.html]
   bug: https://github.com/servo/servo/issues/21132
-  type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
@@ -8,6 +7,3 @@
   [WebGL test #1: gl should be non-null. Was null]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
index 62980ecdfc8..23dbc28d1c9 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/canvas-test.html.ini
@@ -1,6 +1,3 @@
 [canvas-test.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
index 9c7f3f10b20..b1c37bcbb7e 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html.ini
@@ -1,6 +1,3 @@
 [draw-static-webgl-to-multiple-canvas-test.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
index df8d2c898e6..bf750bfcf4c 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/draw-webgl-to-canvas-test.html.ini
@@ -1,6 +1,3 @@
 [draw-webgl-to-canvas-test.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-static-canvas-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-static-canvas-test.html.ini
index 64c90bdf140..42ce8b5d526 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-static-canvas-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-static-canvas-test.html.ini
@@ -1,3 +1,2 @@
 [drawingbuffer-static-canvas-test.html]
-  type: testharness
   expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-test.html.ini
index 6570acb25a4..a03aad6f02d 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/drawingbuffer-test.html.ini
@@ -1,3 +1,2 @@
 [drawingbuffer-test.html]
-  type: testharness
   expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance/canvas/rapid-resizing.html.ini b/tests/wpt/webgl/meta/conformance/canvas/rapid-resizing.html.ini
index d5958c6cbe9..70e5ae46820 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/rapid-resizing.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/rapid-resizing.html.ini
@@ -1,11 +1,3 @@
 [rapid-resizing.html]
-  expected: TIMEOUT
-  [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
-    expected: FAIL
-
-  [Overall test]
-    expected: NOTRUN
-
-  [WebGL test #1: context does not exist]
-    expected: FAIL
+  disabled: https://github.com/servo/servo/issues/21132
 
diff --git a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
index 69d8b8e101a..14afaae8222 100644
--- a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
@@ -1,6 +1,2 @@
 [to-data-url-test.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/constants-and-properties.html.ini b/tests/wpt/webgl/meta/conformance/context/constants-and-properties.html.ini
deleted file mode 100644
index 49434267629..00000000000
--- a/tests/wpt/webgl/meta/conformance/context/constants-and-properties.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[constants-and-properties.html]
-  [WebGL test #2: Also found the following extra properties:]
-    expected: FAIL
-
-  [WebGL test #3: STENCIL_INDEX]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini b/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
index 18cb75d37cc..38b543e7694 100644
--- a/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/context-attribute-preserve-drawing-buffer.html.ini
@@ -1,7 +1,3 @@
 [context-attribute-preserve-drawing-buffer.html]
   bug: https://github.com/servo/servo/issues/21132
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini b/tests/wpt/webgl/meta/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
index 7752255f254..7148f2289e2 100644
--- a/tests/wpt/webgl/meta/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/context-attributes-alpha-depth-stencil-antialias.html.ini
@@ -1,6 +1,5 @@
 [context-attributes-alpha-depth-stencil-antialias.html]
   bug: https://github.com/servo/servo/issues/21285
-  type: testharness
   [WebGL test #96: redChannels[0\] != 255 && redChannels[0\] != 0 should be true. Was false.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini
deleted file mode 100644
index fbdc89a8f0d..00000000000
--- a/tests/wpt/webgl/meta/conformance/context/context-creation-and-destruction.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation-and-destruction.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini b/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini
deleted file mode 100644
index 393e42df192..00000000000
--- a/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/context/context-lost.html.ini b/tests/wpt/webgl/meta/conformance/context/context-lost.html.ini
index 0b2ab4ba9fb..3f92b028f75 100644
--- a/tests/wpt/webgl/meta/conformance/context/context-lost.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/context-lost.html.ini
@@ -1,6 +1,5 @@
 [context-lost.html]
   bug: https://github.com/servo/servo/issues/15266
-  type: testharness
   [WebGL test #0: gl.isContextLost() should be false. Threw exception TypeError: gl.isContextLost is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
index bbb8ef50003..e7020b7432d 100644
--- a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
@@ -1,6 +1,5 @@
 [premultiplyalpha-test.html]
   bug: https://github.com/servo/servo/issues/21132
-  type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
@@ -11,6 +10,3 @@
   [WebGL test #2: gl.getContextAttributes().preserveDrawingBuffer should be true. Threw exception TypeError: gl is null]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
index fd84608b919..aa83c5988e5 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-canvas.html.ini
@@ -1,5 +1,50 @@
 [oes-texture-float-with-canvas.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
+  expected: ERROR
+  [WebGL test #31: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #19: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #12: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #15: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #14: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #40: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #34: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #20: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #39: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #11: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #17: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #35: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #37: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #32: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #38: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #18: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-video.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-video.html.ini
index 09a57e2fd03..33ad2bfcaa5 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-video.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-float-with-video.html.ini
@@ -1,3 +1,2 @@
 [oes-texture-float-with-video.html]
-  type: testharness
   disabled: flaky
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
index c37d9af94f1..e06bdc6cb83 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-canvas.html.ini
@@ -1,5 +1,50 @@
 [oes-texture-half-float-with-canvas.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
+  expected: ERROR
+  [WebGL test #31: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #19: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #12: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #15: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #14: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #40: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #34: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #20: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #39: shouldBe 127,0,0,127\nat (0, 0) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #11: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #17: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #35: shouldBe 0,127,0,127\nat (0, 16) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #37: shouldBe 127,0,0,127\nat (0, 16) expected: 127,0,0,127 was 255,0,0,255]
+    expected: FAIL
+
+  [WebGL test #32: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #38: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
+
+  [WebGL test #18: shouldBe 0,127,0,127\nat (0, 0) expected: 0,127,0,127 was 0,255,0,255]
+    expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-video.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-video.html.ini
index d8fe0d94541..be102e25930 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-video.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float-with-video.html.ini
@@ -1,3 +1,2 @@
 [oes-texture-half-float-with-video.html]
-  type: testharness
   disabled: flaky
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float.html.ini
index 7b42fd6ba4e..ae272da2b67 100644
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float.html.ini
+++ b/tests/wpt/webgl/meta/conformance/extensions/oes-texture-half-float.html.ini
@@ -1,2 +1,4 @@
 [oes-texture-half-float.html]
-  expected: CRASH
+  [WebGL test #72: RGBA/HALF_FLOAT_OES is color renderable but EXT_color_buffer_half_float not exposed]
+    expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini
deleted file mode 100644
index 6afc852b104..00000000000
--- a/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[oes-vertex-array-object.html]
-  [WebGL test #74: References from unbound VAOs keep Color buffer alive]
-    expected: FAIL
-
-  [WebGL test #65: References from unbound VAOs keep Color buffer alive]
-    expected: FAIL
-
-  [WebGL test #68: References from unbound VAOs keep Color buffer alive]
-    expected: FAIL
-
-  [WebGL test #73: References from unbound VAOs keep Position buffer alive.]
-    expected: FAIL
-
-  [WebGL test #71: References from unbound VAOs keep Color buffer alive]
-    expected: FAIL
-
-  [WebGL test #70: References from unbound VAOs keep Position buffer alive.]
-    expected: FAIL
-
-  [WebGL test #64: References from unbound VAOs keep Position buffer alive.]
-    expected: FAIL
-
-  [WebGL test #67: References from unbound VAOs keep Position buffer alive.]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini b/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini
deleted file mode 100644
index 9c170c8b179..00000000000
--- a/tests/wpt/webgl/meta/conformance/extensions/webgl-compressed-texture-size-limit.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[webgl-compressed-texture-size-limit.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini
index f5143fe976b..fa994fe46fe 100644
--- a/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini
+++ b/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini
@@ -1,4 +1,5 @@
 [fragcolor-fragdata-invariant.html]
+  bug: https://github.com/servo/servo/issues/20601
   [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) Declaring both gl_FragColor and gl_FragData invariant should succeed.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
index 82784a41789..3cec98dc4f4 100644
--- a/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
+++ b/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-define-line-continuation.frag.html.ini
@@ -1,6 +1,5 @@
 [shader-with-define-line-continuation.frag.html]
   bug: https://github.com/servo/servo/issues/20601
-  type: testharness
   [WebGL test #0: [unexpected link status\] fragment shader that uses line continuation macro should fail]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
index ff4fa64687c..3dea79c1ee4 100644
--- a/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
+++ b/tests/wpt/webgl/meta/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html.ini
@@ -1,6 +1,5 @@
 [shader-with-global-variable-precision-mismatch.html]
   bug: https://github.com/servo/servo/issues/20601
-  type: testharness
   [WebGL test #0: [unexpected link status\] mismatching precision for uniforms causes link error (as expected)]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-uniform-structs.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
index 48290ecd18b..d850997fcfa 100644
--- a/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
+++ b/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-uniform-structs.html.ini
@@ -1,6 +1,5 @@
 [shaders-with-uniform-structs.html]
   bug: https://github.com/servo/servo/issues/20601
-  type: testharness
   [WebGL test #5: [unexpected link status\] Structures must have the same type definitions (including precision) to be considered the same type.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-varyings.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-varyings.html.ini
index 0563bd133c0..1908ca52e4d 100644
--- a/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-varyings.html.ini
+++ b/tests/wpt/webgl/meta/conformance/glsl/misc/shaders-with-varyings.html.ini
@@ -1,6 +1,5 @@
 [shaders-with-varyings.html]
   bug: https://github.com/servo/servo/issues/20601
-  type: testharness
   [WebGL test #3: [unexpected link status\] vertex shader with unused varying and fragment shader with used varying must succeed]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/misc/expando-loss.html.ini b/tests/wpt/webgl/meta/conformance/misc/expando-loss.html.ini
deleted file mode 100644
index 2d422270afb..00000000000
--- a/tests/wpt/webgl/meta/conformance/misc/expando-loss.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[expando-loss.html]
-  expected: CRASH
diff --git a/tests/wpt/webgl/meta/conformance/misc/type-conversion-test.html.ini b/tests/wpt/webgl/meta/conformance/misc/type-conversion-test.html.ini
deleted file mode 100644
index ee430a66dcd..00000000000
--- a/tests/wpt/webgl/meta/conformance/misc/type-conversion-test.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[type-conversion-test.html]
-  bug: https://github.com/servo/servo/issues/20513
-  type: testharness
-  [WebGL test #340: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
-  [WebGL test #407: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
-  [WebGL test #474: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
-  [WebGL test #541: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
-  [WebGL test #608: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
-  [WebGL test #675: context.bufferData(context.ARRAY_BUFFER, argument, context.STATIC_DRAW) should be undefined. Threw exception TypeError: Not an ArrayBufferView]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/misc/uninitialized-test.html.ini b/tests/wpt/webgl/meta/conformance/misc/uninitialized-test.html.ini
index e2c703fa830..801199f6c06 100644
--- a/tests/wpt/webgl/meta/conformance/misc/uninitialized-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/misc/uninitialized-test.html.ini
@@ -1,3 +1,2 @@
 [uninitialized-test.html]
-  type: testharness
   disabled: https://github.com/servo/servo/issues/13710
diff --git a/tests/wpt/webgl/meta/conformance/more/conformance/methods.html.ini b/tests/wpt/webgl/meta/conformance/more/conformance/methods.html.ini
index d1512202b46..3e10a31ecb3 100644
--- a/tests/wpt/webgl/meta/conformance/more/conformance/methods.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/conformance/methods.html.ini
@@ -1,5 +1,5 @@
 [methods.html]
-  type: testharness
+  bug: https://github.com/servo/servo/issues/15266
   [WebGL test #0: testOES20Methods]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/more/conformance/quickCheckAPI-S_V.html.ini b/tests/wpt/webgl/meta/conformance/more/conformance/quickCheckAPI-S_V.html.ini
index 4e8b19fdb8e..0f3b0f5348b 100644
--- a/tests/wpt/webgl/meta/conformance/more/conformance/quickCheckAPI-S_V.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/conformance/quickCheckAPI-S_V.html.ini
@@ -1,3 +1,2 @@
 [quickCheckAPI-S_V.html]
-  type: testharness
-  expected: CRASH
+  disabled: https://github.com/servo/servo/issues/10656
diff --git a/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini b/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini
index 9a9f6552193..ad3520119fa 100644
--- a/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/readPixelsBadArgs.html.ini
@@ -1,4 +1,5 @@
 [readPixelsBadArgs.html]
+  bug: https://github.com/servo/servo/issues/21522
   [WebGL test #1: testReadPixelsSOPIMG]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini b/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini
index dd19783929a..ba52b864738 100644
--- a/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/texImage2DHTML.html.ini
@@ -1,4 +1,5 @@
 [texImage2DHTML.html]
+  bug: https://github.com/servo/servo/issues/21522
   [WebGL test #1: testTexImage2DNonSOP]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini b/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini
index fe1d4f074b1..823e2d127d3 100644
--- a/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini
+++ b/tests/wpt/webgl/meta/conformance/more/functions/texSubImage2DHTML.html.ini
@@ -1,4 +1,5 @@
 [texSubImage2DHTML.html]
+  bug: https://github.com/servo/servo/issues/21522
   [WebGL test #1: testTexImage2DNonSOP]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/more/functions/vertexAttribPointerBadArgs.html.ini b/tests/wpt/webgl/meta/conformance/more/functions/vertexAttribPointerBadArgs.html.ini
deleted file mode 100644
index bdc03ee11ea..00000000000
--- a/tests/wpt/webgl/meta/conformance/more/functions/vertexAttribPointerBadArgs.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertexAttribPointerBadArgs.html]
-  [WebGL test #0: testVertexAttribPointerVBO]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/reading/read-pixels-pack-alignment.html.ini b/tests/wpt/webgl/meta/conformance/reading/read-pixels-pack-alignment.html.ini
index d5b3c59a27d..0109d0a68c1 100644
--- a/tests/wpt/webgl/meta/conformance/reading/read-pixels-pack-alignment.html.ini
+++ b/tests/wpt/webgl/meta/conformance/reading/read-pixels-pack-alignment.html.ini
@@ -1,5 +1,4 @@
 [read-pixels-pack-alignment.html]
-  type: testharness
   [WebGL test #17: pixel should be 255,102,0,255. Was 0,0,0,0.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
index 22325f1fe6d..0766d440b08 100644
--- a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
@@ -1,4 +1,3 @@
 [read-pixels-test.html]
-  type: testharness
-  expected: TIMEOUT
   bug: https://github.com/servo/servo/issues/14380
+  expected: TIMEOUT
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/depth-renderbuffer-initialization.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/depth-renderbuffer-initialization.html.ini
index fd3c531dd7b..260119f179a 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/depth-renderbuffer-initialization.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/depth-renderbuffer-initialization.html.ini
@@ -1,3 +1,2 @@
 [depth-renderbuffer-initialization.html]
-  type: testharness
   disabled: https://github.com/servo/servo/issues/13710
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/feedback-loop.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/feedback-loop.html.ini
index 38e546a86c2..8f49daa21c3 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/feedback-loop.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/feedback-loop.html.ini
@@ -1,6 +1,5 @@
 [feedback-loop.html]
   bug: https://github.com/servo/servo/issues/21288
-  type: testharness
   [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after draw with invalid feedback loop]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini
index 07b83234bcd..13211175427 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-object-attachment.html.ini
@@ -1,5 +1,4 @@
 [framebuffer-object-attachment.html]
-  type: testharness
   expected: CRASH
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
index 5ce1ded25ed..bef96451d92 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini
@@ -1,9 +1,5 @@
 [framebuffer-state-restoration.html]
-  type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/renderbuffer-initialization.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/renderbuffer-initialization.html.ini
index f3b0b2e6ae9..526aac9b953 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/renderbuffer-initialization.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/renderbuffer-initialization.html.ini
@@ -1,3 +1,2 @@
 [renderbuffer-initialization.html]
-  type: testharness
   disabled: https://github.com/servo/servo/issues/13710
diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/stencil-renderbuffer-initialization.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/stencil-renderbuffer-initialization.html.ini
index 1a24372dade..536f038a85d 100644
--- a/tests/wpt/webgl/meta/conformance/renderbuffers/stencil-renderbuffer-initialization.html.ini
+++ b/tests/wpt/webgl/meta/conformance/renderbuffers/stencil-renderbuffer-initialization.html.ini
@@ -1,3 +1,2 @@
 [stencil-renderbuffer-initialization.html]
-  type: testharness
   disabled: https://github.com/servo/servo/issues/13710
diff --git a/tests/wpt/webgl/meta/conformance/rendering/draw-elements-out-of-bounds.html.ini b/tests/wpt/webgl/meta/conformance/rendering/draw-elements-out-of-bounds.html.ini
deleted file mode 100644
index d6d1e0ab2cb..00000000000
--- a/tests/wpt/webgl/meta/conformance/rendering/draw-elements-out-of-bounds.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[draw-elements-out-of-bounds.html]
-  [WebGL test #0: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 0, gl.UNSIGNED_BYTE, 0)]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
index caf83d8f27c..634a4574488 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
@@ -1,6 +1,2 @@
 [framebuffer-switch.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
index 225cad06f3b..df3c31a4e04 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
@@ -1,6 +1,2 @@
 [framebuffer-texture-switch.html]
-  type: testharness
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
index 9daae1eb19c..6d8da9b93f7 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
@@ -1,10 +1,6 @@
 [multisample-corruption.html]
   bug: https://github.com/servo/servo/issues/21132
-  type: testharness
   expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
index fa212fcc5b5..51010d81618 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
deleted file mode 100644
index df505cbab41..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-alpha-alpha-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
index d55c52bdf01..bb22c44d183 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -1,11 +1,98 @@
 [tex-2d-luminance-luminance-unsigned_byte.html]
-  expected: TIMEOUT
+  expected: ERROR
   [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #0: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
     expected: FAIL
 
+  [WebGL test #21: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #4: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #9: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #28: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #7: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #12: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #29: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #13: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #22: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #20: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #30: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #27: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #15: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #3: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #17: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #14: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #5: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #24: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #31: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #25: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
+  [WebGL test #8: shouldBe 127,127,127,255\nat (0, 16) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #2: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #10: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #18: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #6: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #23: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #19: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #16: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #26: shouldBe 127,127,127,255\nat (0, 0) expected: 127,127,127,255 was 26,26,26,255]
+    expected: FAIL
+
+  [WebGL test #11: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 89,89,89,255]
+    expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
index c2c977c3f51..3c27a281ad6 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -1,11 +1,98 @@
 [tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html]
-  expected: TIMEOUT
+  expected: ERROR
   [WebGL test #1: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #0: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
     expected: FAIL
 
+  [WebGL test #31: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #21: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #8: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #15: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #4: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #9: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #7: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #20: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #30: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #22: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #10: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #5: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #13: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #3: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #17: shouldBe 0,0,0,255\nat (0, 0) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #11: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #14: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #25: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #24: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #28: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #12: shouldBe 127,127,127,127\nat (0, 16) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #27: shouldBe 0,0,0,127\nat (0, 16) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #26: shouldBe 127,127,127,127\nat (0, 0) expected: 127,127,127,127 was 26,26,26,128]
+    expected: FAIL
+
+  [WebGL test #2: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #29: shouldBe 0,0,0,127\nat (0, 0) expected: 0,0,0,127 was 89,89,89,128]
+    expected: FAIL
+
+  [WebGL test #18: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #6: shouldBe 255,255,255,255\nat (0, 0) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
+  [WebGL test #23: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #19: shouldBe 0,0,0,255\nat (0, 16) expected: 0,0,0,255 was 182,182,182,255]
+    expected: FAIL
+
+  [WebGL test #16: shouldBe 255,255,255,255\nat (0, 16) expected: 255,255,255,255 was 54,54,54,255]
+    expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
index db7310c69ac..5f2e90ce804 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
@@ -1,5 +1,2 @@
 [tex-2d-rgb-rgb-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
+  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
index a991e224bc2..7c0676fcc31 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
@@ -1,5 +1,2 @@
 [tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
+  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
index 8749093a15d..21c42fc0501 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
@@ -1,5 +1,2 @@
 [tex-2d-rgba-rgba-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
+  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
index 73bba4ac28e..dbc187f4376 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
@@ -1,5 +1,2 @@
 [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
+  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
index d014f432f89..56c2a1f2e04 100644
--- a/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
@@ -1,5 +1,2 @@
 [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
+  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-2d-formats.html.ini b/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-2d-formats.html.ini
deleted file mode 100644
index 0d115512ec1..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-2d-formats.html.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[copy-tex-image-2d-formats.html]
-  type: testharness
-  [WebGL test #16: Creating framebuffer from ALPHA texture succeeded even though it is not a renderable format]
-    expected: FAIL
-
-  [WebGL test #17: Creating framebuffer from LUMINANCE texture succeeded even though it is not a renderable format]
-    expected: FAIL
-
-  [WebGL test #18: Creating framebuffer from LUMINANCE_ALPHA texture succeeded even though it is not a renderable format]
-    expected: FAIL
-
-  [WebGL test #19: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D ALPHA from RGB]
-    expected: FAIL
-
-  [WebGL test #23: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D LUMINANCE_ALPHA from RGB]
-    expected: FAIL
-
-  [WebGL test #27: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D RGBA from RGB]
-    expected: FAIL
-
-  [WebGL test #44: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D ALPHA from RGB]
-    expected: FAIL
-
-  [WebGL test #48: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D LUMINANCE_ALPHA from RGB]
-    expected: FAIL
-
-  [WebGL test #52: getError expected: INVALID_OPERATION. Was NO_ERROR : should not be able to copyTexImage2D RGBA from RGB]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-and-sub-image-2d.html.ini b/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-and-sub-image-2d.html.ini
deleted file mode 100644
index dc04ea5dd65..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/copy-tex-image-and-sub-image-2d.html.ini
+++ /dev/null
@@ -1,578 +0,0 @@
-[copy-tex-image-and-sub-image-2d.html]
-  type: testharness
-  [WebGL test #85: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #90: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #94: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #95: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #99: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #100: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #104: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #105: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #109: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #110: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #114: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #119: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #133: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #135: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #138: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #140: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #142: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #143: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #144: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #145: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #147: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #148: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #149: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #150: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #152: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #153: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #154: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #155: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #157: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #158: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #159: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #160: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #162: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #164: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #165: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #167: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #169: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #170: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #174: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #175: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #179: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #180: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #183: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #184: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #185: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #188: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #189: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #190: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #192: at (0, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #193: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #194: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #195: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #197: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #198: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #199: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #200: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #202: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #203: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #204: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #205: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #207: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #208: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #209: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #210: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #212: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #213: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #214: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #215: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #217: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #218: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #219: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #220: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #222: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #223: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #224: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #225: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #227: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #228: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #229: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #230: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #232: at (0, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #233: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #234: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #235: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #237: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #238: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #239: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #240: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #242: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #243: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #244: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #245: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #247: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #248: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #249: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #250: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #336: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #341: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #345: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #346: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #350: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #351: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #355: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #356: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #360: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #361: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #365: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #370: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #384: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #386: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #389: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #391: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #393: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #394: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #395: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #396: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #398: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #399: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #400: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #401: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #403: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #404: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #405: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #406: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #408: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #409: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #410: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #411: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #413: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #415: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #416: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #418: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #420: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #421: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #425: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #426: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #430: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #431: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #434: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #435: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #436: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #439: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #440: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #441: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #443: at (0, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #444: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #445: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #446: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #448: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #449: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #450: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #451: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #453: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #454: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #455: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #456: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #458: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #459: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #460: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #461: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #463: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #464: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #465: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #466: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #468: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #469: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #470: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #471: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #473: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #474: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #475: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #476: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #478: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #479: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #480: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #481: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #483: at (0, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #484: at (1, 0) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #485: at (0, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #486: at (1, 1) expected: 0,0,0,0 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #488: at (0, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #489: at (1, 0) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #490: at (0, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #491: at (1, 1) expected: 0,0,0,0 was 128,128,128,128]
-    expected: FAIL
-
-  [WebGL test #493: at (0, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #494: at (1, 0) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #495: at (0, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #496: at (1, 1) expected: 0,0,0,0 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #498: at (0, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #499: at (1, 0) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #500: at (0, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #501: at (1, 1) expected: 0,0,0,0 was 0,255,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/gl-pixelstorei.html.ini b/tests/wpt/webgl/meta/conformance/textures/gl-pixelstorei.html.ini
deleted file mode 100644
index efae6fb14de..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/gl-pixelstorei.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[gl-pixelstorei.html]
-  type: testharness
-  expected: ERROR
-  [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
-    expected: FAIL
-
-  [WebGL pixelStorei Test]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
index aebccec6d32..f6af1c3457c 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-copying-feedback-loops.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-copying-feedback-loops.html.ini
index fafd1bf22cb..527b3d638d5 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-copying-feedback-loops.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-copying-feedback-loops.html.ini
@@ -1,4 +1,5 @@
 [texture-copying-feedback-loops.html]
+  bug: https://github.com/servo/servo/issues/21288
   [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after copyTexImage2D to same texture same level, invalid feedback loop]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-corner-case-videos.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-corner-case-videos.html.ini
index 77fda77e79d..82be9764f19 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-corner-case-videos.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-corner-case-videos.html.ini
@@ -1,5 +1,3 @@
 [texture-corner-case-videos.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
+  disabled: https://github.com/servo/servo/issues/6711
 
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-npot-video.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-npot-video.html.ini
index ea6d468782e..a9b07796ef5 100644
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-npot-video.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-npot-video.html.ini
@@ -1,5 +1,3 @@
 [texture-npot-video.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
+  disabled: https://github.com/servo/servo/issues/6711
 
diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini
deleted file mode 100644
index ed30fb1af9c..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-limit.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[texture-size-limit.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/origin-clean-conformance.html.ini b/tests/wpt/webgl/meta/conformance/textures/origin-clean-conformance.html.ini
deleted file mode 100644
index 0390f6f22cd..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/origin-clean-conformance.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[origin-clean-conformance.html]
-  type: testharness
-  [WebGL test #2: texImage2D with cross-origin image should throw exception.]
-    expected: FAIL
-
-  [WebGL test #3: texSubImage2D with cross-origin image should throw exception.]
-    expected: FAIL
-
-  [WebGL test #7: texImage2D with NON origin clean canvas should throw exception.]
-    expected: FAIL
-
-  [WebGL test #8: texSubImage2D with NON origin clean canvas should throw exception.]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/__dir__.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/__dir__.ini
new file mode 100644
index 00000000000..19de279b4ef
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/textures/svg_image/__dir__.ini
@@ -0,0 +1 @@
+disabled: SVG support is not implemented yet
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-alpha-alpha-unsigned_byte.html.ini
deleted file mode 100644
index df505cbab41..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-alpha-alpha-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance-luminance-unsigned_byte.html.ini
deleted file mode 100644
index 94b45973cb3..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-luminance-luminance-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
deleted file mode 100644
index 8c1ea97dfcb..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_byte.html.ini
deleted file mode 100644
index db7310c69ac..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgb-rgb-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
deleted file mode 100644
index a991e224bc2..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_byte.html.ini
deleted file mode 100644
index 8749093a15d..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
deleted file mode 100644
index 73bba4ac28e..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
deleted file mode 100644
index d014f432f89..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/svg_image/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html.ini
deleted file mode 100644
index 1d20e0565e2..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-canvas-rgb565.html]
-  type: testharness
-  expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html.ini
deleted file mode 100644
index 00ae17a1715..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-canvas-rgba4444.html]
-  type: testharness
-  expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html.ini
deleted file mode 100644
index 5adc2092e21..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-canvas-rgba5551.html]
-  type: testharness
-  expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html.ini
deleted file mode 100644
index 468299a537d..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-canvas.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-canvas.html]
-  type: testharness
-  expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-svg-image.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-svg-image.html.ini
deleted file mode 100644
index 804deaf6a8f..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-svg-image.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-svg-image.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini
deleted file mode 100644
index c1aaae7a577..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-video-rgb565.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini
deleted file mode 100644
index d64b5a2230b..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-video-rgba4444.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini
deleted file mode 100644
index d81e40d0a02..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-video-rgba5551.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini
deleted file mode 100644
index 7756d0a6fcf..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-video.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[tex-image-and-sub-image-2d-with-video.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini
deleted file mode 100644
index 8c0e1708eb5..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html.ini
+++ /dev/null
@@ -1,197 +0,0 @@
-[tex-image-and-sub-image-2d-with-webgl-canvas-rgb565.html]
-  type: testharness
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,227,0]
-    expected: FAIL
-
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #1: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #38: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #39: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #40: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #42: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #43: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #44: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #45: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #47: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #48: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #49: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #50: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #52: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #54: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #55: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #57: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #58: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #60: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #63: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini
deleted file mode 100644
index 037794850f3..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html.ini
+++ /dev/null
@@ -1,197 +0,0 @@
-[tex-image-and-sub-image-2d-with-webgl-canvas-rgba4444.html]
-  type: testharness
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,255,0]
-    expected: FAIL
-
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #1: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #38: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #39: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #40: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #42: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #43: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #44: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #45: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #47: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #48: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #49: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #50: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #52: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #54: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #55: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #57: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #58: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #60: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #63: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini
deleted file mode 100644
index 7d1b616ec7e..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html.ini
+++ /dev/null
@@ -1,200 +0,0 @@
-[tex-image-and-sub-image-2d-with-webgl-canvas-rgba5551.html]
-  type: testharness
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,231,0]
-    expected: FAIL
-
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 255,230,0]
-    expected: FAIL
-
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #1: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #38: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #39: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #40: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #42: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #43: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #44: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #45: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #47: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #48: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #49: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #50: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #52: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #54: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #55: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #57: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #58: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #60: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #63: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini
deleted file mode 100644
index 6db32f7c194..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-and-sub-image-2d-with-webgl-canvas.html.ini
+++ /dev/null
@@ -1,197 +0,0 @@
-[tex-image-and-sub-image-2d-with-webgl-canvas.html]
-  type: testharness
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,255,0]
-    expected: FAIL
-
-  [WebGL test #0: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #1: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #38: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #39: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #40: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #42: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #43: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #44: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #45: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #47: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #48: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #49: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #50: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #52: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #54: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #55: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #57: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #58: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #60: at (0, 0) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: at (0, 16) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: at (0, 16) expected: 255,0,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #63: at (0, 0) expected: 0,255,0 was 0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-webgl.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-webgl.html.ini
deleted file mode 100644
index 1242ad05bad..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-webgl.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tex-image-webgl.html]
-  type: testharness
-  [WebGL test #2: at (0, 0) expected: 255,0,0,255 was 0,0,0,255]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,255,0,255 was 0,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-image-with-format-and-type.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-image-with-format-and-type.html.ini
deleted file mode 100644
index e9b1ef8bc8b..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-image-with-format-and-type.html.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-[tex-image-with-format-and-type.html]
-  type: testharness
-  [WebGL test #6: LUMINANCE/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #7: LUMINANCE_ALPHA/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #14: LUMINANCE/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #15: LUMINANCE_ALPHA/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #22: LUMINANCE/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #23: LUMINANCE_ALPHA/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #30: LUMINANCE/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #31: LUMINANCE_ALPHA/UNSIGNED_BYTE should maintain full precision of data]
-    expected: FAIL
-
-  [WebGL test #65: UNPACK_PREMULTIPLY_ALPHA_WEBGL with RGBA/UNSIGNED_SHORT_4_4_4_4]
-    expected: FAIL
-
-  [WebGL test #66: UNPACK_PREMULTIPLY_ALPHA_WEBGL with RGBA/UNSIGNED_SHORT_5_5_5_1]
-    expected: FAIL
-
-  [WebGL test #69: UNPACK_PREMULTIPLY_ALPHA_WEBGL with RGBA/UNSIGNED_SHORT_4_4_4_4]
-    expected: FAIL
-
-  [WebGL test #70: UNPACK_PREMULTIPLY_ALPHA_WEBGL with RGBA/UNSIGNED_SHORT_5_5_5_1]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/tex-input-validation.html.ini b/tests/wpt/webgl/meta/conformance/textures/tex-input-validation.html.ini
deleted file mode 100644
index f91c50e108b..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/tex-input-validation.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[tex-input-validation.html]
-  [WebGL test #34: getError expected: INVALID_OPERATION. Was NO_ERROR :  colorBufferFormat: RGB565 internalFormat: RGBA target: TEXTURE_2D border: 0]
-    expected: FAIL
-
-  [WebGL test #37: getError expected: NO_ERROR. Was INVALID_OPERATION :  colorBufferFormat: RGB565 internalFormat: RGB target: TEXTURE_2D border: 0]
-    expected: FAIL
-
-  [WebGL test #45: getError expected: INVALID_OPERATION. Was NO_ERROR :  colorBufferFormat: RGB565 internalFormat: RGBA target: TEXTURE_2D]
-    expected: FAIL
-
-  [WebGL test #53: getError expected: INVALID_OPERATION. Was NO_ERROR :  colorBufferFormat: RGB internalFormat: RGBA]
-    expected: FAIL
-
-  [WebGL test #61: getError expected: INVALID_OPERATION. Was NO_ERROR :  colorBufferFormat: RGB internalFormat: RGBA]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-attachment-formats.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-attachment-formats.html.ini
deleted file mode 100644
index 57985f1badf..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-attachment-formats.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[texture-attachment-formats.html]
-  type: testharness
-  [WebGL test #14: at (0, 0) expected: 63,63,63,255 was 64,0,0,255]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 63,63,63,63 was 64,0,0,64]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-copying-feedback-loops.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-copying-feedback-loops.html.ini
deleted file mode 100644
index bcbe5e893e6..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-copying-feedback-loops.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[texture-copying-feedback-loops.html]
-  bug: https://github.com/servo/servo/issues/21288
-  type: testharness
-  [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after copyTexImage2D to same texture same level, invalid feedback loop]
-    expected: FAIL
-
-  [WebGL test #6: getError expected: INVALID_OPERATION. Was NO_ERROR : after copyTexSubImage2D to same texture same level, invalid feedback loop]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-fakeblack.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-fakeblack.html.ini
deleted file mode 100644
index e3213f8a1f9..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-fakeblack.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[texture-fakeblack.html]
-  type: testharness
-  [WebGL test #1: at (0, 0) expected: 0,0,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,0,0,255 was 255,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-npot-video.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-npot-video.html.ini
deleted file mode 100644
index 2bfaf29fe82..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-npot-video.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[texture-npot-video.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-npot.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-npot.html.ini
deleted file mode 100644
index 93f3563ded7..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-npot.html.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[texture-npot.html]
-  type: testharness
-  [WebGL test #4: at (0, 0) expected: 0,0,0,255 was 192,0,128,64]
-    expected: FAIL
-
-  [WebGL test #64: at (0, 0) expected: 0,0,0,255 was 0,192,128,255]
-    expected: FAIL
-
-  [WebGL test #76: at (0, 0) expected: 0,0,0,255 was 0,192,128,255]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 0) expected: 0,0,0,255 was 192,0,128,255]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 0,0,0,255 was 192,192,192,255]
-    expected: FAIL
-
-  [WebGL test #40: at (0, 0) expected: 0,0,0,255 was 0,0,0,64]
-    expected: FAIL
-
-  [WebGL test #52: at (0, 0) expected: 0,0,0,255 was 192,192,192,64]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-size-cube-maps.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-size-cube-maps.html.ini
deleted file mode 100644
index 9466a6ef229..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-size-cube-maps.html.ini
+++ /dev/null
@@ -1,146 +0,0 @@
-[texture-size-cube-maps.html]
-  type: testharness
-  [WebGL test #7: at (0, 1) expected: 0,255,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 0) expected: 0,255,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 0) expected: 255,0,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 1) expected: 255,0,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 0) expected: 255,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 1) expected: 0,0,255,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 1) expected: 255,0,255,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 0) expected: 255,0,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 1) expected: 255,0,0,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 0,255,255,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 1) expected: 255,255,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #44: at (0, 1) expected: 255,0,0,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #45: at (0, 0) expected: 255,0,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #47: at (0, 0) expected: 0,255,0,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #50: at (0, 1) expected: 0,255,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #51: at (0, 0) expected: 255,0,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #54: at (0, 1) expected: 0,255,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #62: at (0, 1) expected: 0,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #63: at (0, 0) expected: 0,255,0,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #65: at (0, 0) expected: 0,0,255,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #68: at (0, 1) expected: 0,0,255,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #69: at (0, 0) expected: 255,0,0,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #72: at (0, 1) expected: 255,0,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #80: at (0, 1) expected: 0,0,255,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #81: at (0, 0) expected: 0,0,255,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #83: at (0, 0) expected: 255,255,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #86: at (0, 1) expected: 255,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #87: at (0, 0) expected: 0,255,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #90: at (0, 1) expected: 255,0,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #98: at (0, 1) expected: 255,255,0,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #99: at (0, 0) expected: 255,255,0,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #101: at (0, 0) expected: 0,255,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #104: at (0, 1) expected: 0,255,255,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #105: at (0, 0) expected: 0,0,255,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #108: at (0, 1) expected: 0,255,0,255 was 255,0,255,255]
-    expected: FAIL
-
-  [WebGL test #116: at (0, 1) expected: 0,255,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #117: at (0, 0) expected: 0,255,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #119: at (0, 0) expected: 255,0,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #122: at (0, 1) expected: 255,0,255,255 was 0,0,255,255]
-    expected: FAIL
-
-  [WebGL test #123: at (0, 0) expected: 255,255,0,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #126: at (0, 1) expected: 0,0,255,255 was 255,0,0,255]
-    expected: FAIL
-
-  [WebGL test #134: at (0, 1) expected: 255,0,255,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #135: at (0, 0) expected: 255,0,255,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #137: at (0, 0) expected: 255,0,0,255 was 0,255,255,255]
-    expected: FAIL
-
-  [WebGL test #140: at (0, 1) expected: 255,0,0,255 was 255,255,0,255]
-    expected: FAIL
-
-  [WebGL test #141: at (0, 0) expected: 0,255,255,255 was 0,255,0,255]
-    expected: FAIL
-
-  [WebGL test #144: at (0, 1) expected: 255,255,0,255 was 0,255,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-sub-image-cube-maps.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-sub-image-cube-maps.html.ini
deleted file mode 100644
index 4f8e34db052..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-sub-image-cube-maps.html.ini
+++ /dev/null
@@ -1,116 +0,0 @@
-[texture-sub-image-cube-maps.html]
-  type: testharness
-  [WebGL test #0: unexpected gl error: INVALID_VALUE]
-    expected: FAIL
-
-  [WebGL test #1: at (0, 0) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #2: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #3: at (0, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #4: at (0, 0) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #5: at (0, 0) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #6: at (0, 0) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: at (0, 0) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: at (0, 2) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: at (0, 0) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: at (0, 2) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: at (0, 0) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: at (0, 2) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: at (0, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: at (0, 2) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: at (0, 0) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: at (0, 2) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: at (0, 0) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: at (0, 2) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: unexpected gl error: INVALID_VALUE]
-    expected: FAIL
-
-  [WebGL test #20: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: at (0, 0) expected: 0,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: at (0, 0) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: at (0, 0) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: at (0, 0) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: at (0, 0) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: at (0, 0) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: at (0, 2) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: at (0, 0) expected: 255,0,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: at (0, 2) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: at (0, 0) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: at (0, 2) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: at (0, 0) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: at (0, 2) expected: 255,0,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: at (0, 0) expected: 0,255,255,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: at (0, 2) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: at (0, 2) expected: 255,255,0,255 was 0,0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/texture-upload-size.html.ini b/tests/wpt/webgl/meta/conformance/textures/texture-upload-size.html.ini
deleted file mode 100644
index 8e1092d6c32..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/texture-upload-size.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[texture-upload-size.html]
-  type: testharness
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/__dir__.ini b/tests/wpt/webgl/meta/conformance/textures/video/__dir__.ini
new file mode 100644
index 00000000000..50edf46e40e
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/textures/video/__dir__.ini
@@ -0,0 +1 @@
+disabled: https://github.com/servo/servo/issues/6711
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-alpha-alpha-unsigned_byte.html.ini
deleted file mode 100644
index df505cbab41..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-alpha-alpha-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance-luminance-unsigned_byte.html.ini
deleted file mode 100644
index 94b45973cb3..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-luminance-luminance-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
deleted file mode 100644
index 8c1ea97dfcb..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_byte.html.ini
deleted file mode 100644
index db7310c69ac..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgb-rgb-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
deleted file mode 100644
index a991e224bc2..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_byte.html.ini
deleted file mode 100644
index 8749093a15d..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_byte.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
deleted file mode 100644
index 73bba4ac28e..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
deleted file mode 100644
index d014f432f89..00000000000
--- a/tests/wpt/webgl/meta/conformance/textures/video/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
index ca71a6cfea9..850087c791e 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
index d92f71199a8..895f521fafa 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
index 622bd20a935..1d950e63741 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
index cd4a90bdeb0..1e47b7bff52 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
index 8db787d12ae..f57d4b49dee 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
index 31b05a79f9c..867c649267a 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
index cc446c5d068..ed48cbf2e82 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
index 12eb2792afb..44bb7e49e01 100644
--- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini
@@ -3,6 +3,3 @@
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
index e4789d83a93..0e7a8553461 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/buffer-copying-restrictions.html.ini
@@ -1,5 +1,2 @@
 [buffer-copying-restrictions.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
index af0b120221d..c64b5cf871e 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/buffer-type-restrictions.html.ini
@@ -1,5 +1,2 @@
 [buffer-type-restrictions.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
index 6b5cc31216a..f257d44ffa7 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data-validity.html.ini
@@ -1,5 +1,2 @@
 [get-buffer-sub-data-validity.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
index 49c14d0ef84..084047aa5aa 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/get-buffer-sub-data.html.ini
@@ -1,8 +1,5 @@
 [get-buffer-sub-data.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #2: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray) threw exception TypeError: gl.getBufferSubData is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini b/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
index de2c2b2cad6..7bd6d740747 100644
--- a/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/buffers/uniform-buffers-state-restoration.html.ini
@@ -1,5 +1,2 @@
 [uniform-buffers-state-restoration.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini b/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
index 7f0f3515e12..040678e09c8 100644
--- a/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html.ini
@@ -1,5 +1,2 @@
 [unary-minus-operator-in-dynamic-loop.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini b/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
index aaecb221205..927ee6bab5f 100644
--- a/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/query/occlusion-query.html.ini
@@ -1,5 +1,2 @@
 [occlusion-query.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
index a6cc4f523a5..b95640bd1e1 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers-driver-hang.html.ini
@@ -1,5 +1,2 @@
 [draw-buffers-driver-hang.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini b/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
index 261b5db8e17..dffa002bc9d 100644
--- a/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/sync/sync-webgl-specific.html.ini
@@ -1,8 +1,5 @@
 [sync-webgl-specific.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #3: gl.getError() should be 0. Was 1280.]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
index 942d8ac93df..5d90cc6e16d 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/same-buffer-two-binding-points.html.ini
@@ -1,5 +1,2 @@
 [same-buffer-two-binding-points.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
index b16b96f8084..9d27715d328 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/simultaneous_binding.html.ini
@@ -1,5 +1,2 @@
 [simultaneous_binding.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
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 146c7c06d7a..3e85820845f 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,5 +1,2 @@
 [switching-objects.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
index 3571f1037b9..155f00d8737 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/too-small-buffers.html.ini
@@ -1,5 +1,2 @@
 [too-small-buffers.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini b/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
index 128a77b884d..8c99e9420d6 100644
--- a/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/transform_feedback/transform_feedback.html.ini
@@ -1,8 +1,5 @@
 [transform_feedback.html]
   expected: ERROR
-  [Overall test]
-    expected: NOTRUN
-
   [WebGL test #2: getError expected: NO_ERROR. Was INVALID_ENUM : TRANSFORM_FEEDBACK_BINDING query should succeed]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html b/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html
index 9991e9beec6..f423e17f563 100644
--- a/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html
+++ b/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html
@@ -29,7 +29,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" content="long">
 <title>WebGL Rapid Resizing Test</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html b/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html
index 3ad7a02d79c..a3912fcf7ea 100644
--- a/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html
+++ b/tests/wpt/webgl/tests/conformance/context/context-creation-and-destruction.html
@@ -29,7 +29,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" content="long">
 <title>Test that contexts are freed and garbage collected reasonably</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/webgl/tests/conformance/context/context-creation.html b/tests/wpt/webgl/tests/conformance/context/context-creation.html
index 237258cc9d9..d8685e48fcb 100644
--- a/tests/wpt/webgl/tests/conformance/context/context-creation.html
+++ b/tests/wpt/webgl/tests/conformance/context/context-creation.html
@@ -29,7 +29,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" content="long">
 <title>Test that you can create large numbers of WebGL contexts.</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/webgl/tests/js/js-test-pre.js b/tests/wpt/webgl/tests/js/js-test-pre.js
index f2c8167240a..294bd4c5a21 100644
--- a/tests/wpt/webgl/tests/js/js-test-pre.js
+++ b/tests/wpt/webgl/tests/js/js-test-pre.js
@@ -142,9 +142,10 @@ function notifyFinishedToHarness() {
 }
 
 (function () {
-  var oldNotify = notifyFinishedToHarness;
   var t = async_test("Overall test");
-  window.notifyFinishedToHarness = t.step_func_done(oldNotify);
+  var done = t.step_func_done(notifyFinishedToHarness);
+  window.notifyFinishedToHarness = done;
+  window.addEventListener("error", done);
 }())
 
 var _bufferedConsoleLogs = [];
diff --git a/tests/wpt/webgl/tests/js/webgl-test-utils.js b/tests/wpt/webgl/tests/js/webgl-test-utils.js
index 5ab8b2cfd07..0ef194eacc2 100644
--- a/tests/wpt/webgl/tests/js/webgl-test-utils.js
+++ b/tests/wpt/webgl/tests/js/webgl-test-utils.js
@@ -2876,34 +2876,9 @@ var waitForComposite = function(callback) {
   countDown();
 };
 
-var setZeroTimeout = (function() {
-  // See https://dbaron.org/log/20100309-faster-timeouts
-
-  var timeouts = [];
-  var messageName = "zero-timeout-message";
-
-  // Like setTimeout, but only takes a function argument.  There's
-  // no time argument (always zero) and no arguments (you have to
-  // use a closure).
-  function setZeroTimeout(fn) {
-      timeouts.push(fn);
-      window.postMessage(messageName, "*");
-  }
-
-  function handleMessage(event) {
-      if (event.source == window && event.data == messageName) {
-          event.stopPropagation();
-          if (timeouts.length > 0) {
-              var fn = timeouts.shift();
-              fn();
-          }
-      }
-  }
-
-  window.addEventListener("message", handleMessage, true);
-
-  return setZeroTimeout;
-})();
+var setZeroTimeout = function(handler) {
+  window.setTimeout(handler, 0);
+}
 
 /**
  * Runs an array of functions, yielding to the browser between each step.
diff --git a/tests/wpt/webgl/tools/import-conformance-tests.py b/tests/wpt/webgl/tools/import-conformance-tests.py
index 56d9ac2f61a..58afe1ddc77 100755
--- a/tests/wpt/webgl/tools/import-conformance-tests.py
+++ b/tests/wpt/webgl/tools/import-conformance-tests.py
@@ -13,8 +13,8 @@ KHRONOS_REPO_URL = "https://github.com/KhronosGroup/WebGL.git"
 PATCHES = [
     ("js-test-pre.patch", "js/js-test-pre.js"),
     ("unit.patch", "conformance/more/unit.js"),
-    ("unit2.patch", "conformance/more/unit.js"),
-    ("timeout.patch", None)
+    ("timeout.patch", None),
+    ("set-zero-timeout.patch", "js/webgl-test-utils.js"),
 ]
 
 # Fix for 'UnicodeDecodeError: 'ascii' codec can't decode byte'
diff --git a/tests/wpt/webgl/tools/js-test-pre.patch b/tests/wpt/webgl/tools/js-test-pre.patch
index 0d615f2e163..a824bfbf679 100644
--- a/tests/wpt/webgl/tools/js-test-pre.patch
+++ b/tests/wpt/webgl/tools/js-test-pre.patch
@@ -30,14 +30,15 @@
  
  function reportSkippedTestResultsToHarness(success, msg) {
    if (window.parent.webglTestHarness) {
-@@ -127,6 +141,12 @@
+@@ -127,6 +141,13 @@
    }
  }
  
 +(function () {
-+  var oldNotify = notifyFinishedToHarness;
 +  var t = async_test("Overall test");
-+  window.notifyFinishedToHarness = t.step_func_done(oldNotify);
++  var done = t.step_func_done(notifyFinishedToHarness);
++  window.notifyFinishedToHarness = done;
++  window.addEventListener("error", done);
 +}())
 +
  var _bufferedConsoleLogs = [];
diff --git a/tests/wpt/webgl/tools/js-test-pre2.patch b/tests/wpt/webgl/tools/js-test-pre2.patch
deleted file mode 100644
index 13cb667374c..00000000000
--- a/tests/wpt/webgl/tools/js-test-pre2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/conformance-suites/2.0.0/js/js-test-pre.js b/conformance-suites/2.0.0/js/js-test-pre.js
-index df30a6f..7ca8559 100644
---- a/conformance-suites/2.0.0/js/js-test-pre.js
-+++ b/conformance-suites/2.0.0/js/js-test-pre.js
-@@ -111,11 +111,25 @@ function nonKhronosFrameworkNotifyDone() {
-   }
- }
- 
--function reportTestResultsToHarness(success, msg) {
--  if (window.parent.webglTestHarness) {
--    window.parent.webglTestHarness.reportResults(window.location.pathname, success, msg);
--  }
--}
-+(function() {
-+    var WPT_TEST_ID = 0;
-+  
-+    // Store the current WPT test harness `test` function
-+    // if found, since it's overriden by some tests.
-+    var wpt_test = window.test;
-+    var wpt_assert_true = window.assert_true;
-+    var wt_async_test = window.async_test;
-+  
-+    window.reportTestResultsToHarness = function reportTestResultsToHarness(success, msg) {
-+      if (window.parent.webglTestHarness) {
-+        window.parent.webglTestHarness.reportResults(window.location.pathname, success, msg);
-+      } else if (wpt_test) { // WPT test harness
-+        wpt_test(function () {
-+          wpt_assert_true(success, msg);
-+        }, "WebGL test #" + (WPT_TEST_ID++) + ": " + msg);
-+      }
-+    }
-+ }())
- 
- function reportSkippedTestResultsToHarness(success, msg) {
-   if (window.parent.webglTestHarness) {
-@@ -132,6 +146,12 @@ function notifyFinishedToHarness() {
-   }
- }
- 
-+(function() {
-+    var oldNotify = notifyFinishedToHarness;
-+    var t = async_test("Overall test");
-+    window.notifyFinishedToHarness = t.step_func_done(oldNotify);
-+}())
-+
- var _bufferedConsoleLogs = [];
- 
- function _bufferedLogToConsole(msg)
-@@ -162,7 +182,7 @@ function _flushBufferedLogsToConsole()
-   }
- }
- 
--var _jsTestPreVerboseLogging = false;
-+var _jsTestPreVerboseLogging = true;
- 
- function enableJSTestPreVerboseLogging()
- {
-@@ -175,24 +195,12 @@ function description(msg)
-     if (msg === undefined) {
-       msg = document.title;
-     }
--    // For MSIE 6 compatibility
--    var span = document.createElement("span");
--    span.innerHTML = '<p>' + msg + '</p><p>On success, you will see a series of "<span class="pass">PASS</span>" messages, followed by "<span class="pass">TEST COMPLETE</span>".</p>';
--    var description = document.getElementById("description");
--    if (description.firstChild)
--        description.replaceChild(span, description.firstChild);
--    else
--        description.appendChild(span);
--    if (_jsTestPreVerboseLogging) {
--        _bufferedLogToConsole(msg);
--    }
-+
-+    _bufferedLogToConsole("DESCRIPTION: " +msg);
- }
- 
- function _addSpan(contents)
- {
--    var span = document.createElement("span");
--    document.getElementById("console").appendChild(span); // insert it first so XHTML knows the namespace
--    span.innerHTML = contents + '<br />';
- }
- 
- function debug(msg)
diff --git a/tests/wpt/webgl/tools/set-zero-timeout.patch b/tests/wpt/webgl/tools/set-zero-timeout.patch
new file mode 100644
index 00000000000..94b4ae8bbe2
--- /dev/null
+++ b/tests/wpt/webgl/tools/set-zero-timeout.patch
@@ -0,0 +1,40 @@
+--- js/webgl-test-utils.js
++++ js/webgl-test-utils.js
+@@ -2876,34 +2876,9 @@ var waitForComposite = function(callback) {
+   countDown();
+ };
+
+-var setZeroTimeout = (function() {
+-  // See https://dbaron.org/log/20100309-faster-timeouts
+-
+-  var timeouts = [];
+-  var messageName = "zero-timeout-message";
+-
+-  // Like setTimeout, but only takes a function argument.  There's
+-  // no time argument (always zero) and no arguments (you have to
+-  // use a closure).
+-  function setZeroTimeout(fn) {
+-      timeouts.push(fn);
+-      window.postMessage(messageName, "*");
+-  }
+-
+-  function handleMessage(event) {
+-      if (event.source == window && event.data == messageName) {
+-          event.stopPropagation();
+-          if (timeouts.length > 0) {
+-              var fn = timeouts.shift();
+-              fn();
+-          }
+-      }
+-  }
+-
+-  window.addEventListener("message", handleMessage, true);
+-
+-  return setZeroTimeout;
+-})();
++var setZeroTimeout = function(handler) {
++  window.setTimeout(handler, 0);
++}
+
+ /**
+  * Runs an array of functions, yielding to the browser between each step.
diff --git a/tests/wpt/webgl/tools/timeout.patch b/tests/wpt/webgl/tools/timeout.patch
index 112dc9965e8..5198156de9d 100644
--- a/tests/wpt/webgl/tools/timeout.patch
+++ b/tests/wpt/webgl/tools/timeout.patch
@@ -10,42 +10,6 @@ index de45ce308c..11a83ac00a 100644
  <title>WebGL Enable Vertex Attrib Zero Test</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
-diff --git i/conformance/canvas/rapid-resizing.html w/conformance/canvas/rapid-resizing.html
-index 1faa737222..89f9e1e3c2 100644
---- i/conformance/canvas/rapid-resizing.html
-+++ w/conformance/canvas/rapid-resizing.html
-@@ -29,6 +29,7 @@
- <html>
- <head>
- <meta charset="utf-8">
-+<meta name="timeout" content="long">
- <title>WebGL Rapid Resizing Test</title>
- <link rel="stylesheet" href="../../resources/js-test-style.css"/>
- <script src=/resources/testharness.js></script>
-diff --git i/conformance/context/context-creation-and-destruction.html w/conformance/context/context-creation-and-destruction.html
-index a02dd2d14c..47099e57bd 100644
---- i/conformance/context/context-creation-and-destruction.html
-+++ w/conformance/context/context-creation-and-destruction.html
-@@ -29,6 +29,7 @@
- <html>
- <head>
- <meta charset="utf-8">
-+<meta name="timeout" content="long">
- <title>Test that contexts are freed and garbage collected reasonably</title>
- <link rel="stylesheet" href="../../resources/js-test-style.css"/>
- <script src=/resources/testharness.js></script>
-diff --git i/conformance/context/context-creation.html w/conformance/context/context-creation.html
-index 04b138daf4..703bcfa8dc 100644
---- i/conformance/context/context-creation.html
-+++ w/conformance/context/context-creation.html
-@@ -29,6 +29,7 @@
- <html>
- <head>
- <meta charset="utf-8">
-+<meta name="timeout" content="long">
- <title>Test that you can create large numbers of WebGL contexts.</title>
- <link rel="stylesheet" href="../../resources/js-test-style.css"/>
- <script src=/resources/testharness.js></script>
 diff --git i/conformance/context/context-eviction-with-garbage-collection.html w/conformance/context/context-eviction-with-garbage-collection.html
 index 3989c7679a..b52e3a9e9f 100644
 --- i/conformance/context/context-eviction-with-garbage-collection.html
diff --git a/tests/wpt/webgl/tools/unit.patch b/tests/wpt/webgl/tools/unit.patch
index 43c57b9dbb4..95eaedb59ad 100644
--- a/tests/wpt/webgl/tools/unit.patch
+++ b/tests/wpt/webgl/tools/unit.patch
@@ -1,11 +1,20 @@
-diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suites/1.0.3/conformance/more/unit.js
-index 89f4e87..742f8d7 100644
---- a/conformance-suites/1.0.3/conformance/more/unit.js
-+++ b/conformance-suites/1.0.3/conformance/more/unit.js
+--- a/conformance/conformance/more/unit.js
++++ b/conformance/conformance/more/unit.js
+@@ -53,6 +53,10 @@ if (window.internals) {
+   window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
+ }
+
++if (window.async_test) {
++    var __overall_test = async_test('Overall test');
++}
++
+ /* -- end platform specific code --*/
+ Tests = {
+   autorun : true,
 @@ -892,9 +892,14 @@ GLConstants = [
  0x809D
  ];
- 
+
 +var WPT_TEST_ID = 0;
  function reportTestResultsToHarness(success, msg) {
    if (window.parent.webglTestHarness) {
@@ -17,3 +26,13 @@ index 89f4e87..742f8d7 100644
    }
  }
  
+@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
+   if (window.parent.webglTestHarness) {
+     window.parent.webglTestHarness.notifyFinished(window.location.pathname);
+   }
++  if (window.__overall_test) {
++    window.__overall_test.done();
++  }
+ }
+
+ function initTests() {
diff --git a/tests/wpt/webgl/tools/unit2.patch b/tests/wpt/webgl/tools/unit2.patch
deleted file mode 100644
index 7678d4ae72a..00000000000
--- a/tests/wpt/webgl/tools/unit2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/conformance-suites/1.0.3/conformance/more/unit.js b/conformance-suits/1.0.3/conformance/more/unit.js
-index 742f8d7b9d..428c164699 100644
---- a/conformance-suites/1.0.3/conformance/more/unit.js
-+++ b/conformance-suites/1.0.3/conformance/more/unit.js
-@@ -53,6 +53,10 @@ if (window.internals) {
-   window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
- }
-
-+if (window.async_test) {
-+    var __overall_test = async_test('Overall test');
-+}
-+
- /* -- end platform specific code --*/
- Tests = {
-   autorun : true,
-@@ -907,6 +911,9 @@ function notifyFinishedToHarness() {
-   if (window.parent.webglTestHarness) {
-     window.parent.webglTestHarness.notifyFinished(window.location.pathname);
-   }
-+  if (window.__overall_test) {
-+    window.__overall_test.done();
-+  }
- }
-
- function initTests() {