diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py
--- a/mlir/test/lit.cfg.py
+++ b/mlir/test/lit.cfg.py
@@ -66,11 +66,13 @@
     'mlir-cpu-runner',
     'mlir-linalg-ods-yaml-gen',
     'mlir-reduce',
-    'mlir-spirv-cpu-runner',
     'mlir-pdll',
     'not',
 ]
 
+if config.enable_spirv_cpu_runner:
+  tools.extend(['mlir-spirv-cpu-runner'])
+
 # The following tools are optional
 tools.extend([
     ToolSubst('toy-ch1', unresolved='ignore'),