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
@@ -178,10 +178,16 @@
                         "check-llvm",
                         "check-clang",
                         "check-lld",
-                        "check-unwind",
-                        "check-cxxabi",
                       ],
                       checks_on_target = [
+                        ("libunwind",
+                         ["python", "bin/llvm-lit.py",
+                          "-v", "-vv", "--threads=32",
+                          "runtimes/runtimes-bins/libunwind/test"]),
+                        ("libc++abi",
+                         ["python", "bin/llvm-lit.py",
+                          "-v", "-vv", "--threads=32",
+                          "runtimes/runtimes-bins/libcxxabi/test"]),
                         ("libc++",
                          ['python', 'bin/llvm-lit.py',
                           '-v', '-vv', '--threads=32',
@@ -207,8 +213,16 @@
                         "check-llvm",
                         "check-clang",
                         "check-lld",
-                        "check-unwind",
-                        "check-cxxabi",
+                      ],
+                      checks_on_target = [
+                        ("libunwind",
+                         ["python", "bin/llvm-lit.py",
+                          "-v", "-vv", "--threads=32",
+                          "runtimes/runtimes-bins/libunwind/test"]),
+                        ("libc++abi",
+                         ["python", "bin/llvm-lit.py",
+                          "-v", "-vv", "--threads=32",
+                          "runtimes/runtimes-bins/libcxxabi/test"]),
                       ],
                       extra_configure_args=[
                         "-DLLVM_TARGETS_TO_BUILD=AArch64",