diff --git a/docs/design/reproducers.rst b/docs/design/reproducers.rst
index d8ad3dd..99e34d8 100644
--- a/docs/design/reproducers.rst
+++ b/docs/design/reproducers.rst
@@ -182,13 +182,6 @@
    unsupported by adding ``UNSUPPORTED: lldb-repro`` to the top of the shell
    test or adding the ``skipIfReproducer`` decorator for the API tests.
 
-Additional testing is possible:
-
- - It's possible to unconditionally capture reproducers while running the
-   entire test suite by setting the ``LLDB_CAPTURE_REPRODUCER`` environment
-   variable. Assuming no bugs in reproducers, this can also help to reproduce
-   and investigate test failures.
-
 Knows Issues
 ------------
 
diff --git a/test/API/lit.cfg.py b/test/API/lit.cfg.py
index cbb457e..9f63dc1 100644
--- a/test/API/lit.cfg.py
+++ b/test/API/lit.cfg.py
@@ -252,11 +252,6 @@
   config.environment['FREEBSD_LEGACY_PLUGIN'] = os.environ[
       'FREEBSD_LEGACY_PLUGIN']
 
-# Propagate LLDB_CAPTURE_REPRODUCER
-if 'LLDB_CAPTURE_REPRODUCER' in os.environ:
-  config.environment['LLDB_CAPTURE_REPRODUCER'] = os.environ[
-      'LLDB_CAPTURE_REPRODUCER']
-
 # Propagate XDG_CACHE_HOME
 if 'XDG_CACHE_HOME' in os.environ:
   config.environment['XDG_CACHE_HOME'] = os.environ['XDG_CACHE_HOME']
diff --git a/test/Shell/Reproducer/TestCaptureEnvOverride.test b/test/Shell/Reproducer/TestCaptureEnvOverride.test
deleted file mode 100644
index 122a059..0000000
--- a/test/Shell/Reproducer/TestCaptureEnvOverride.test
+++ /dev/null
@@ -1,17 +0,0 @@
-# This tests the LLDB_CAPTURE_REPRODUCER override.
-
-# RUN: %lldb -b -o 'reproducer status' --capture --capture-path %t.repro /bin/ls | FileCheck %s --check-prefix CAPTURE
-# RUN: %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix CAPTURE
-
-# RUN: LLDB_CAPTURE_REPRODUCER=1 %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE
-# RUN: LLDB_CAPTURE_REPRODUCER=ON %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE
-# RUN: LLDB_CAPTURE_REPRODUCER=on %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix CAPTURE
-
-# RUN: LLDB_CAPTURE_REPRODUCER=0 %lldb -b -o 'reproducer status' --capture --capture-path %t.repro | FileCheck %s --check-prefix OFF
-# RUN: LLDB_CAPTURE_REPRODUCER=0 %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix OFF
-
-# RUN: LLDB_CAPTURE_REPRODUCER=bogus %lldb -b -o 'reproducer status' --capture | FileCheck %s --check-prefix CAPTURE
-# RUN: LLDB_CAPTURE_REPRODUCER=bogus %lldb -b -o 'reproducer status' | FileCheck %s --check-prefix OFF
-
-# CAPTURE: Reproducer is in capture mode.
-# OFF: Reproducer is off.
diff --git a/test/Shell/Reproducer/lit.local.cfg b/test/Shell/Reproducer/lit.local.cfg
index 30f97f2..9de095f 100644
--- a/test/Shell/Reproducer/lit.local.cfg
+++ b/test/Shell/Reproducer/lit.local.cfg
@@ -2,10 +2,6 @@
 if 'LLVM_DISABLE_CRASH_REPORT' in config.environment:
   del config.environment['LLVM_DISABLE_CRASH_REPORT']
 
-# Unset the always capture environment override.
-if 'LLDB_CAPTURE_REPRODUCER' in config.environment:
-  del config.environment['LLDB_CAPTURE_REPRODUCER']
-
 if 'system-windows' in config.available_features:
   config.unsupported = True
 
diff --git a/test/Shell/lit.cfg.py b/test/Shell/lit.cfg.py
index c4730b2..964efc8 100644
--- a/test/Shell/lit.cfg.py
+++ b/test/Shell/lit.cfg.py
@@ -42,7 +42,6 @@
 llvm_config.with_system_environment([
     'FREEBSD_LEGACY_PLUGIN',
     'HOME',
-    'LLDB_CAPTURE_REPRODUCER',
     'TEMP',
     'TMP',
     'XDG_CACHE_HOME',