diff --git a/util/test/demos/d3d12/d3d12_descriptor_indexing.cpp b/util/test/demos/d3d12/d3d12_descriptor_indexing.cpp
index 320c01086..9871aba5f 100644
--- a/util/test/demos/d3d12/d3d12_descriptor_indexing.cpp
+++ b/util/test/demos/d3d12/d3d12_descriptor_indexing.cpp
@@ -255,9 +255,10 @@ float4 main(v2f IN) : SV_Target0
 
     ID3D12ResourcePtr structBuf = MakeBuffer().UAV().Size(8192);
     D3D12_GPU_DESCRIPTOR_HANDLE structGPU =
-        MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateGPU(15);
+        MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateGPU(16);
     D3D12_CPU_DESCRIPTOR_HANDLE structCPU =
-        MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateClearCPU(15);
+        MakeUAV(structBuf).Format(DXGI_FORMAT_R32_UINT).CreateClearCPU(16);
+    MakeUAV(structBuf).StructureStride(2 * sizeof(uint32_t)).CreateGPU(15);
     MakeSRV(structBuf).StructureStride(2 * sizeof(uint32_t)).CreateGPU(8);
 
     MakeSRV(smiley).CreateGPU(12);
@@ -291,11 +292,11 @@ float4 main(v2f IN) : SV_Target0
 
         setMarker(cmd, markers[i]);
 
+        cmd->SetDescriptorHeaps(1, &m_CBVUAVSRV.GetInterfacePtr());
+
         UINT zero[4] = {};
         cmd->ClearUnorderedAccessViewUint(structGPU, structCPU, structBuf, zero, 0, NULL);
 
-        cmd->SetDescriptorHeaps(1, &m_CBVUAVSRV.GetInterfacePtr());
-
         cmd->SetPipelineState(computepso[i]);
         cmd->SetComputeRootSignature(computesig);
         cmd->SetComputeRootDescriptorTable(0, m_CBVUAVSRV->GetGPUDescriptorHandleForHeapStart());
diff --git a/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py b/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py
index 4e01bcadb..093a8d2a9 100644
--- a/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py
+++ b/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py
@@ -51,7 +51,7 @@ class D3D12_Descriptor_Indexing(rdtest.TestCase):
 
             # Check bindings:
             #   - buffer 8 in root range 0 should be statically used (single fixed declaration) for the parameters
-            #     image 15 in root range 0 should also be statically used
+            #     image 12 in root range 0 should also be statically used
             #   - images 19, 20, 21 in root range 1 should be used for the non-uniform index
             #     images 49 & 59 in root range 1 should be used for a second array in the same range
             #     image 60 in root range 1 should be used for a fixed index in an array