diff --git a/clang/test/CodeGenCXX/debug-info-enum-i128.cpp b/clang/test/CodeGenCXX/debug-info-enum-i128.cpp
--- a/clang/test/CodeGenCXX/debug-info-enum-i128.cpp
+++ b/clang/test/CodeGenCXX/debug-info-enum-i128.cpp
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 %s -triple powerpc64-ibm-aix-xcoff -debug-info-kind=limited -emit-llvm -o - | FileCheck %s
 
 // FIXME: llvm.org/pr51221, the APSInt leaks
-// UNSUPPORTED: asan
+// UNSUPPORTED: asan || hwasan
 
 enum class uns : __uint128_t { unsval = __uint128_t(1) << 64 };
 uns t1() { return uns::unsval; }
diff --git a/clang/test/Driver/crash-diagnostics-dir-3.c b/clang/test/Driver/crash-diagnostics-dir-3.c
--- a/clang/test/Driver/crash-diagnostics-dir-3.c
+++ b/clang/test/Driver/crash-diagnostics-dir-3.c
@@ -3,3 +3,6 @@
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK: diagnostic msg: {{.*}}{{/|\\}}crash-diagnostics-dir-3.c.tmp{{(/|\\).*}}.c
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Driver/crash-diagnostics-dir.c b/clang/test/Driver/crash-diagnostics-dir.c
--- a/clang/test/Driver/crash-diagnostics-dir.c
+++ b/clang/test/Driver/crash-diagnostics-dir.c
@@ -3,3 +3,6 @@
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK: diagnostic msg: {{.*}}{{/|\\}}crash-diagnostics-dir.c.tmp{{(/|\\).*}}.c
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Driver/crash-report-clang-cl.cpp b/clang/test/Driver/crash-report-clang-cl.cpp
--- a/clang/test/Driver/crash-report-clang-cl.cpp
+++ b/clang/test/Driver/crash-report-clang-cl.cpp
@@ -8,6 +8,9 @@
 
 // REQUIRES: crash-recovery
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #pragma clang __debug crash
 
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
diff --git a/clang/test/Driver/crash-report-header.h b/clang/test/Driver/crash-report-header.h
--- a/clang/test/Driver/crash-report-header.h
+++ b/clang/test/Driver/crash-report-header.h
@@ -5,6 +5,9 @@
 // RUN: cat %t/crash-report-header-*.sh | FileCheck --check-prefix=CHECKSH "%s"
 // REQUIRES: crash-recovery
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK-NEXT: note: diagnostic msg: {{.*}}.h
diff --git a/clang/test/Driver/crash-report-spaces.c b/clang/test/Driver/crash-report-spaces.c
--- a/clang/test/Driver/crash-report-spaces.c
+++ b/clang/test/Driver/crash-report-spaces.c
@@ -6,6 +6,9 @@
 // RUN: cat "%t/crash report spaces"-*.sh | FileCheck --check-prefix=CHECKSH "%s"
 // REQUIRES: crash-recovery
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #pragma clang __debug parser_crash
 // CHECK: Preprocessed source(s) and associated run script(s) are located at:
 // CHECK-NEXT: note: diagnostic msg: {{.*}}.c
diff --git a/clang/test/Driver/crash-report-with-asserts.c b/clang/test/Driver/crash-report-with-asserts.c
--- a/clang/test/Driver/crash-report-with-asserts.c
+++ b/clang/test/Driver/crash-report-with-asserts.c
@@ -23,6 +23,9 @@
 
 // REQUIRES: crash-recovery, asserts
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #ifdef ASSERT
 #pragma clang __debug assert
 #elif UNREACHABLE
diff --git a/clang/test/Driver/crash-report.cpp b/clang/test/Driver/crash-report.cpp
--- a/clang/test/Driver/crash-report.cpp
+++ b/clang/test/Driver/crash-report.cpp
@@ -52,6 +52,9 @@
 
 // REQUIRES: crash-recovery
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #ifdef PARSER
 #pragma clang __debug parser_crash
 #elif CRASH
diff --git a/clang/test/Driver/emit-reproducer.c b/clang/test/Driver/emit-reproducer.c
--- a/clang/test/Driver/emit-reproducer.c
+++ b/clang/test/Driver/emit-reproducer.c
@@ -32,6 +32,9 @@
 // CHECK:   note: diagnostic msg: {{.*}}emit-reproducer-{{.*}}.c
 // NOT-NOT: note: diagnostic msg: {{.*}}emit-reproducer-{{.*}}.c
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #ifdef FATAL
 #pragma clang __debug crash
 #elif ERROR
diff --git a/clang/test/Driver/output-file-cleanup.c b/clang/test/Driver/output-file-cleanup.c
--- a/clang/test/Driver/output-file-cleanup.c
+++ b/clang/test/Driver/output-file-cleanup.c
@@ -17,6 +17,9 @@
 
 // REQUIRES: crash-recovery
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #ifdef CRASH
 #pragma clang __debug crash
 #elif defined(MISSING)
