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
@@ -651,7 +651,6 @@
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                     depends_on_projects=["llvm", "clang", "clang-tools-extra",
                                          "compiler-rt"],
-                    enable_runtimes="auto",
                     checks=['check-all', 'check-runtimes'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
@@ -682,7 +681,6 @@
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                     depends_on_projects=["llvm", "clang", "clang-tools-extra",
                                          "compiler-rt"],
-                    enable_runtimes="auto",
                     checks=['check-all', 'check-runtimes'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
@@ -714,7 +712,6 @@
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                     depends_on_projects=["llvm", "clang", "clang-tools-extra",
                                          "lld", "compiler-rt"],
-                    enable_runtimes="auto",
                     checks=['check-all', 'check-runtimes'],
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=On",
@@ -735,7 +732,6 @@
     'builddir': "clang-ppc64-aix",
     'factory' : TestSuiteBuilder.getTestSuiteBuildFactory(
                     depends_on_projects=["llvm", "clang", "compiler-rt"],
-                    enable_runtimes="auto",
                     clean=False,
                     extra_configure_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=On",
diff --git a/zorg/buildbot/builders/TestSuiteBuilder.py b/zorg/buildbot/builders/TestSuiteBuilder.py
--- a/zorg/buildbot/builders/TestSuiteBuilder.py
+++ b/zorg/buildbot/builders/TestSuiteBuilder.py
@@ -55,7 +55,7 @@
 
 def getTestSuiteBuildFactory(
            depends_on_projects = None,
-           enable_runtimes = None,
+           enable_runtimes = "auto",
            targets = None,
            llvm_srcdir = None,
            obj_dir = None,