diff --git a/llvm/unittests/ADT/BitVectorTest.cpp b/llvm/unittests/ADT/BitVectorTest.cpp
index 534828192c0b..f04eb60179eb 100644
--- a/llvm/unittests/ADT/BitVectorTest.cpp
+++ b/llvm/unittests/ADT/BitVectorTest.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef XFAIL
 #include "llvm/ADT/BitVector.h"
 #include "gtest/gtest.h"
 
@@ -138,3 +139,4 @@ TEST(BitVectorTest, TrivialOperation) {
 }
 
 }
+#endif
diff --git a/llvm/unittests/ADT/Makefile b/llvm/unittests/ADT/Makefile
index c56b95170490..fe0832894d32 100644
--- a/llvm/unittests/ADT/Makefile
+++ b/llvm/unittests/ADT/Makefile
@@ -12,4 +12,12 @@ TESTNAME = ADT
 LINK_COMPONENTS := core support
 
 include $(LEVEL)/Makefile.config
+
+# Xfail BitVectorTest for now on PPC Darwin.  7598360.
+ifeq ($(ARCH),PowerPC)
+ifeq ($(TARGET_OS),Darwin)
+CPP.Flags += -DXFAIL
+endif
+endif
+
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest