Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -565,7 +565,7 @@
         {'name': "lldb-x86-windows-msvc2015",
          'slavenames': ["zturner-win2008"],
          'builddir': "lldb-windows-x86",
-         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},
+         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory()},
         {'name': "lldb-x86-win7-msvc",
          'slavenames': ["hexagon-build-01"],
          'builddir': "builddir/lldb-win7-msvc",
Index: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
@@ -93,11 +93,13 @@
 
     # Use batch files instead of ShellCommand directly, Windows quoting is
     # borked. FIXME: See buildbot ticket #595 and buildbot ticket #377.
+    clang_exe = 'build_dir/bin/clang.exe'    # ./bin/clang.exe
     f.addStep(batch_file_download.BatchFileDownload(name='cmakegen',
                                 command=[cmake, "-G", "Ninja", "../llvm",
                                          "-DCMAKE_BUILD_TYPE="+config,
                                          '-DPYTHON_HOME=' + python_source_dir,
-                                         "-DCMAKE_INSTALL_PREFIX=../install"]
+                                         "-DCMAKE_INSTALL_PREFIX=../install",
+                                         "-DLLDB_TEST_COMPILER=" + clang_exe]
                                          + extra_cmake_args,
                                 workdir=build_dir))