diff --git a/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/lit.local.cfg b/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/lit.local.cfg
index c2417a9e43..4d63444a4c 100644
--- a/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/lit.local.cfg
+++ b/tools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/lit.local.cfg
@@ -1 +1 @@
-config.unsupported = 'dxil-1-9' not in config.available_features
\ No newline at end of file
+config.unsupported = 'dxil-1-10' not in config.available_features
\ No newline at end of file
diff --git a/tools/clang/test/CodeGenSPIRV/lit.local.cfg b/tools/clang/test/CodeGenSPIRV/lit.local.cfg
index 6cc3ab2586..7aa2295184 100644
--- a/tools/clang/test/CodeGenSPIRV/lit.local.cfg
+++ b/tools/clang/test/CodeGenSPIRV/lit.local.cfg
@@ -1,2 +1,4 @@
-config.unsupported = not config.spirv
-config.suffixes = ['.hlsl', '.hlsl2spv']
\ No newline at end of file
+config.suffixes = ['.hlsl', '.hlsl2spv']
+# Skip when SPIR-V disabled or during down-level DXIL testing
+if not config.spirv or "dxc_dxil_dll_path" in config.available_features:
+    config.unsupported = True
diff --git a/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-count.hlsl b/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-count.hlsl
index 30433e2411..41a63a54b4 100644
--- a/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-count.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-count.hlsl
@@ -1,3 +1,4 @@
+// REQUIRES: dxil-1-10
 // RUN: %dxc -T cs_6_10 -E main -fspv-target-env=vulkan1.1 -fcgl  %s -spirv | FileCheck %s
 
 // CHECK: ; Version: 1.3
diff --git a/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-index.hlsl b/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-index.hlsl
index f657b748b2..bf0dbce30b 100644
--- a/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-index.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/sm6_10.group-wave-index.hlsl
@@ -1,3 +1,4 @@
+// REQUIRES: dxil-1-10
 // RUN: %dxc -T cs_6_10 -E main -fspv-target-env=vulkan1.1 -fcgl  %s -spirv | FileCheck %s
 
 // CHECK: ; Version: 1.3
diff --git a/tools/clang/test/DXC/Passes/DxilGen/group-wave-index.ll b/tools/clang/test/DXC/Passes/DxilGen/group-wave-index.ll
index a757b57264..a019e31a83 100644
--- a/tools/clang/test/DXC/Passes/DxilGen/group-wave-index.ll
+++ b/tools/clang/test/DXC/Passes/DxilGen/group-wave-index.ll
@@ -1,3 +1,4 @@
+; REQUIRES: dxil-1-10
 ; RUN: %dxopt %s -hlsl-passes-resume -dxilgen -S | FileCheck %s
 
 ; CHECK: call i32 @dx.op.getGroupWaveIndex(i32 -2147483647)
diff --git a/tools/clang/test/DXC/Passes/lit.local.cfg b/tools/clang/test/DXC/Passes/lit.local.cfg
new file mode 100644
index 0000000000..115a348113
--- /dev/null
+++ b/tools/clang/test/DXC/Passes/lit.local.cfg
@@ -0,0 +1,2 @@
+# Skip during down-level DXIL testing
+config.unsupported = "dxc_dxil_dll_path" in config.available_features
\ No newline at end of file
diff --git a/tools/clang/test/SemaHLSL/hlsl/linalg/lit.local.cfg b/tools/clang/test/SemaHLSL/hlsl/linalg/lit.local.cfg
new file mode 100644
index 0000000000..e7894132bb
--- /dev/null
+++ b/tools/clang/test/SemaHLSL/hlsl/linalg/lit.local.cfg
@@ -0,0 +1 @@
+config.unsupported = "dxil-1-10" not in config.available_features
diff --git a/tools/clang/test/SemaHLSL/lit.local.cfg b/tools/clang/test/SemaHLSL/lit.local.cfg
new file mode 100644
index 0000000000..115a348113
--- /dev/null
+++ b/tools/clang/test/SemaHLSL/lit.local.cfg
@@ -0,0 +1,2 @@
+# Skip during down-level DXIL testing
+config.unsupported = "dxc_dxil_dll_path" in config.available_features
\ No newline at end of file