diff --git a/test/lit.cfg b/test/lit.cfg
index 78c5422f3aa..67e851b6e81 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -339,14 +339,15 @@ if loadable_module:
     config.available_features.add('loadable_module')
 
 # Sanitizers.
-if config.llvm_use_sanitizer == "Address":
+if 'Address' in config.llvm_use_sanitizer:
     config.available_features.add("asan")
-if (config.llvm_use_sanitizer == "Memory" or
-        config.llvm_use_sanitizer == "MemoryWithOrigins"):
+else:
+    config.available_features.add("not_asan")
+if 'Memory' in config.llvm_use_sanitizer:
     config.available_features.add("msan")
 else:
     config.available_features.add("not_msan")
-if config.llvm_use_sanitizer == "Undefined":
+if 'Undefined' in config.llvm_use_sanitizer:
     config.available_features.add("ubsan")
 else:
     config.available_features.add("not_ubsan")