diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 75e9faecb29..aa45ab8e920 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -48,7 +48,7 @@ namespace {
   static cl::opt<bool>
   AlwaysFoldAndInTest("always-fold-and-in-test",
                 cl::desc("Always fold and operation in test"),
-                cl::init(true), cl::Hidden);
+                cl::init(false), cl::Hidden);
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/test/CodeGen/X86/test-nofold.ll b/test/CodeGen/X86/test-nofold.ll
index 7ee8eb0b9c2..a24a9a0940a 100644
--- a/test/CodeGen/X86/test-nofold.ll
+++ b/test/CodeGen/X86/test-nofold.ll
@@ -1,6 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep {testl.*%e.x.*%e.x}
 ; rdar://5752025
-; XFAIL: *
 
 ; We don't want to fold the and into the test, because the and clobbers its
 ; input forcing a copy.  We want: