diff --git a/test/jenkins/test_monorepo_build.py b/test/jenkins/test_monorepo_build.py
--- a/test/jenkins/test_monorepo_build.py
+++ b/test/jenkins/test_monorepo_build.py
@@ -147,3 +147,9 @@
 # RUN: python %{src_root}/zorg/jenkins/monorepo_build.py cmake all > %t-timeout-default.log
 # RUN: FileCheck --check-prefix CHECK-TIMEOUT-DEFAULT < %t-timeout-default.log %s
 # CHECK-TIMEOUT-DEFAULT: --timeout=600
+
+# RUN: python %{src_root}/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
+# RUN:   --lldb-test-compiler="MY_LLDB_TEST_COMPILER" > %t-lldb-configure.log
+# RUN: FileCheck --check-prefix CHECK-LLDB-CONFIG < %t-lldb-configure.log %s
+
+# CHECK-LLDB-CONFIG: -DLLDB_TEST_COMPILER=MY_LLDB_TEST_COMPILER
diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
--- a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
+++ b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
@@ -201,9 +201,9 @@
                 timeout(60) {
                     sh '''
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    export LLDB_TEST_COMPILER="$WORKSPACE/clang_502_build/bin/clang"
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
                       --assertions \
+                      --lldb-test-compiler="$WORKSPACE/clang_502_build/bin/clang" \
                       --projects="clang;lldb"  \
                       --runtimes="libcxx;libcxxabi"  \
                       --cmake-type=Release \
@@ -260,9 +260,9 @@
                 timeout(60) {
                     sh '''
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    export LLDB_TEST_COMPILER="$WORKSPACE/clang_701_build/bin/clang"
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
                       --assertions \
+                      --lldb-test-compiler="$WORKSPACE/clang_701_build/bin/clang" \
                       --projects="clang;lldb"  \
                       --runtimes="libcxx;libcxxabi"  \
                       --cmake-type=Release \
@@ -319,9 +319,9 @@
                 timeout(60) {
                     sh '''
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    export LLDB_TEST_COMPILER="$WORKSPACE/clang_900_build/bin/clang"
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
                       --assertions \
+                      --lldb-test-compiler="$WORKSPACE/clang_900_build/bin/clang" \
                       --projects="clang;lldb"  \
                       --runtimes="libcxx;libcxxabi"  \
                       --cmake-type=Release \
@@ -378,9 +378,9 @@
                 timeout(60) {
                     sh '''
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    export LLDB_TEST_COMPILER="$WORKSPACE/clang_1101_build/bin/clang"
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
                       --assertions \
+                      --lldb-test-compiler="$WORKSPACE/clang_1101_build/bin/clang" \
                       --projects="clang;lldb"  \
                       --runtimes="libcxx;libcxxabi"  \
                       --cmake-type=Release \
@@ -437,9 +437,9 @@
                 timeout(60) {
                     sh '''
                     export PATH=$PATH:/usr/bin:/usr/local/bin
-                    export LLDB_TEST_COMPILER="$WORKSPACE/clang_1300_build/bin/clang"
                     python llvm-zorg/zorg/jenkins/monorepo_build.py lldb-cmake-matrix configure \
                       --assertions \
+                      --lldb-test-compiler="$WORKSPACE/clang_1300_build/bin/clang" \
                       --projects="clang;lldb"  \
                       --runtimes="libcxx;libcxxabi"  \
                       --cmake-type=Release \
diff --git a/zorg/jenkins/monorepo_build.py b/zorg/jenkins/monorepo_build.py
--- a/zorg/jenkins/monorepo_build.py
+++ b/zorg/jenkins/monorepo_build.py
@@ -112,7 +112,6 @@
         self._lldb_standalone_type = os.environ.get('LLDB_STANDALONE_TYPE', 'build-tree')
         self._lldb_xcode_build_dir = os.environ.get('LLDB_XCODE_BUILD_DIR', 'lldb-xcode-build')
         self._lldb_install_dir = os.environ.get('LLDB_INSTALL_DIR', 'lldb-install')
-        self._lldb_test_compiler = os.environ.get('LLDB_TEST_COMPILER', '')
         self._install_dir = os.environ.get('INSTALL_DIR', 'clang-install')
         self.j_level = os.environ.get('J_LEVEL', None)
         self.max_parallel_tests = os.environ.get('MAX_PARALLEL_TESTS', None)
@@ -166,10 +165,6 @@
         """The install directory for the lldb build."""
         return os.path.join(self.workspace, self._lldb_install_dir)
 
-    def lldbtestcompiler(self):
-        """The compiler used to build LLDB tests."""
-        return self._lldb_test_compiler
-
     def installdir(self):
         """The install directory for the compile."""
         return os.path.join(self.workspace, self._install_dir)
@@ -576,9 +571,9 @@
             "-DCMAKE_CXX_FLAGS={}".format(' '.join(conf.compiler_flags))
         ])
 
-    if conf.lldbtestcompiler():
+    if conf.lldb_test_compiler is not None:
         cmake_cmd.extend([
-            '-DLLDB_TEST_COMPILER=' + conf.lldbtestcompiler(),
+            '-DLLDB_TEST_COMPILER=' + conf.lldb_test_compiler,
         ])
 
     cmake_cmd.extend(conf.cmake_flags)
@@ -1071,6 +1066,8 @@
                         help="Semicolon seperated list of runtimes to enable.")
     parser.add_argument('--timeout', dest='timeout', type=int, default='600',
                         help='Individual test timeout in seconds.')
+    parser.add_argument('--lldb-test-compiler',
+                        help='The compiler used to build LLDB tests.')
     args = parser.parse_args()
     if args.thinlto:
         args.lto = True