diff --git a/components/script/dom/gpucomputepipeline.rs b/components/script/dom/gpucomputepipeline.rs
index 6a85fe1fc1d..604af2373e0 100644
--- a/components/script/dom/gpucomputepipeline.rs
+++ b/components/script/dom/gpucomputepipeline.rs
@@ -78,15 +78,13 @@ impl GPUComputePipelineMethods for GPUComputePipeline {
 
     /// https://gpuweb.github.io/gpuweb/#dom-gpupipelinebase-getbindgrouplayout
     fn GetBindGroupLayout(&self, index: u32) -> Fallible<DomRoot<GPUBindGroupLayout>> {
-        if index > self.bind_group_layouts.len() as u32 ||
-            index > self.device.limits().maxBindGroups
-        {
+        if index > self.bind_group_layouts.len() as u32 {
             return Err(Error::Range(String::from("Index out of bounds")));
         }
-        return Ok(GPUBindGroupLayout::new(
+        Ok(GPUBindGroupLayout::new(
             &self.global(),
             self.bind_group_layouts[index as usize],
             None,
-        ));
+        ))
     }
 }
diff --git a/components/script/dom/gpurenderpipeline.rs b/components/script/dom/gpurenderpipeline.rs
index 31dd4029795..9914b1d3114 100644
--- a/components/script/dom/gpurenderpipeline.rs
+++ b/components/script/dom/gpurenderpipeline.rs
@@ -78,15 +78,13 @@ impl GPURenderPipelineMethods for GPURenderPipeline {
 
     /// https://gpuweb.github.io/gpuweb/#dom-gpupipelinebase-getbindgrouplayout
     fn GetBindGroupLayout(&self, index: u32) -> Fallible<DomRoot<GPUBindGroupLayout>> {
-        if index > self.bind_group_layouts.len() as u32 ||
-            index > self.device.limits().maxBindGroups
-        {
+        if index > self.bind_group_layouts.len() as u32 {
             return Err(Error::Range(String::from("Index out of bounds")));
         }
-        return Ok(GPUBindGroupLayout::new(
+        Ok(GPUBindGroupLayout::new(
             &self.global(),
             self.bind_group_layouts[index as usize],
             None,
-        ));
+        ))
     }
 }
diff --git a/tests/wpt/webgpu/meta/MANIFEST.json b/tests/wpt/webgpu/meta/MANIFEST.json
index f45fcb38480..fce2c9e2efa 100644
--- a/tests/wpt/webgpu/meta/MANIFEST.json
+++ b/tests/wpt/webgpu/meta/MANIFEST.json
@@ -439,7 +439,7 @@
   "testharness": {
    "webgpu": {
     "cts.html": [
-     "63357f7e996ecadde32f6816dc131b94e9ab976c",
+     "c5bc2536ab14b1174b7c01f35c85cfc6e62f5418",
      [
       "webgpu/cts.html?q=webgpu:api,operation,buffers,map_detach:*",
       {}
@@ -460,18 +460,10 @@
       "webgpu/cts.html?q=webgpu:api,operation,command_buffer,render,basic:*",
       {}
      ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,copyBetweenLinearDataAndTexture:*",
-      {}
-     ],
      [
       "webgpu/cts.html?q=webgpu:api,operation,fences:*",
       {}
      ],
-     [
-      "webgpu/cts.html?q=webgpu:api,operation,render_pass,storeOp:*",
-      {}
-     ],
      [
       "webgpu/cts.html?q=webgpu:api,validation,copyBufferToBuffer:*",
       {}
diff --git a/tests/wpt/webgpu/tests/webgpu/cts.html b/tests/wpt/webgpu/tests/webgpu/cts.html
index 63357f7e996..c5bc2536ab1 100644
--- a/tests/wpt/webgpu/tests/webgpu/cts.html
+++ b/tests/wpt/webgpu/tests/webgpu/cts.html
@@ -33,9 +33,9 @@
 <meta name=variant content='?q=webgpu:api,operation,command_buffer,basic:*'>
 <meta name=variant content='?q=webgpu:api,operation,command_buffer,copies:*'>
 <meta name=variant content='?q=webgpu:api,operation,command_buffer,render,basic:*'>
-<meta name=variant content='?q=webgpu:api,operation,copyBetweenLinearDataAndTexture:*'>
+<!--<meta name=variant content='?q=webgpu:api,operation,copyBetweenLinearDataAndTexture:*'>-->
 <meta name=variant content='?q=webgpu:api,operation,fences:*'>
-<meta name=variant content='?q=webgpu:api,operation,render_pass,storeOp:*'>
+<!--<meta name=variant content='?q=webgpu:api,operation,render_pass,storeOp:*'>-->
 <!--<meta name=variant content='?q=webgpu:api,operation,resource_init,copied_texture_clear:*'>-->
 <meta name=variant content='?q=webgpu:api,validation,copyBufferToBuffer:*'>
 <meta name=variant content='?q=webgpu:api,validation,copy_between_linear_data_and_texture,copyBetweenLinearDataAndTexture_dataRelated:*'>