diff --git a/compiler-rt/test/fuzzer/exit_on_src_pos.test b/compiler-rt/test/fuzzer/exit_on_src_pos.test
index d8fb662ffd93f..881d314439852 100644
--- a/compiler-rt/test/fuzzer/exit_on_src_pos.test
+++ b/compiler-rt/test/fuzzer/exit_on_src_pos.test
@@ -3,6 +3,10 @@
 # TODO: Find out why test fails on Darwin with -O2.
 # Binaries must end in .exe or else symbolization will break on Windows because of how periods
 # in expansion of %t cause the compiler to overwrite .lib and .exp files.
+
+# Test does not complete on Armv7 Thumb build bot
+UNSUPPORTED: thumb
+
 RUN: %cpp_compiler -O0 %S/SimpleTest.cpp -o %t-SimpleTest.exe -mllvm -use-unknown-locations=Disable
 RUN: %cpp_compiler -O0 %S/ShrinkControlFlowTest.cpp -o %t-ShrinkControlFlowTest.exe
 
diff --git a/compiler-rt/test/fuzzer/lit.cfg.py b/compiler-rt/test/fuzzer/lit.cfg.py
index d54ee20d18927..f0140c8f3ba40 100644
--- a/compiler-rt/test/fuzzer/lit.cfg.py
+++ b/compiler-rt/test/fuzzer/lit.cfg.py
@@ -58,6 +58,9 @@
 else:
   lit_config.note('linux feature unavailable')
 
+if config.arm_thumb:
+  config.available_features.add('thumb')
+
 config.substitutions.append(('%build_dir', config.cmake_binary_dir))
 libfuzzer_src_root = os.path.join(config.compiler_rt_src_root, "lib", "fuzzer")
 config.substitutions.append(('%libfuzzer_src', libfuzzer_src_root))
diff --git a/compiler-rt/test/fuzzer/lit.site.cfg.py.in b/compiler-rt/test/fuzzer/lit.site.cfg.py.in
index 218688c182c7c..b883022e2f5a1 100644
--- a/compiler-rt/test/fuzzer/lit.site.cfg.py.in
+++ b/compiler-rt/test/fuzzer/lit.site.cfg.py.in
@@ -7,6 +7,7 @@ config.stdlib = "@LIBFUZZER_TEST_STDLIB@"
 config.apple_platform = "@LIBFUZZER_TEST_APPLE_PLATFORM@"
 config.apple_platform_min_deployment_target_flag = "@LIBFUZZER_TEST_MIN_DEPLOYMENT_TARGET_FLAG@"
 config.name_suffix = "@LIBFUZZER_TEST_CONFIG_SUFFIX@"
+config.arm_thumb = "@COMPILER_RT_ARM_THUMB@"
 
 config.osx_sysroot_flag = "@OSX_SYSROOT_FLAG@"
 config.cmake_binary_dir = "@CMAKE_BINARY_DIR@"
diff --git a/compiler-rt/test/fuzzer/value-profile-switch.test b/compiler-rt/test/fuzzer/value-profile-switch.test
index 05a9ca7ec0b57..35409ef2bb4a7 100644
--- a/compiler-rt/test/fuzzer/value-profile-switch.test
+++ b/compiler-rt/test/fuzzer/value-profile-switch.test
@@ -1,3 +1,5 @@
+# Test does not complete on Armv7 Thumb build bot
+UNSUPPORTED: thumb
 UNSUPPORTED: ios
 CHECK: BINGO
 RUN: %cpp_compiler %S/SwitchTest.cpp -o %t-SwitchTest