diff --git a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
index c7e854f..b1d3c5c 100644
--- a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
+++ b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
@@ -132,7 +132,13 @@
 DAWN_TEST_PARAM_STRUCT(ComputeLayoutMemoryBufferTestParams, StorageClass, Field)
 
 class ComputeLayoutMemoryBufferTests
-    : public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {};
+    : public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {
+    void SetUp() override {
+        DawnTestBase::SetUp();
+        DAWN_TEST_UNSUPPORTED_IF((IsD3D12() || IsMetal()) &&
+                                 !HasToggleEnabled("use_tint_generator"));
+    }
+};
 
 TEST_P(ComputeLayoutMemoryBufferTests, Fields) {
     // Sentinel value markers codes used to check that the start and end of
@@ -342,8 +348,7 @@
     auto GenerateParams() {
         auto params = MakeParamGenerator<ComputeLayoutMemoryBufferTestParams>(
             {
-                D3D12Backend({"use_tint_generator"}), MetalBackend({"use_tint_generator"}),
-                VulkanBackend(),
+                D3D12Backend(), MetalBackend(), VulkanBackend(),
                 // TODO(crbug.com/dawn/942)
                 // There was a compiler error: Buffer block cannot be expressed as any of std430,
                 // std140, scalar, even with enhanced layouts. You can try flattening this block to
diff --git a/src/tests/end2end/FirstIndexOffsetTests.cpp b/src/tests/end2end/FirstIndexOffsetTests.cpp
index 506c0d3..b3c6481 100644
--- a/src/tests/end2end/FirstIndexOffsetTests.cpp
+++ b/src/tests/end2end/FirstIndexOffsetTests.cpp
@@ -48,6 +48,7 @@
   protected:
     void SetUp() override {
         DawnTest::SetUp();
+        DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && !HasToggleEnabled("use_tint_generator"));
 
         // WGSL doesn't have the ability to tag attributes as "flat". "flat" is required on u32
         // attributes for correct runtime behavior under Vulkan and codegen under OpenGL(ES).
@@ -219,7 +220,7 @@
 }
 
 DAWN_INSTANTIATE_TEST(FirstIndexOffsetTests,
-                      D3D12Backend({"use_tint_generator"}),
+                      D3D12Backend(),
                       MetalBackend(),
                       OpenGLBackend(),
                       OpenGLESBackend(),