diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 23fc7585d..cce4cc2a0 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -3986,17 +3986,18 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
                     post_build_steps =
                         TestSuiteBuilder.getLlvmTestSuiteSteps(
                             cmake_definitions = {
-                                "CMAKE_BUILD_TYPE"          : "Release",
-                                "CMAKE_C_FLAGS"             : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -faarch64-jump-table-hardening -O2",
-                                "CMAKE_CXX_FLAGS"           : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -faarch64-jump-table-hardening -O2",
-                                "CMAKE_EXE_LINKER_FLAGS"    : "-O2 -Wl,--emit-relocs",
-                                "CMAKE_MODULE_LINKER_FLAGS" : "-O2 -Wl,--emit-relocs",
-                                "CMAKE_SHARED_LINKER_FLAGS" : "-O2 -Wl,--emit-relocs",
+                                "CMAKE_BUILD_TYPE"              : "Release",
+                                "CMAKE_C_FLAGS"                 : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -O2",
+                                "CMAKE_CXX_FLAGS"               : "-march=armv8.3-a+pauth -mbranch-protection=pac-ret -O2",
+                                "CMAKE_EXE_LINKER_FLAGS"        : "-O2 -Wl,--emit-relocs",
+                                "CMAKE_MODULE_LINKER_FLAGS"     : "-O2 -Wl,--emit-relocs",
+                                "CMAKE_SHARED_LINKER_FLAGS"     : "-O2 -Wl,--emit-relocs",
                                 # Run on the devkit, limited set of tests.
-                                "TEST_SUITE_REMOTE_HOST"    : "buildbot@arm64-linux-02.lab.llvm.org",
-                                "TEST_SUITE_LIT_FLAGS"      : "-v --threads=16 --time-tests",
-                                "TEST_SUITE_RUN_BENCHMARKS" : "ON",
-                                "TEST_SUITE_SUBDIRS"        : "SingleSource;MultiSource;MicroBenchmarks",
+                                "TEST_SUITE_REMOTE_HOST"        : "buildbot@arm64-linux-02.lab.llvm.org",
+                                "TEST_SUITE_LIT_FLAGS"          : "-v -vv --threads=16 --time-tests --filter-out=aarch64-acle-fmv-features",
+                                "TEST_SUITE_RUN_BENCHMARKS"     : "ON",
+                                "TEST_SUITE_COLLECT_CODE_SIZE"  : "OFF",
+                                "TEST_SUITE_SUBDIRS"            : "SingleSource;MultiSource;MicroBenchmarks;External",
                             },
                             compiler_dir = util.Interpolate("%(prop:builddir)s/build"),
                         )