diff --git a/src/tests/end2end/VertexFormatTests.cpp b/src/tests/end2end/VertexFormatTests.cpp
index 1563a8318a..e7351422cf 100644
--- a/src/tests/end2end/VertexFormatTests.cpp
+++ b/src/tests/end2end/VertexFormatTests.cpp
@@ -53,7 +53,7 @@ class VertexFormatTest : public DawnTest {
         DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
 
         // TODO(crbug.com/tint/904): FXC emits bad output for this test
-        DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC());
+        DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator"));
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
     }
diff --git a/src/tests/perf_tests/ShaderRobustnessPerf.cpp b/src/tests/perf_tests/ShaderRobustnessPerf.cpp
index ffcce8af0e..b180bc5e23 100644
--- a/src/tests/perf_tests/ShaderRobustnessPerf.cpp
+++ b/src/tests/perf_tests/ShaderRobustnessPerf.cpp
@@ -409,6 +409,9 @@ void ShaderRobustnessPerf::SetUp() {
     // TODO(crbug.com/dawn/786): D3D12_Microsoft_Basic_Render_Driver_CPU
     DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
 
+    // TODO(crbug.com/tint/904): FXC emits bad output for this test
+    DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator"));
+
     const size_t dataASize = mDimAOuter * mDimInner;
     std::vector<float> dataA(dataASize);
     uint64_t byteASize = sizeof(float) * dataA.size();