Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -294,18 +294,16 @@
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
-         'slavenames':["linaro-apm-01"],
+         'slavenames':["linaro-apm-01", "linaro-d05-01-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
-                                       '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57'],
                       env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
                            'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
@@ -318,10 +316,9 @@
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
-         'slavenames':["linaro-apm-04"],
+         'slavenames':["linaro-apm-04", "linaro-d05-01-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=True,
@@ -329,8 +326,7 @@
                       useTwoStage=True,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
-                                       '-mcpu=cortex-a57 -fuse-ld=lld',
-                                       '--threads=8', '--build-threads=8'],
+                                       '-mcpu=cortex-a57 -fuse-ld=lld'],
                       env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
@@ -341,10 +337,9 @@
 
         ## AArch64 Clang+LLVM run test-suite with GlobalISel enabled
         {'name': "clang-cmake-aarch64-global-isel",
-         'slavenames':["linaro-apm-06"],
+         'slavenames':["linaro-apm-06", "linaro-d05-01-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
@@ -352,8 +347,7 @@
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
-                                       '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
-                                       '--threads=8', '--build-threads=8'],
+                                       '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0'],
                       env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
@@ -1053,10 +1047,9 @@
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
-         'slavenames':["linaro-apm-02", "linaro-apm-05"],
+         'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-d05-01-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
-                      jobs=8,
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=False,
@@ -1064,8 +1057,7 @@
                       useTwoStage=True,
                       testStage1=False,
                       runTestSuite=True,
-                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
-                                       '--threads=8', '--build-threads=8'],
+                      testsuite_flags=['--cppflags', '-mcpu=cortex-a57'],
                       env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                       extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
@@ -1376,7 +1368,7 @@
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
-         'slavenames': ['linaro-apm-03'],
+         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
@@ -1389,7 +1381,7 @@
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
-         'slavenames': ['linaro-apm-03'],
+         'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -40,6 +40,12 @@
         create_slave("linaro-apm-04", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-05", properties={'jobs' : 8}, max_builds=1),
         create_slave("linaro-apm-06", properties={'jobs' : 8}, max_builds=1),
+        create_slave("linaro-d05-01-quick", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-full", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-global-isel", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-lld", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-libcxx", properties={'jobs' : 64}, max_builds=1),
+        create_slave("linaro-d05-01-libcxx-noexceptions", properties={'jobs' : 64}, max_builds=1),
 
         # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
         create_slave("grosser1", properties={'jobs': 2}, max_builds=1),