diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
index 8971079f08f30..59f4aa99e4e42 100644
--- a/.github/workflows/sycl-linux-build.yml
+++ b/.github/workflows/sycl-linux-build.yml
@@ -199,6 +199,9 @@ jobs:
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl-unittests
     - name: check-llvm-spirv
       if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
+      # Temporary workaround to disable running tests requiring spirv-tools.
+      env:
+        LIT_OPTS: "--param disable-spirv-tools=True"
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
     - name: check-xptifw
diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml
index 77ea70c23c8d1..c7349331f8f6f 100644
--- a/.github/workflows/sycl-windows-build.yml
+++ b/.github/workflows/sycl-windows-build.yml
@@ -158,6 +158,9 @@ jobs:
         cmake --build build --target check-sycl-unittests
     - name: check-llvm-spirv
       if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
+      # Temporary workaround to disable running tests requiring spirv-tools.
+      env:
+        LIT_OPTS: "--param disable-spirv-tools=True"
       run: |
         cmake --build build --target check-llvm-spirv
     - name: check-xptifw
diff --git a/llvm-spirv/test/lit.cfg.py b/llvm-spirv/test/lit.cfg.py
index b56953aa56d01..29b8a6e4dd3f6 100644
--- a/llvm-spirv/test/lit.cfg.py
+++ b/llvm-spirv/test/lit.cfg.py
@@ -60,24 +60,27 @@
 
 using_spirv_tools = False
 
-if config.spirv_tools_have_spirv_as:
+# Explicitly disable using spirv tools, if requested.
+disable_spirv_tools = lit_config.params.get("disable-spirv-tools", False)
+
+if config.spirv_tools_have_spirv_as and not disable_spirv_tools:
     llvm_config.add_tool_substitutions(['spirv-as'], [config.spirv_tools_bin_dir])
     config.available_features.add('spirv-as')
     using_spirv_tools = True
 
-if config.spirv_tools_have_spirv_dis:
+if config.spirv_tools_have_spirv_dis and not disable_spirv_tools:
     llvm_config.add_tool_substitutions(['spirv-dis'], [config.spirv_tools_bin_dir])
     config.available_features.add('spirv-dis')
     using_spirv_tools = True
 
-if config.spirv_tools_have_spirv_link:
+if config.spirv_tools_have_spirv_link and not disable_spirv_tools:
     llvm_config.add_tool_substitutions(['spirv-link'], [config.spirv_tools_bin_dir])
     config.available_features.add('spirv-link')
     using_spirv_tools = True
 
 # Unlike spirv-{as,dis,link} above, running spirv-val is optional: if spirv-val is
 # not available, the test must still run and just skip any spirv-val commands.
-if config.spirv_tools_have_spirv_val:
+if config.spirv_tools_have_spirv_val and not disable_spirv_tools:
     llvm_config.add_tool_substitutions(['spirv-val'], [config.spirv_tools_bin_dir])
     using_spirv_tools = True
 else: