diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1200,10 +1200,12 @@
     'builddir': "lldb-x64-windows-ninja",
     'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
                     clean=True,
-                    python_source_dir=r'"C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64"',
                     target_arch='x64',
                     vs="autodetect",
                     test=True,
+                    checks=[
+                        'check-lldb-shell',
+                        'check-lldb-unit'],
                     extra_cmake_args=[
                         '-DLLVM_ENABLE_ASSERTIONS=OFF',
                         '-DLLVM_ENABLE_ZLIB=FALSE',
diff --git a/zorg/buildbot/builders/LLDBBuilder.py b/zorg/buildbot/builders/LLDBBuilder.py
--- a/zorg/buildbot/builders/LLDBBuilder.py
+++ b/zorg/buildbot/builders/LLDBBuilder.py
@@ -24,6 +24,7 @@
             extra_cmake_args=None,
             test=False,
             testTimeout=2400,
+            checks=None,
             install=False):
 
     ############# PREPARING
@@ -43,11 +44,14 @@
             extract_fn=extractVSEnvironment))
         env = Property('vs_env')
 
+    if checks is None:
+        checks = ['check-lldb']
+
     f.addGetSourcecodeSteps()
 
     build_cmd=['ninja']
     install_cmd = ['ninja','install']
-    test_cmd = ['ninja','check-lldb']
+    test_cmd = ['ninja']
     lit_args = '-v'
 
     if jobs:
@@ -103,13 +107,14 @@
                           env=env))
 
     ignoreTestFail = bool(test != 'ignoreFail')
-    f.addStep(ShellCommand(name='test',
-                          command=test_cmd,
-                          flunkOnFailure=ignoreTestFail,
-                          timeout=testTimeout,
-                          description='ninja test',
-                          workdir=build_dir,
-                          doStepIf=bool(test),
-                          env=env))
+    for check in checks:
+        f.addStep(ShellCommand(name='test-%s' % check,
+                              command=[*test_cmd, check],
+                              flunkOnFailure=ignoreTestFail,
+                              timeout=testTimeout,
+                              description='ninja test %s' % check,
+                              workdir=build_dir,
+                              doStepIf=bool(test),
+                              env=env))
 
     return f