Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1133,6 +1133,7 @@
                          c_compiler="gcc",
                          cxx_compiler="g++",
                          libomptarget=True,
+                         test_jobs="18",
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "openmp-clang-x86_64-linux-debian",
@@ -1142,6 +1143,7 @@
                          c_compiler="clang",
                          cxx_compiler="clang++",
                          libomptarget=True,
+                         test_jobs="18",
                          test_libomptarget=True,
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
@@ -1152,6 +1154,7 @@
                          c_compiler="gcc",
                          cxx_compiler="g++",
                          ompt=True,
+                         test_jobs="18",
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "openmp-ompt-clang-x86_64-linux-debian",
@@ -1161,6 +1164,7 @@
                          c_compiler="clang",
                          cxx_compiler="clang++",
                          ompt=True,
+                         test_jobs="18",
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "openmp-clang-ppc64le-linux-debian",
@@ -1170,6 +1174,7 @@
                          c_compiler="clang",
                          cxx_compiler="clang++",
                          libomptarget=True,
+                         test_jobs="4",
                          test_libomptarget=True,
                          env={'PATH':'/home/bbot/opt/cmake/bin:/home/bbot/opt/ninja/bin:/usr/local/bin:/usr/bin:/bin'})},
 
Index: zorg/buildbot/builders/OpenMPBuilder.py
===================================================================
--- zorg/buildbot/builders/OpenMPBuilder.py
+++ zorg/buildbot/builders/OpenMPBuilder.py
@@ -13,12 +13,12 @@
 def getOpenMPCMakeBuildFactory(
         c_compiler          = 'gcc',        # The C compiler to use.
         cxx_compiler        = 'g++',        # The C++ compiler to use.
-        jobs                = '%(jobs)s',   # Number of concurrent jobs.
         clean               = True,         # "clean" step is requested if true
         env                 = None,         # Environmental variables for all steps.
         libomptarget        = False,        # Build libomptarget.
         ompt                = False,        # Whether to enable the OpenMP Tools Interface.
         test                = True,         # Test the built libraries.
+        test_jobs           = None,         # Number of concurrent jobs for tests.
         test_libomptarget   = False,        # Test the built libraries.
     ):
 
@@ -122,7 +122,9 @@
         cmake_args += ['-DLIBOMP_OMPT_SUPPORT=ON']
 
     if test:
-        lit_args = WithProperties('-v --show-unsupported --show-xfail -j %s' % jobs)
+        lit_args = '-v --show-unsupported --show-xfail'
+        if test_jobs is not None:
+            lit_args += ' -j %s' % test_jobs
         cmake_args += ['-DLIBOMP_LIT_ARGS="%s"' % lit_args]
         if test_libomptarget:
             cmake_args += ['-DLIBOMPTARGET_LIT_ARGS="%s"' % lit_args]
@@ -145,7 +147,9 @@
 
     # Test OpenMP runtime libraries, if requested.
     if test:
-        ninja_test_args = ['ninja', WithProperties('-j %s' % jobs)]
+        ninja_test_args = ['ninja']
+        if test_jobs is not None:
+            ninja_test_args += ['-j %s' % test_jobs]
         f.addStep(
             LitTestCommand(
                 name        = 'test-libomp',