diff --git a/.gitlab-ci/windows/piglit_run.ps1 b/.gitlab-ci/windows/piglit_run.ps1
index 84eac45a449..2f787647fc6 100644
--- a/.gitlab-ci/windows/piglit_run.ps1
+++ b/.gitlab-ci/windows/piglit_run.ps1
@@ -1,4 +1,5 @@
 $env:PIGLIT_NO_FAST_SKIP = 1
+$env:PIGLIT_SPIRV_AS_BINARY = "C:\VulkanSDK\$env:VULKAN_SDK_VERSION\Bin\spirv-as.exe"
 
 Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\bin\opengl32.dll
 Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\bin\libgallium_wgl.dll
diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
index 53d62ee2eae..fefaed856db 100644
--- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
+++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
@@ -403,11 +403,9 @@ spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Fail
 spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Fail
 wgl@wgl-multi-context-single-window,Fail
 
-# remove this after https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843
-# is merged and piglit is updated
+# Should've been fixed by https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843
+# but still seems to be failing.
 spec@arb_vertex_program@arb_vertex_program-property-bindings,Fail
 
-# Needs https://github.com/KhronosGroup/SPIRV-Tools/pull/5477,
-# https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/850,
-# and CI changes to glue them together
-spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spirv,Fail
+# SPIR-V tests
+spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spirv,Crash
diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt
index 7256d99e2da..882c64fd71a 100644
--- a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt
+++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt
@@ -48,92 +48,11 @@ spec@arb_enhanced_layouts@execution@component-layout@vs-fs-array-dvec3,Crash
 # TODO: Need to investigate and debug
 spec@arb_enhanced_layouts@execution@component-layout@vs-gs-fs-double,Fail
 spec@arb_tessellation_shader@execution@dvec3-vs-tcs-tes,Fail
