diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 850c0cf7ea81e79f11cdccff3f7614cb47071e47..8062aa72c1f1bb6d2d1f2a192318073780f36b9f 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -165,7 +165,10 @@ config.substitutions.append(
 ###
 
 # Set available features we allow tests to conditionalize on.
-config.available_features.add('crash-recovery')
+#
+# As of 2011.08, crash-recovery tests still do not pass on FreeBSD.
+if platform.system() not in ['FreeBSD']:
+    config.available_features.add('crash-recovery')
 
 # Shell execution
 if platform.system() not in ['Windows'] or lit.getBashPath() != '':