diff --git a/compiler-rt/test/ubsan_minimal/lit.common.cfg b/compiler-rt/test/ubsan_minimal/lit.common.cfg
index 6f239ede6b90..ab0eb9720a97 100644
--- a/compiler-rt/test/ubsan_minimal/lit.common.cfg
+++ b/compiler-rt/test/ubsan_minimal/lit.common.cfg
@@ -33,4 +33,8 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windows
   config.unsupported = True
 
+# Don't target x86_64h if the test machine can't execute x86_64h binaries.
+if config.target_arch == 'x86_64h' and 'x86_64h' not in config.available_features:
+  config.unsupported = True
+
 config.available_features.add('arch=' + config.target_arch)