diff --git a/util/test/demos/CMakeLists.txt b/util/test/demos/CMakeLists.txt
index 1118f7174..7e1acc566 100644
--- a/util/test/demos/CMakeLists.txt
+++ b/util/test/demos/CMakeLists.txt
@@ -28,6 +28,7 @@ set(VULKAN_SRC
         vk/vk_multi_thread_windows.cpp
         vk/vk_overlay_test.cpp
         vk/vk_parameter_zoo.cpp
+        vk/vk_pixel_history.cpp
         vk/vk_query_pool.cpp
         vk/vk_resource_lifetimes.cpp
         vk/vk_robustness2.cpp
@@ -36,6 +37,7 @@ set(VULKAN_SRC
         vk/vk_separate_depth_stencil_layouts.cpp
         vk/vk_shader_debug_zoo.cpp
         vk/vk_shader_editing.cpp
+        vk/vk_shader_isa.cpp
         vk/vk_simple_triangle.cpp
         vk/vk_spec_constants.cpp
         vk/vk_spirv_13_shaders.cpp
diff --git a/util/test/demos/demos.vcxproj b/util/test/demos/demos.vcxproj
index 5c4c5de7f..f1bd98caa 100644
--- a/util/test/demos/demos.vcxproj
+++ b/util/test/demos/demos.vcxproj
@@ -291,7 +291,7 @@
     <ClCompile Include="vk\vk_resource_lifetimes.cpp" />
     <ClCompile Include="vk\vk_structured_buffer_nested.cpp" />
     <ClCompile Include="vk\vk_overlay_test.cpp" />
-    <ClCompile Include="vk\vk_pixel_history_test.cpp" />
+    <ClCompile Include="vk\vk_pixel_history.cpp" />
     <ClCompile Include="vk\vk_sample_locations.cpp" />
     <ClCompile Include="vk\vk_adv_cbuffer_zoo.cpp" />
     <ClCompile Include="vk\vk_secondary_cmdbuf.cpp" />
diff --git a/util/test/demos/demos.vcxproj.filters b/util/test/demos/demos.vcxproj.filters
index 381ca303b..5aabcb899 100644
--- a/util/test/demos/demos.vcxproj.filters
+++ b/util/test/demos/demos.vcxproj.filters
@@ -169,9 +169,6 @@
     <ClCompile Include="d3d11\d3d11_overlay_test.cpp">
       <Filter>D3D11\demos</Filter>
     </ClCompile>
-    <ClCompile Include="vk\vk_pixel_history_test.cpp">
-      <Filter>Vulkan\demos</Filter>
-    </ClCompile>
     <ClCompile Include="vk\vk_secondary_cmdbuf.cpp">
       <Filter>Vulkan\demos</Filter>
     </ClCompile>
@@ -514,6 +511,9 @@
     <ClCompile Include="d3d12\d3d12_reflection_zoo.cpp">
       <Filter>D3D12\demos</Filter>
     </ClCompile>
+    <ClCompile Include="vk\vk_pixel_history.cpp">
+      <Filter>Vulkan\demos</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="D3D11">
diff --git a/util/test/demos/vk/vk_pixel_history_test.cpp b/util/test/demos/vk/vk_pixel_history.cpp
similarity index 99%
rename from util/test/demos/vk/vk_pixel_history_test.cpp
rename to util/test/demos/vk/vk_pixel_history.cpp
index 650ea2336..f9cc7b3bd 100644
--- a/util/test/demos/vk/vk_pixel_history_test.cpp
+++ b/util/test/demos/vk/vk_pixel_history.cpp
@@ -24,7 +24,7 @@
 
 #include "vk_test.h"
 
-RD_TEST(VK_Pixel_History_Test, VulkanGraphicsTest)
+RD_TEST(VK_Pixel_History, VulkanGraphicsTest)
 {
   static constexpr const char *Description = "Tests pixel history";
 
diff --git a/util/test/tests/Vulkan/VK_Pixel_History.py b/util/test/tests/Vulkan/VK_Pixel_History.py
index 3bf74f3a7..642a2b81f 100644
--- a/util/test/tests/Vulkan/VK_Pixel_History.py
+++ b/util/test/tests/Vulkan/VK_Pixel_History.py
@@ -21,7 +21,7 @@ def primitive_id(x): return x.primitiveID
 def unboundPS(x): return x.unboundPS
 
 class VK_Pixel_History(rdtest.TestCase):
-    demos_test_name = 'VK_Pixel_History_Test'
+    demos_test_name = 'VK_Pixel_History'
     demos_frame_cap = 5
 
     def check_capture(self):