diff --git a/src/dawn_native/d3d12/BackendD3D12.cpp b/src/dawn_native/d3d12/BackendD3D12.cpp
index eea9720626..44478bbbb4 100644
--- a/src/dawn_native/d3d12/BackendD3D12.cpp
+++ b/src/dawn_native/d3d12/BackendD3D12.cpp
@@ -33,11 +33,12 @@ namespace dawn_native { namespace d3d12 {
             // Enable the debug layer (requires the Graphics Tools "optional feature").
             {
                 if (enableBackendValidation) {
-                    ComPtr<ID3D12Debug> debugController;
+                    ComPtr<ID3D12Debug1> debugController;
                     if (SUCCEEDED(
                             functions->d3d12GetDebugInterface(IID_PPV_ARGS(&debugController)))) {
                         ASSERT(debugController != nullptr);
                         debugController->EnableDebugLayer();
+                        debugController->SetEnableGPUBasedValidation(true);
 
                         // Enable additional debug layers.
                         dxgiFactoryFlags |= DXGI_CREATE_FACTORY_DEBUG;
diff --git a/src/tests/white_box/D3D12ResidencyTests.cpp b/src/tests/white_box/D3D12ResidencyTests.cpp
index 5bb3ea86d3..b8ac1ba17e 100644
--- a/src/tests/white_box/D3D12ResidencyTests.cpp
+++ b/src/tests/white_box/D3D12ResidencyTests.cpp
@@ -127,6 +127,9 @@ class D3D12ResidencyTests : public DawnTest {
 
 // Check that resources existing on suballocated heaps are made resident and evicted correctly.
 TEST_P(D3D12ResidencyTests, OvercommitSmallResources) {
+    // TODO(http://crbug.com/dawn/416): Tests fails on Intel HD 630 bot.
+    DAWN_SKIP_TEST_IF(IsIntel() && IsBackendValidationEnabled());
+
     // Create suballocated buffers to fill half the budget.
     std::vector<wgpu::Buffer> bufferSet1 = AllocateBuffers(
         kSuballocatedResourceSize, ((kRestrictedBudgetSize / 2) / kSuballocatedResourceSize),