diff --git a/clang/test/Driver/rewrite-map-in-diagnostics.c b/clang/test/Driver/rewrite-map-in-diagnostics.c
--- a/clang/test/Driver/rewrite-map-in-diagnostics.c
+++ b/clang/test/Driver/rewrite-map-in-diagnostics.c
@@ -9,3 +9,6 @@
 // CHECK: note: diagnostic msg: {{.*}}rewrite.map
 
 // REQUIRES: crash-recovery
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Index/crash-recovery-code-complete.c b/clang/test/Index/crash-recovery-code-complete.c
--- a/clang/test/Index/crash-recovery-code-complete.c
+++ b/clang/test/Index/crash-recovery-code-complete.c
@@ -12,4 +12,7 @@
 // REQUIRES: can-remove-opened-file
 // UNSUPPORTED: libstdcxx-safe-mode
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #warning parsing original file
diff --git a/clang/test/Index/crash-recovery-modules.m b/clang/test/Index/crash-recovery-modules.m
--- a/clang/test/Index/crash-recovery-modules.m
+++ b/clang/test/Index/crash-recovery-modules.m
@@ -13,6 +13,9 @@
 // REQUIRES: crash-recovery
 // UNSUPPORTED: libstdcxx-safe-mode
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 @import Crash;
 
 #ifdef LIBCLANG_CRASH
diff --git a/clang/test/Index/crash-recovery-reparse.c b/clang/test/Index/crash-recovery-reparse.c
--- a/clang/test/Index/crash-recovery-reparse.c
+++ b/clang/test/Index/crash-recovery-reparse.c
@@ -9,4 +9,7 @@
 // REQUIRES: crash-recovery
 // UNSUPPORTED: libstdcxx-safe-mode
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #warning parsing original file
diff --git a/clang/test/Index/crash-recovery.c b/clang/test/Index/crash-recovery.c
--- a/clang/test/Index/crash-recovery.c
+++ b/clang/test/Index/crash-recovery.c
@@ -6,4 +6,7 @@
 // REQUIRES: crash-recovery
 // UNSUPPORTED: libstdcxx-safe-mode
 
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
+
 #pragma clang __debug crash
diff --git a/clang/test/Index/create-libclang-completion-reproducer.c b/clang/test/Index/create-libclang-completion-reproducer.c
--- a/clang/test/Index/create-libclang-completion-reproducer.c
+++ b/clang/test/Index/create-libclang-completion-reproducer.c
@@ -12,3 +12,6 @@
 // CHECK-NEXT: {
 // CHECK-NEXT: "files":["{{.*}}.c","{{.*}}.sh"]
 // CHECK-NEXT: }
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Index/create-libclang-parsing-reproducer.c b/clang/test/Index/create-libclang-parsing-reproducer.c
--- a/clang/test/Index/create-libclang-parsing-reproducer.c
+++ b/clang/test/Index/create-libclang-parsing-reproducer.c
@@ -19,3 +19,6 @@
 // CHECK-NEXT: {
 // CHECK-NEXT: "files":["{{.*}}.c","{{.*}}.sh"]
 // CHECK-NEXT: }
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Index/error-on-deserialized.c b/clang/test/Index/error-on-deserialized.c
--- a/clang/test/Index/error-on-deserialized.c
+++ b/clang/test/Index/error-on-deserialized.c
@@ -11,3 +11,6 @@
 // RUN:  | FileCheck %s
 
 // CHECK: error: 'NestedVar1' was deserialized
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Index/record-completion-invocation.c b/clang/test/Index/record-completion-invocation.c
--- a/clang/test/Index/record-completion-invocation.c
+++ b/clang/test/Index/record-completion-invocation.c
@@ -9,3 +9,6 @@
 // RUN: cat %t/libclang-* | FileCheck %s
 
 // CHECK: {"toolchain":"{{.*}}","libclang.operation":"complete","libclang.opts":1,"args":["clang","-fno-spell-checking","{{.*}}record-completion-invocation.c","-Xclang","-detailed-preprocessing-record","-fallow-editor-placeholders"],"invocation-args":["-code-completion-at={{.*}}record-completion-invocation.c:10:1"],"unsaved_file_hashes":[{"name":"{{.*}}record-completion-invocation.c","md5":"aee23773de90e665992b48209351d70e"}]}
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/clang/test/Index/record-parsing-invocation.c b/clang/test/Index/record-parsing-invocation.c
--- a/clang/test/Index/record-parsing-invocation.c
+++ b/clang/test/Index/record-parsing-invocation.c
@@ -26,3 +26,6 @@
 
 // CHECK: {"toolchain":"{{.*}}","libclang.operation":"parse","libclang.opts":1,"args":["clang","-fno-spell-checking","{{.*}}record-parsing-invocation.c","-Xclang","-detailed-preprocessing-record","-fallow-editor-placeholders"]}
 // CHECK-UNSAVED: {"toolchain":"{{.*}}","libclang.operation":"parse","libclang.opts":1,"args":["clang","-fno-spell-checking","{{.*}}record-parsing-invocation.c","-Xclang","-detailed-preprocessing-record","-fallow-editor-placeholders"],"unsaved_file_hashes":[{"name":"{{.*}}record-parsing-invocation.c","md5":"aee23773de90e665992b48209351d70e"}]}
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan
diff --git a/llvm/test/tools/llvm-profdata/merge-incompatible.test b/llvm/test/tools/llvm-profdata/merge-incompatible.test
--- a/llvm/test/tools/llvm-profdata/merge-incompatible.test
+++ b/llvm/test/tools/llvm-profdata/merge-incompatible.test
@@ -5,3 +5,6 @@
 // we do not know which files have incompatible kinds.
 RUN: not llvm-profdata merge %p/Inputs/fe-basic.proftext %p/Inputs/ir-basic.proftext --num-threads=2 -o /dev/null 2>&1 | FileCheck %s --check-prefix=THREADS
 THREADS: unsupported instrumentation profile format version
+
+// Fixme: enable when passing in HWASAN+LSAN mode.
+// UNSUPPORTED: hwasan