diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp
index 5375ce1195..2e3532c782 100644
--- a/src/tests/DawnTest.cpp
+++ b/src/tests/DawnTest.cpp
@@ -868,6 +868,12 @@ void DawnTestBase::SetUp() {
         glfwMakeContextCurrent(gTestEnv->GetOpenGLESWindow());
     }
 #endif
+
+    // A very large number of tests hang on Intel D3D12 with the debug adapter after a driver
+    // upgrade. Violently suppress this whole configuration until we figure out what to do.
+    // See https://crbug.com/dawn/598
+    DAWN_SKIP_TEST_IF(IsBackendValidationEnabled() && IsIntel() && IsD3D12());
+
 }
 
 void DawnTestBase::TearDown() {