Index: llvm/trunk/test/Transforms/Util/PredicateInfo/condprop2.ll
===================================================================
--- llvm/trunk/test/Transforms/Util/PredicateInfo/condprop2.ll
+++ llvm/trunk/test/Transforms/Util/PredicateInfo/condprop2.ll
@@ -1,4 +1,4 @@
-; REQUIRES: asserts
+; REQUIRES: abi-breaking-checks
 ; NOTE: The flag -reverse-iterate is present only in a +Asserts build.
 ; Hence, this test has been split from condprop.ll to test with -reverse-iterate.
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
Index: llvm/trunk/test/Transforms/Util/PredicateInfo/testandor2.ll
===================================================================
--- llvm/trunk/test/Transforms/Util/PredicateInfo/testandor2.ll
+++ llvm/trunk/test/Transforms/Util/PredicateInfo/testandor2.ll
@@ -1,4 +1,4 @@
-; REQUIRES: asserts
+; REQUIRES: abi-breaking-checks
 ; NOTE: The flag -reverse-iterate is present only in a +Asserts build.
 ; Hence, this test has been split from testandor.ll to test with -reverse-iterate.
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
Index: llvm/trunk/test/lit.cfg
===================================================================
--- llvm/trunk/test/lit.cfg
+++ llvm/trunk/test/lit.cfg
@@ -546,3 +546,6 @@
 
 if config.have_libxar:
     config.available_features.add('xar')
+
+if config.enable_abi_breaking_checks == "1":
+    config.available_features.add('abi-breaking-checks')
Index: llvm/trunk/test/lit.site.cfg.in
===================================================================
--- llvm/trunk/test/lit.site.cfg.in
+++ llvm/trunk/test/lit.site.cfg.in
@@ -24,6 +24,7 @@
 config.go_executable = "@GO_EXECUTABLE@"
 config.enable_shared = @ENABLE_SHARED@
 config.enable_assertions = @ENABLE_ASSERTIONS@
+config.enable_abi_breaking_checks = "@LLVM_ENABLE_ABI_BREAKING_CHECKS@"
 config.targets_to_build = "@TARGETS_TO_BUILD@"
 config.native_target = "@LLVM_NATIVE_ARCH@"
 config.llvm_bindings = "@LLVM_BINDINGS@".split(' ')