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
@@ -236,7 +236,7 @@
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     vs="manual",
                     checkout_flang=True,
-                    test=False, # Disable testing until MCJIT failures are fixed
+                    checks=[], # Disable testing until MCJIT failures are fixed
                     extra_cmake_args=[
                         "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
                         "-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-pc-windows-msvc",
@@ -263,7 +263,7 @@
                     clean=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=False,
+                    checks=[],
                     runTestSuite=True,
                     testsuite_flags=[
                         '--cppflags', '-O3 -mcpu=cortex-a15 -mthumb',
@@ -286,7 +286,7 @@
                     clean=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=False,
+                    checks=[],
                     runTestSuite=True,
                     testsuite_flags=[
                         '--cppflags', '-mcpu=cortex-a15 -marm',
@@ -554,7 +554,7 @@
     'builddir': "clang-arm64-windows-msvc-2stage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     vs="manual",
-                    test=False, # Disable testing until MCJIT failures are fixed
+                    checks=[], # Disable testing until MCJIT failures are fixed
                     useTwoStage=True,
                     testStage1=False,
                     extra_cmake_args=[
@@ -783,7 +783,6 @@
                     checkout_clang_tools_extra=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=True,
                     useTwoStage=False,
                     runTestSuite=True,
                     nt_flags=['--cflag', '-march=broadwell', '--threads=80', '--build-threads=80'],
@@ -804,7 +803,7 @@
                     checkout_clang_tools_extra=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=False,
+                    checks=[],
                     useTwoStage=False,
                     runTestSuite=True,
                     nt_flags=['--cflag', '-march=broadwell', '--threads=1', '--build-threads=80', '--use-perf',
@@ -827,7 +826,6 @@
                     checkout_clang_tools_extra=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=True,
                     useTwoStage=False,
                     runTestSuite=True,
                     nt_flags=['--cflag', '-march=skylake-avx512', '--threads=80',
@@ -881,7 +879,6 @@
                     checkout_clang_tools_extra=False,
                     checkout_compiler_rt=False,
                     checkout_lld=False,
-                    test=True,
                     testStage1=True,
                     useTwoStage=False,
                     stage1_config='Release',
diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -72,7 +72,7 @@
 
 def getClangCMakeGCSBuildFactory(
             clean=True,
-            test=True,
+            checks=None,
             cmake='cmake',
             jobs=None,
 
@@ -115,7 +115,7 @@
             # Triggers
             trigger_after_stage1=None):
     return _getClangCMakeBuildFactory(
-               clean=clean, test=test, cmake=cmake, jobs=jobs, vs=vs,
+               clean=clean, checks=checks, cmake=cmake, jobs=jobs, vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
@@ -133,7 +133,7 @@
 
 def getClangCMakeBuildFactory(
             clean=True,
-            test=True,
+            checks=None,
             cmake='cmake',
             jobs=None,
 
@@ -167,7 +167,7 @@
             checkout_flang=False,
             checkout_test_suite=False):
     return _getClangCMakeBuildFactory(
-               clean=clean, test=test, cmake=cmake, jobs=jobs, vs=vs,
+               clean=clean, checks=checks, cmake=cmake, jobs=jobs, vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
@@ -183,7 +183,7 @@
 
 def _getClangCMakeBuildFactory(
             clean=True,
-            test=True,
+            checks=None,
             cmake='cmake',
             jobs=None,
 
@@ -229,6 +229,8 @@
             trigger_after_stage1=None):
 
     ############# PREPARING
+    if checks is None:
+        checks = ['check-all']
     if nt_flags is None:
         nt_flags = []
     if testsuite_flags is None:
@@ -292,7 +294,7 @@
         lit_args += "'"
     ninja_cmd = ['ninja'] + jobs_cmd
     ninja_install_cmd = ['ninja', 'install'] + jobs_cmd
-    ninja_check_cmd = ['ninja', 'check-all'] + jobs_cmd
+    ninja_check_cmd = ['ninja'] + checks + jobs_cmd
 
     # Global configurations
     stage1_build = 'stage1'
@@ -347,7 +349,7 @@
                                           workdir=stage1_build,
                                           env=env))
 
-    if test and testStage1:
+    if checks and testStage1:
         haltOnStage1Check = not useTwoStage and not runTestSuite
         f.addStep(LitTestCommand(name='ninja check 1',
                                  command=ninja_check_cmd,
@@ -438,7 +440,7 @@
                                               workdir=stage2_build,
                                               env=env))
 
-        if test:
+        if checks:
             f.addStep(LitTestCommand(name='ninja check 2',
                                      command=ninja_check_cmd,
                                      haltOnFailure=not runTestSuite,