-
-# Needs https://github.com/KhronosGroup/SPIRV-Tools/pull/5477,
-# https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/850,
-# and CI changes to glue them together
-spec@arb_gl_spirv@execution@ssbo@aoa,Fail
-spec@arb_gl_spirv@execution@ssbo@aoa-2,Fail
-spec@arb_gl_spirv@execution@ssbo@array,Fail
-spec@arb_gl_spirv@execution@ssbo@array-indirect,Fail
-spec@arb_gl_spirv@execution@ssbo@array-inside-ssbo,Fail
-spec@arb_gl_spirv@execution@ssbo@array-of-arrays-inside-ssbo,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@column-major,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@column-vs-row,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@complex,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@indirect-column-major,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@indirect-row-major,Fail
-spec@arb_gl_spirv@execution@ssbo@matrix@row-major,Fail
-spec@arb_gl_spirv@execution@ssbo@simple,Fail
-spec@arb_gl_spirv@execution@ssbo@two-ssbo,Fail
-spec@arb_gl_spirv@execution@ssbo@two-ssbo-different-layouts,Fail
-spec@arb_gl_spirv@execution@ssbo@two-stages,Fail
-spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail
-spec@arb_gl_spirv@execution@ssbo@unsized-array-length,Fail
-spec@arb_gl_spirv@execution@ubo@aoa,Fail
-spec@arb_gl_spirv@execution@ubo@aoa-2,Fail
-spec@arb_gl_spirv@execution@ubo@array,Fail
-spec@arb_gl_spirv@execution@ubo@array-complex,Fail
-spec@arb_gl_spirv@execution@ubo@array-different-array-stride-ubo,Fail
-spec@arb_gl_spirv@execution@ubo@array-indirect,Fail
-spec@arb_gl_spirv@execution@ubo@array-inside-ubo,Fail
-spec@arb_gl_spirv@execution@ubo@array-inside-ubo-copy,Fail
-spec@arb_gl_spirv@execution@ubo@array-of-arrays-inside-ubo,Fail
-spec@arb_gl_spirv@execution@ubo@explicit-offset,Fail
-spec@arb_gl_spirv@execution@ubo@explicit-offset-nested-struct,Fail
-spec@arb_gl_spirv@execution@ubo@location-0-crash,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@column-major,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@column-vs-row,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@complex,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@different-matrix-stride,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@indirect-column-major,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@indirect-row-major,Fail
-spec@arb_gl_spirv@execution@ubo@matrix@row-major,Fail
-spec@arb_gl_spirv@execution@ubo@simple,Fail
-spec@arb_gl_spirv@execution@ubo@two-stages,Fail
-spec@arb_gl_spirv@execution@ubo@two-ubos,Fail
-spec@arb_gl_spirv@execution@uniform@array,Fail
-spec@arb_gl_spirv@execution@uniform@arrays-of-arrays,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-aoa-cs,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-aoa-fs,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-array-cs,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-array-fs,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-cs,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-mixing-with-normal-uniforms,Fail
-spec@arb_gl_spirv@execution@uniform@atomic-uint-several-slots,Fail
-spec@arb_gl_spirv@execution@uniform@embedded-structs,Fail
-spec@arb_gl_spirv@execution@uniform@index-matches-location,Fail
-spec@arb_gl_spirv@execution@uniform@initializer,Fail
-spec@arb_gl_spirv@execution@uniform@initializer-complex,Fail
-spec@arb_gl_spirv@execution@uniform@initializer-dvec4,Fail
-spec@arb_gl_spirv@execution@uniform@initializer-mat4x3,Fail
-spec@arb_gl_spirv@execution@uniform@nonsequential-locations,Fail
-spec@arb_gl_spirv@execution@uniform@sampler2d,Fail
-spec@arb_gl_spirv@execution@uniform@sampler2d-binding,Fail
-spec@arb_gl_spirv@execution@uniform@sampler2d-binding-array,Fail
-spec@arb_gl_spirv@execution@uniform@sampler2d-nonconst-nested-array,Fail
-spec@arb_gl_spirv@execution@uniform@sampler2d-struct,Fail
-spec@arb_gl_spirv@execution@uniform@simple,Fail
-spec@arb_gl_spirv@execution@uniform@simple-without-names,Fail
-spec@arb_gl_spirv@execution@uniform@struct,Fail
-spec@arb_gl_spirv@execution@uniform@struct-array,Fail
-spec@arb_gl_spirv@execution@uniform@two-uniforms,Fail
-spec@arb_gl_spirv@execution@va64-simple,Fail
-spec@arb_gl_spirv@execution@vs-ps-simple,Fail
-spec@arb_gl_spirv@execution@vs-ps-specializations,Fail
-spec@arb_gl_spirv@execution@xfb@vs_aoa,Fail
 spec@arb_gl_spirv@execution@xfb@vs_block,Fail
-spec@arb_gl_spirv@execution@xfb@vs_block_array,Fail
-spec@arb_gl_spirv@execution@xfb@vs_block_array_offset_per_member,Fail
-spec@arb_gl_spirv@execution@xfb@vs_double,Fail
-spec@arb_gl_spirv@execution@xfb@vs_lines,Fail
-spec@arb_gl_spirv@execution@xfb@vs_simple,Fail
-spec@arb_gl_spirv@execution@xfb@vs_simple_multiple_samples,Fail
-spec@arb_gl_spirv@execution@xfb@vs_struct,Fail
-spec@arb_gl_spirv@execution@xfb@vs_struct_array,Fail
+spec@arb_gl_spirv@execution@xfb@vs_block_array,Crash
+spec@arb_gl_spirv@execution@xfb@vs_block_array_offset_per_member,Crash
+spec@arb_gl_spirv@execution@xfb@vs_double,Crash
+spec@arb_gl_spirv@execution@xfb@vs_struct,Crash
+spec@arb_gl_spirv@execution@xfb@vs_struct_array,Crash
 spec@arb_gl_spirv@execution@xfb@vs_two_block,Fail
-spec@arb_gl_spirv@execution@xfb@vs_two_sets,Fail
-spec@arb_gl_spirv@execution@xfb@vs_two_sets_ifc,Fail
-spec@arb_gl_spirv@execution@xfb@vs_two_sets_struct,Fail
-spec@arb_gl_spirv@linker@uniform@multisampler,Fail
-spec@arb_gl_spirv@linker@uniform@multisampler-array,Fail
+spec@arb_gl_spirv@execution@xfb@vs_two_sets_struct,Crash