diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index d0114e4ac3..c55cda9f3f 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -736,9 +736,10 @@ TEST_P(D3D12DescriptorHeapTests, EncodeReuseUBOMultipleSubmits) {
 
 // Verify encoding many sampler and ubo worth of bindgroups.
 // Shader-visible heaps should switch out |kNumOfViewHeaps| times.
-// TODO(crbug.com/dawn/946): This test is currently disabled because the UBO
-// layout is incorrect. Reenable after next tint roll.
-TEST_P(D3D12DescriptorHeapTests, DISABLED_EncodeManyUBOAndSamplers) {
+TEST_P(D3D12DescriptorHeapTests, EncodeManyUBOAndSamplers) {
+    // TODO(crbug.com/dawn/571): HLSL emission via SPIRV-Cross produces incorrect results.
+    DAWN_TEST_UNSUPPORTED_IF(!HasToggleEnabled("use_tint_generator"));
+
     DAWN_TEST_UNSUPPORTED_IF(!mD3DDevice->IsToggleEnabled(
         dawn_native::Toggle::UseD3D12SmallShaderVisibleHeapForTesting));