diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index a956b5ee6..a77a79659 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -3952,10 +3952,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
                         "check-llvm",
                         "check-clang",
                         "check-lld",
-                        "check-compiler-rt-aarch64-unknown-linux-gnu",
-                        "check-unwind-aarch64-unknown-linux-gnu",
-                        "check-cxxabi-aarch64-unknown-linux-gnu",
-                        "check-cxx-aarch64-unknown-linux-gnu",
                     ],
                     cmake_definitions = {
                         "LLVM_TARGETS_TO_BUILD"             : "AArch64",
@@ -3978,6 +3974,14 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
                     env = {
                         'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
                     },
+                    post_build_steps =
+                        TestSuiteBuilder.getLlvmTestSuiteSteps(
+                            cmake_definitions = {
+                                "TEST_SUITE_REMOTE_HOST"    : "buildbot@arm64-linux-02.lab.llvm.org",
+                                "TEST_SUITE_LIT_FLAGS"      : "-v --threads=32 --time-tests",
+                            },
+                            compiler_dir = util.Interpolate("%(prop:builddir)s/build"),
+                        )
                 )
-        },        
+        },
 ]