diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
index 0269436..62304ae 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -61,6 +61,7 @@
 359729255 D3D9 : VertexAttributeTest.VertexAttribPointerCopyBufferFromInvalid* = SKIP
 359729255 D3D11 : VertexAttributeTest.VertexAttribPointerCopyBufferFromInvalid* = SKIP
 359729255 METAL : VertexAttributeTest.VertexAttribPointerCopyBufferFromInvalid* = SKIP
+359729255 WGPU : VertexAttributeTest.VertexAttribPointerCopyBufferFromInvalid* = SKIP
 
 // Propagate buffer changes to VertexArray fail on some desktop drivers
 433331119 LINUX NVIDIA OPENGL : ValidationStateChangeTest.RebindBufferShouldPickupBufferChange/* = SKIP
@@ -1810,6 +1811,8 @@
 42264369 ANDROID GLES : TextureBufferTestES31.DrawCompleteNonZeroTexture/* = SKIP
 
 // WebGPU failures
+// All tests are flaky on Linux Intel due to X errors.
+454630429 WGPU LINUX INTEL : * = SKIP
 // BasicUniformUsage tests fail too frequently with WGPU
 376553328 LINUX INTEL WGPU : BasicUniformUsageTest.* = SKIP
 // Can't use a uniform struct outside of uniform address space.
@@ -1838,6 +1841,190 @@
 383356846 WGPU : LineLoopTest.DrawTriangleElementsBetweenArrays/* = SKIP
 383356846 WGPU : LineLoopTest.*IndicesBlend* = SKIP
 383356846 WGPU : LineLoopTest.*BufferBlend* = SKIP
+
+42266907 WGPU : AddMockTextureNoRenderTargetTest.NoProgramOutputWorkaround/* = SKIP
+42266907 WGPU : AttributeLayoutBufferIndexed.Test/* = SKIP
+42266907 WGPU : AttributeLayoutMemoryIndexed.Test/* = SKIP
+42266907 WGPU : AttributeLayoutNonIndexed.Test/* = SKIP
+42266907 WGPU : BindUniformLocationTest.Compositor/* = SKIP
+42266907 WGPU : BlendPackedTest.RGB565/* = SKIP
+42266907 WGPU : DebugMarkerTest.Rendering/* = SKIP
+42266907 WGPU : DepthStencilFormatsTest.DepthBuffer16/* = SKIP
+42266907 WGPU : DepthStencilTest.StencilOnlyEmulatedWithPacked/* = SKIP
+42266907 WGPU : FramebufferFormatsTest.RGB565Renderbuffer/* = SKIP
+42266907 WGPU : FramebufferFormatsTest.RGB8AndRGBA8Renderbuffers/* = SKIP
+42266907 WGPU : FramebufferFormatsTest.RGB8Renderbuffer/* = SKIP
+42267100 WGPU : GLSLTest.SwizzledChainedAssignIncrement/* = SKIP
+42267100 WGPU : GLSLTest.NamelessScopedStructs/* = SKIP
+42267100 WGPU : GLSLTest.ScopedStructsOrderBug/* = SKIP
+42267100 WGPU : GLSLTest.ScopedStructsOrderBug2/* = SKIP
+42267100 WGPU : GLSLTest.StructConstantFoldingBug2/* = SKIP
+42267100 WGPU : GLSLTest.ScopedStructsBug/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnFloat/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnVec2/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnVec3/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnVec4/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnIVec4/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnMat4/* = SKIP
+42267100 WGPU : GLSLTest.MissingReturnStruct/* = SKIP
+42267100 WGPU : GLSLTest.CommaTestNoRedundantStatements/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec4_TwoBuiltins/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec4_ThreeBuiltins/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec3Array/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec3AndOneFloat/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec3ArrayAndOneFloatArray/* = SKIP
+42267100 WGPU : GLSLTest.MaxVaryingVec2Arrays/* = SKIP
+42267100 WGPU : GLSLTest.VerifyMaxVertexUniformVectorsWithSamplers/* = SKIP
+42267100 WGPU : GLSLTest.VerifyMaxFragmentUniformVectorsWithSamplers/* = SKIP
+42267100 WGPU : GLSLTest.TextureLODRewriteInVertexShader/* = SKIP
+42267100 WGPU : GLSLTest.ArrayOfStructContainingArrayOfSamplers/* = SKIP
+42267100 WGPU : GLSLTest.IndexConstantSamplerArrayIndexing/* = SKIP
+42267100 WGPU : GLSLTest.RenderTrisWithPointCoord/* = SKIP
+42267100 WGPU : GLSLTest.NestedSequenceOperatorWithTernaryInside/* = SKIP
+42267100 WGPU : GLSLTest.NestedTernaryAndShortCircuit/* = SKIP
+42267100 WGPU : GLSLTest.VaryingMatrixArray/* = SKIP
+42267100 WGPU : GLSLTest.InactiveVaryingInVertexActiveInFragment/* = SKIP
+42267100 WGPU : GLSLTest.StructsWithSamplersAsFunctionArgWithPrototype/* = SKIP
+42267100 WGPU : GLSLTest.ArrayOfStructsWithSamplersAsFunctionArg/* = SKIP
+42267100 WGPU : GLSLTest.StructWithSamplerArrayAsFunctionArg/* = SKIP
+42267100 WGPU : GLSLTest.VectorScalarDivideAndAddInLoop/* = SKIP
+42267100 WGPU : GLSLTest.PointCoordConsistency/* = SKIP
+42267100 WGPU : GLSLTest.ScreenFlipCauseStandardDerivativesWrong/* = SKIP
+42267100 WGPU : GLSLTest.FragCoordConsistency/* = SKIP
+42267100 WGPU : GLSLTest.FragData/* = SKIP
+42267100 WGPU : GLSLTest.FragData_AlphaToCoverage/* = SKIP
+42267100 WGPU : GLSLTest.SeparateStructDeclaratorStructInStruct/* = SKIP
+42267100 WGPU : GLSLTest.ConstructorinSequenceOperator/* = SKIP
+42267100 WGPU : GLSLTest.VectorAndMatrixScalarizationDoesNotAffectRendering/* = SKIP
+42267100 WGPU : GLSLTest.AliasingFunctionOutParams/* = SKIP
+42267100 WGPU : GLSLTest.AliasingFunctionOutParamsMultiple/* = SKIP
+42267100 WGPU : GLSLTest.AliasingFunctionInOutParams/* = SKIP
+42267100 WGPU : GLSLTest.MatrixScalarOps/* = SKIP
+42267100 WGPU : GLSLTest.MatrixNegate/* = SKIP
+42267100 WGPU : GLSLTest.AliasingFunctionInOutParamsMultiple/* = SKIP
+42267100 WGPU : GLSLTest.AliasingFunctionOutParamAndGlobal/* = SKIP
+42267100 WGPU : GLSLTest.ConstSamplerParameter/* = SKIP
+42267100 WGPU : GLSLTest.ConstInSamplerParameter/* = SKIP
+42267100 WGPU : GLSLTest.ConstSamplerParameterAsArgument/* = SKIP
+42267100 WGPU : GLSLTest.StructDefinitionInFunctionPrototype/* = SKIP
+42267100 WGPU : GLSLTest.NestedReturnedStructs/* = SKIP
+42267100 WGPU : GLSLTest.MatEquality/* = SKIP
+42267100 WGPU : GLSLTest.StructEquality/* = SKIP
+42267100 WGPU : GLSLTest.NestedStructEquality/* = SKIP
+42267100 WGPU : GLSLTest.VectorScalarArithmeticWithSideEffectInLoop/* = SKIP
+42267100 WGPU : GLSLTestNoValidation.DepthRangeUniforms/* = SKIP
+42266907 WGPU : IncompleteTextureTest.IncompleteTexture2D/* = SKIP
+42266907 WGPU : IncompleteTextureTest.UpdateTexture/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.DrawArraysLineLoopFollowedByDrawElementsTriangle/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.DrawAtDifferentOffsetAlignments/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.DrawWithDifferentCountsSameOffset/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.DrawWithSameBufferButDifferentModes/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.DrawWithSameBufferButDifferentTypes/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.UInt8Index/* = SKIP
+42266907 WGPU : IndexBufferOffsetTest.UInt8IndexSmallUpdates/* = SKIP
+42266907 WGPU : IndexedPointsTest* = SKIP
+42266907 WGPU : LinkAndRelinkTest.RenderingProgramFailsWithProgramInstalled/* = SKIP
+42266907 WGPU : LineLoopStateChangeTest.DrawElementsThenDrawArrays/* = SKIP
+42266907 WGPU : LineLoopStateChangeTest.DrawArraysThenDrawElements/* = SKIP
+42266907 WGPU : LineLoopStateChangeTest.DrawElementsThenDrawElements/* = SKIP
+42266907 WGPU : MaskedScissoredClearTest.Test/* = SKIP
+42266907 WGPU : PbufferTest.* = SKIP
+42266907 WGPU : PointSpritesTest.* = SKIP
+42266907 WGPU : RobustResourceInitTest.* = SKIP
+42266907 WGPU : Sampler2DAsFunctionParameterTest.Sampler2DAsFunctionParameter/* = SKIP
+42266907 WGPU : SamplerArrayAsFunctionParameterTest.SamplerArrayAsFunctionParameter/* = SKIP
+42266907 WGPU : SamplerArrayTest.SamplerArrayDraw/* = SKIP
+42266907 WGPU : SamplerInNestedStructAsFunctionParameterTest.SamplerInNestedStructAsFunctionParameter/* = SKIP
+42266907 WGPU : SamplerInStructArrayAsFunctionParameterTest.SamplerInStructArrayAsFunctionParameter/* = SKIP
+395659799 WGPU : SimpleOperationTest.BlendEquationGetInteger/* = SKIP
+395659799 WGPU : SimpleOperationTest.DrawsWithNoAttributeData/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DeleteNonActiveTextureThenDraw/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DeleteTextureThenDraw/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawArraysThenDrawElements/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawArraysWithZeroSizedElementArrayBuffer/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawElementsThenDrawElementsNewIndexBuffer/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawElementsThenDrawElementsNewIndices/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawElementsThenDrawElementsWholeNewIndices/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawElementsUBYTEX2ThenDrawElementsUSHORT/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawRepeatUnalignedVboChange/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.DrawWithTextureTexSubImageThenDrawAgain/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.FboEarlyCullFaceBackCCWState/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.FboEarlyCullFaceBackCWState/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.RebindTranslatedAttribute/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.RedefineFramebufferTexture/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.RedefineTextureInUse/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.UpdateBoundElementArrayBuffer/* = SKIP
+42266907 WGPU : SimpleStateChangeTest.UpdateBufferInUse/* = SKIP
+42266907 WGPU : SixteenBppTextureTest.RGB565Validation/* = SKIP
+42266907 WGPU : SixteenBppTextureTest.RGBA4444Validation/* = SKIP
+42266907 WGPU : SixteenBppTextureTest.RGBA5551Validation/* = SKIP
+42266907 WGPU : StateChangeRenderTest.DepthRangeUpdates/* = SKIP
+42266907 WGPU : StateChangeRenderTest.GenerateMipmap/* = SKIP
+42266907 WGPU : StateChangeRenderTest.RecreateTexture/* = SKIP
+42266907 WGPU : StateChangeTest.DisablingBufferedVertexAttribute/* = SKIP
+42266907 WGPU : StateChangeTest.MultiContextVertexAttribute/* = SKIP
+42266907 WGPU : StateChangeTest.SetCurrentAttribute/* = SKIP
+42266907 WGPU : Texture2DTestWithDrawScale.MipmapsTwice/* = SKIP
+42266907 WGPU : TextureCubeTest.CubeMapFBOScissoredClear/* = SKIP
+42266907 WGPU : TextureLimitsTest.MaxActiveVertexTextures/* = SKIP
+42266907 WGPU : TextureLimitsTest.MaxCombinedTextures/* = SKIP
+42266907 WGPU : TextureLimitsTest.MaxVertexTextures/* = SKIP
+42266907 WGPU : TextureLimitsTest.TextureTypeConflict/* = SKIP
+42266907 WGPU : TextureUploadFormatTest.All/* = SKIP
+42266907 WGPU : TriangleFanDrawTest.DrawTriangleFan/* = SKIP
+42266907 WGPU : TriangleFanDrawTest.DrawTriangleFanElements/* = SKIP
+42266907 WGPU : UniformTest.SamplerUniformsAppearOnce/* = SKIP
+42266907 WGPU : UniformTest.UnusedUniformsInSamplerArray/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment1AUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment1LAUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment1LUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment2AUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment2LAByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment2LAUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment4AUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment4LAUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment4LUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment8AUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment8LAUByte/* = SKIP
+42266907 WGPU : UnpackAlignmentTest.Alignment8LUByte/* = SKIP
+42266907 WGPU : VertexAttributeCachingTest.BufferMulticaching/* = SKIP
+42266907 WGPU : VertexAttributeCachingTest.BufferMulticachingWithOneUnchangedAttrib/* = SKIP
+42266907 WGPU : VertexAttributeTest.AliasingVectorAttribLocationsDifferingPrecisions/* = SKIP
+42266907 WGPU : VertexAttributeTest.DisabledAttribArrays/* = SKIP
+42266907 WGPU : VertexAttributeTest.DisabledAttribUpdates/* = SKIP
+42266907 WGPU : VertexAttributeTest.DrawArraysWithAlignedAndUnalignedBufferOffset/* = SKIP
+42266907 WGPU : VertexAttributeTest.DrawArraysWithOverlapBufferSubData/* = SKIP
+42266907 WGPU : VertexAttributeTest.DrawArraysWithUnalignedBufferOffset/* = SKIP
+42266907 WGPU : VertexAttributeTest.MaxAttribs/* = SKIP
+42266907 WGPU : VertexAttributeTest.MixedMatrixSources/* = SKIP
+42266907 WGPU : VertexAttributeTest.MixedUsingBufferAndClientMemoryPointer/* = SKIP
+42266907 WGPU : VertexAttributeTest.NegativeUsingDifferentFormatAndSameBuffer/* = SKIP
+42266907 WGPU : VertexAttributeTest.NegativeUsingDifferentFormatAndSameClientMemoryPointer/* = SKIP
+42266907 WGPU : VertexAttributeTest.ShortNormalized/* = SKIP
+42266907 WGPU : VertexAttributeTest.SimpleBindAttribLocation/* = SKIP
+42266907 WGPU : VertexAttributeTest.UnusedVertexAttribWorks/* = SKIP
+42266907 WGPU : VertexAttributeTest.UsingDifferentFormatAndSameBuffer/* = SKIP
+42266907 WGPU : VertexAttributeTest.UsingDifferentFormatAndSameClientMemoryPointer/* = SKIP
+42266907 WGPU : VertexAttributeTest.VertexFormatConversionOfNonExistingAttribute/* = SKIP
+42266907 WGPU : WebGLGLSLTest.MaxVaryingVec4PlusPointCoord/* = SKIP
+42266907 WGPU : WebGLGLSLTest.MaxPlusOneVaryingVec3Array/* = SKIP
+42266907 WGPU : WebGLGLSLTest.MaxVaryingVec3ArrayAndMaxPlusOneFloatArray/* = SKIP
+42266907 WGPU : WebGLGLSLTest.InitUninitializedGlobals/* = SKIP
+42266907 WGPU : WebGLGLSLTest.GlobalVariableDeclaredAfterMain/* = SKIP
+42266907 WGPU : WebGLGLSLTest.InvalidGlobalsNotInlined/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.DepthStencilBindingPoint/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.DrawElementsBufferOutOfBoundsInIndexBuffer/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.DrawElementsBufferOutOfBoundsInVertexBuffer/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.DrawElementsOffsetRestriction/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.TextureCopyingFeedbackLoops/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.BuiltInInvariant/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.StencilTestDisabledAllowsDifferentStencilMaskAndRef/* = SKIP
+42266907 WGPU : WebGLCompatibilityTest.StencilTestEnabledDisallowsDifferentStencilMaskAndRef/* = SKIP
+42266907 WGPU : WebGLFramebufferTest.TestAttachments/* = SKIP
+42266907 WGPU : WebGLFramebufferTest.TestFramebufferRequiredCombinations/* = SKIP
+42266907 WGPU : WebGLReadOutsideFramebufferTest.CopyTexSubImage2D/* = SKIP
+42266907 WGPU : WebGLReadOutsideFramebufferTest.CopyTexImage2D/* = SKIP
+
 // 42267100 failures are due to the shader (which uses textures) failing to compile
 42267100 WGPU : Texture2DTest.NegativeAPISubImage* = SKIP
 42267100 WGPU : Texture2DTest.ZeroSizedUploads* = SKIP
diff --git a/src/tests/gl_tests/ClearTest.cpp b/src/tests/gl_tests/ClearTest.cpp
index 1b2f0fc..251163a 100644
--- a/src/tests/gl_tests/ClearTest.cpp
+++ b/src/tests/gl_tests/ClearTest.cpp
@@ -6565,8 +6565,7 @@
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(
     ClearTest,
     ES3_VULKAN().enable(Feature::ForceFallbackFormat),
-    ES3_VULKAN().enable(Feature::PreferDrawClearOverVkCmdClearAttachments),
-    ES2_WEBGPU());
+    ES3_VULKAN().enable(Feature::PreferDrawClearOverVkCmdClearAttachments));
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ClearTestES3);
 ANGLE_INSTANTIATE_TEST_ES3_AND(
diff --git a/src/tests/gl_tests/CopyTexImageTest.cpp b/src/tests/gl_tests/CopyTexImageTest.cpp
index 6f22e82..c3b0c15 100644
--- a/src/tests/gl_tests/CopyTexImageTest.cpp
+++ b/src/tests/gl_tests/CopyTexImageTest.cpp
@@ -1821,7 +1821,6 @@
 ANGLE_INSTANTIATE_TEST_ES2_AND(
     CopyTexImageTest,
     ES2_D3D11_PRESENT_PATH_FAST(),
-    ES2_WEBGPU(),
     ES3_VULKAN(),
     ES2_OPENGL().enable(Feature::EmulateCopyTexImage2D),
     ES2_OPENGLES().enable(Feature::EmulateCopyTexImage2D),
diff --git a/src/tests/gl_tests/CubeMapTextureTest.cpp b/src/tests/gl_tests/CubeMapTextureTest.cpp
index 99a8eb3..3eb424c 100644
--- a/src/tests/gl_tests/CubeMapTextureTest.cpp
+++ b/src/tests/gl_tests/CubeMapTextureTest.cpp
@@ -412,4 +412,4 @@
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
-ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(CubeMapTextureTest, ES2_WEBGPU(), ES3_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(CubeMapTextureTest);
diff --git a/src/tests/gl_tests/ImageTest.cpp b/src/tests/gl_tests/ImageTest.cpp
index 26eeec4..0f92570 100644
--- a/src/tests/gl_tests/ImageTest.cpp
+++ b/src/tests/gl_tests/ImageTest.cpp
@@ -10233,8 +10233,7 @@
 }
 
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(ImageTest,
-                                       ES3_VULKAN().enable(Feature::AllocateNonZeroMemory),
-                                       ES2_WEBGPU());
+                                       ES3_VULKAN().enable(Feature::AllocateNonZeroMemory));
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ImageTestES3);
 ANGLE_INSTANTIATE_TEST_ES3_AND(ImageTestES3, ES3_VULKAN().enable(Feature::AllocateNonZeroMemory));
diff --git a/src/tests/gl_tests/LineLoopTest.cpp b/src/tests/gl_tests/LineLoopTest.cpp
index 1564ae8..696dde3 100644
--- a/src/tests/gl_tests/LineLoopTest.cpp
+++ b/src/tests/gl_tests/LineLoopTest.cpp
@@ -1450,7 +1450,6 @@
     }
 }
 ANGLE_INSTANTIATE_TEST_ES2_AND(LineLoopTest,
-                               ES2_WEBGPU(),
                                ES2_OPENGLES().enable(Feature::ForcePassthroughShaders));
 ANGLE_INSTANTIATE_TEST_ES3(LineLoopTestES3);
 
diff --git a/src/tests/gl_tests/RendererTest.cpp b/src/tests/gl_tests/RendererTest.cpp
index 5233729..ac74114 100644
--- a/src/tests/gl_tests/RendererTest.cpp
+++ b/src/tests/gl_tests/RendererTest.cpp
@@ -276,7 +276,5 @@
 
 // Select configurations (e.g. which renderer, which GLES major version) these tests should be run
 // against.
-// TODO(http://anglebug.com/42266907): move ES2_WEBGPU to the definition of
-// ANGLE_ALL_TEST_PLATFORMS_ES2 once webgpu is developed enough to run more tests.
-ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND_ES31_AND_NULL_AND(RendererTest, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND_ES31_AND_NULL(RendererTest);
 }  // namespace angle
diff --git a/src/tests/gl_tests/SamplersTest.cpp b/src/tests/gl_tests/SamplersTest.cpp
index 9714891..c80df6c 100644
--- a/src/tests/gl_tests/SamplersTest.cpp
+++ b/src/tests/gl_tests/SamplersTest.cpp
@@ -598,12 +598,12 @@
 }
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BasicSamplersTest);
-ANGLE_INSTANTIATE_TEST_ES2_AND(BasicSamplersTest, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2(BasicSamplersTest);
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SampleFromRenderedTextureTestHalfWindow);
-ANGLE_INSTANTIATE_TEST_ES2_AND(SampleFromRenderedTextureTestHalfWindow, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2(SampleFromRenderedTextureTestHalfWindow);
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SampleFromRenderedTextureTestFullWindow);
-ANGLE_INSTANTIATE_TEST_ES2_AND(SampleFromRenderedTextureTestFullWindow, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2(SampleFromRenderedTextureTestFullWindow);
 
 // Samplers are only supported on ES3.
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SamplersTest);
diff --git a/src/tests/gl_tests/TextureTest.cpp b/src/tests/gl_tests/TextureTest.cpp
index 637e386..2317f9e 100644
--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -18670,8 +18670,7 @@
                        ANGLE_ALL_TEST_PLATFORMS_ES2,
                        ES2_EMULATE_COPY_TEX_IMAGE_VIA_SUB(),
                        ES2_EMULATE_COPY_TEX_IMAGE(),
-                       ES2_OPENGLES().enable(Feature::ForcePassthroughShaders),
-                       ES2_WEBGPU());
+                       ES2_OPENGLES().enable(Feature::ForcePassthroughShaders));
 ANGLE_INSTANTIATE_TEST_ES2(TextureCubeTest);
 ANGLE_INSTANTIATE_TEST_ES2(Texture2DTestWithDrawScale);
 ANGLE_INSTANTIATE_TEST_ES2(Sampler2DAsFunctionParameterTest);
diff --git a/src/tests/gl_tests/UniformTest.cpp b/src/tests/gl_tests/UniformTest.cpp
index 9bf70fe..d3b6303 100644
--- a/src/tests/gl_tests/UniformTest.cpp
+++ b/src/tests/gl_tests/UniformTest.cpp
@@ -3162,14 +3162,14 @@
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(SimpleUniformTest);
-ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(SimpleUniformUsageTest, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(SimpleUniformUsageTest);
 
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(UniformTest);
-ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(BasicUniformUsageTest, ES2_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(BasicUniformUsageTest);
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniformTestES3);
 ANGLE_INSTANTIATE_TEST_ES3(UniformTestES3);
-ANGLE_INSTANTIATE_TEST_ES3_AND(SimpleUniformUsageTestES3, ES3_WEBGPU());
+ANGLE_INSTANTIATE_TEST_ES3(SimpleUniformUsageTestES3);
 
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniformTestES31);
 ANGLE_INSTANTIATE_TEST_ES31(UniformTestES31);
diff --git a/src/tests/gl_tests/VertexAttributeTest.cpp b/src/tests/gl_tests/VertexAttributeTest.cpp
index 4debbc8..13797e8 100644
--- a/src/tests/gl_tests/VertexAttributeTest.cpp
+++ b/src/tests/gl_tests/VertexAttributeTest.cpp
@@ -355,7 +355,7 @@
             "void main(void)\n"
             "{\n"
             "    gl_Position = position;\n"
-            "    vec4 threshold = max(abs(expected) * 0.01, 1.0 / 64.0);\n"
+            "    vec4 threshold = max(abs(expected) * 0.01, vec4(1.0 / 64.0));\n"
             "    color = vec4(lessThanEqual(abs(test - expected), threshold));\n"
             "}\n";
 
@@ -1843,7 +1843,7 @@
         "void main(void)\n"
         "{\n"
         "    gl_Position = position;\n"
-        "    vec4 threshold = max(abs(expected + disabled) * 0.005, 1.0 / 64.0);\n"
+        "    vec4 threshold = max(abs(expected + disabled) * 0.005, vec4(1.0 / 64.0));\n"
         "    color = vec4(lessThanEqual(abs(test - expected), threshold));\n"
         "}\n";
 
diff --git a/src/tests/test_utils/angle_test_instantiate.h b/src/tests/test_utils/angle_test_instantiate.h
index 4a255e9..a0b785e 100644
--- a/src/tests/test_utils/angle_test_instantiate.h
+++ b/src/tests/test_utils/angle_test_instantiate.h
@@ -129,7 +129,7 @@
 
 #define ANGLE_ALL_TEST_PLATFORMS_ES2                                                               \
     ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN(), ES2_VULKAN_SWIFTSHADER(), \
-        ES2_METAL(),                                                                               \
+        ES2_METAL(), ES2_WEBGPU(),                                                                 \
         ES2_VULKAN()                                                                               \
             .enable(Feature::EnableParallelCompileAndLink)                                         \
             .enable(Feature::VaryingsRequireMatchingPrecisionInSpirv),                             \