Index: lldb/lit/helper/toolchain.py
===================================================================
--- lldb/lit/helper/toolchain.py
+++ lldb/lit/helper/toolchain.py
@@ -52,7 +52,8 @@
 
     llvm_config.add_tool_substitutions(primary_tools,
                                        [config.lldb_tools_dir])
-    if lldbmi.was_resolved:
+    # lldb-mi always fails without Python support
+    if lldbmi.was_resolved and not config.lldb_disable_python:
         config.available_features.add('lldb-mi')
 
 def _use_msvc_substitutions(config):
Index: lldb/lit/lit.site.cfg.py.in
===================================================================
--- lldb/lit/lit.site.cfg.py.in
+++ lldb/lit/lit.site.cfg.py.in
@@ -17,6 +17,7 @@
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
+config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
Index: lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test
===================================================================
--- lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test
+++ lldb/lit/tools/lldb-mi/breakpoint/break-insert-enable-pending.test
@@ -1,5 +1,6 @@
 # XFAIL: system-windows
 # -> llvm.org/pr24452
+# REQUIRES: lldb-mi
 #
 # RUN: %clang -o %t %p/inputs/break-insert-pending.c -g
 # RUN: %lldbmi %t < %s | FileCheck %s
Index: lldb/lit/tools/lldb-mi/breakpoint/break-insert.test
===================================================================
--- lldb/lit/tools/lldb-mi/breakpoint/break-insert.test
+++ lldb/lit/tools/lldb-mi/breakpoint/break-insert.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/break-insert.c --nodefaultlib -o a.exe
 # RUN: %lldbmi < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/data/data-info-line.test
===================================================================
--- lldb/lit/tools/lldb-mi/data/data-info-line.test
+++ lldb/lit/tools/lldb-mi/data/data-info-line.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/data-info-line.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-continue.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-continue.test
+++ lldb/lit/tools/lldb-mi/exec/exec-continue.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-finish.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-finish.test
+++ lldb/lit/tools/lldb-mi/exec/exec-finish.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-interrupt.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-interrupt.test
+++ lldb/lit/tools/lldb-mi/exec/exec-interrupt.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test
+++ lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-next.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-next.test
+++ lldb/lit/tools/lldb-mi/exec/exec-next.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-run-wrong-binary.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-run-wrong-binary.test
+++ lldb/lit/tools/lldb-mi/exec/exec-run-wrong-binary.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %lldbmi < %s | FileCheck %s
 
 # Test that -exec-run command won't hang in case of wrong name of binary file.
Index: lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test
+++ lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/exec/exec-step.test
===================================================================
--- lldb/lit/tools/lldb-mi/exec/exec-step.test
+++ lldb/lit/tools/lldb-mi/exec/exec-step.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test
===================================================================
--- lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test
+++ lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # RUN: %build %p/inputs/main.c %p/inputs/symbol-list-lines.c %p/inputs/list-lines-helper.c --nodefaultlib -o %t
 # RUN: %lldbmi %t < %s | FileCheck %s
 
Index: lldb/lit/tools/lldb-mi/target/target-select-so-path.test
===================================================================
--- lldb/lit/tools/lldb-mi/target/target-select-so-path.test
+++ lldb/lit/tools/lldb-mi/target/target-select-so-path.test
@@ -1,3 +1,4 @@
+# REQUIRES: lldb-mi
 # UNSUPPORTED: system-windows, system-darwin
 #
 # RUN: %clang -o %t %p/inputs/main.c -g