diff --git a/clang/test/Analysis/outofbound.c b/clang/test/Analysis/outofbound.c
index 568f14329e9b8efc986466f5b5d0b1a299807b54..e676ea3b3889f2c3efc12fe76d8639ef8ccf8777 100644
--- a/clang/test/Analysis/outofbound.c
+++ b/clang/test/Analysis/outofbound.c
@@ -1,5 +1,5 @@
 // RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
-// XFAIL
+// XFAIL: *
 
 char f1() {
   char* s = "abcd";
diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
index b9b136c5061b4934a44d6ed42d0b81d618002e29..141a5732c1d3f381a8e06a3198b9a3e31912ed7d 100644
--- a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
+++ b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p14.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
+// XFAIL: *
 
 namespace N { 
   struct S {};
diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p15.cpp b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p15.cpp
index 9572aaa1427349a73b430a7c3f29cc1a52cff702..cebc3e99d09fa03d56d1ea81e8755d71bcd2f2c4 100644
--- a/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p15.cpp
+++ b/clang/test/CXX/basic/basic.lookup/basic.lookup.unqual/p15.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
+// XFAIL: *
 
 class C {
 public:
diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p3.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p3.cpp
index 3b0e345f01724611b427386c80411cf8a1fbe043..dabe13a0ff66022346adb4e2533a1f711751f24e 100644
--- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p3.cpp
+++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p3.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -verify %s
-// XFAIL
+// XFAIL: *
 
 void f0(void) {
   inline void f1(); // expected-error {{'inline' is not allowed on block scope function declaration}}
diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p4.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p4.cpp
index 0142dcbb055c5b24a03e3d8255afdbc19bd4b413..7dc65c77d4a92d8a8a8f14b936924b3db4733da9 100644
--- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p4.cpp
+++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p4.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -verify %s
-// XFAIL
+// XFAIL: *
 
 void f0() {
 }
diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p6.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p6.cpp
index c5f0a51b22e5a0e6b8e0cd170f9e2005dfebf4f7..7a1ba3e389babb5d8dd5cbdb83244c0e4e5acb60 100644
--- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p6.cpp
+++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.fct.spec/p6.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -verify %s
-// XFAIL
+// XFAIL: *
 
 class A {
 public:
diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p10.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p10.cpp
index 62ae7bfded14e23f233ee08dcc5dc332b88ce6e5..d1251490ac1a336f081bb01a2901af520cca0abf 100644
--- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p10.cpp
+++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.stc/p10.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -verify %s
-// XFAIL
+// XFAIL: *
 
 typedef const int T0;
 typedef int& T1;
diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.typedef/p4.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.typedef/p4.cpp
index f1413f9b41b822ad98813baa9a6087951ffff882..69e843796ff7eeee1126adcc7f26b385ae20745e 100644
--- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.typedef/p4.cpp
+++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.typedef/p4.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -verify %s
-// XFAIL
+// XFAIL: *
 
 struct S {
   typedef struct A {} A; // expected-note {{previous definition is here}}
diff --git a/clang/test/CXX/temp/temp.param/p14.cpp b/clang/test/CXX/temp/temp.param/p14.cpp
index 07e6bfe40983ebaee68b5b9e2e38897b01a4ad42..150e0ad636be061ba175a305b9b53a82ef7a7c94 100644
--- a/clang/test/CXX/temp/temp.param/p14.cpp
+++ b/clang/test/CXX/temp/temp.param/p14.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s 
-// XFAIL
+// XFAIL: *
 
 // A template-parameter shall not be used in its own default argument.
 template<typename T = typename T::type> struct X; // expected-error{{default}}
diff --git a/clang/test/CXX/temp/temp.res/temp.dep.res/temp.point/p1.cpp b/clang/test/CXX/temp/temp.res/temp.dep.res/temp.point/p1.cpp
index 650501069cc51c02613f0ae6f44268cf9b540518..a41b46ff5c9b54b10352b4fde630a9078a36d87b 100644
--- a/clang/test/CXX/temp/temp.res/temp.dep.res/temp.point/p1.cpp
+++ b/clang/test/CXX/temp/temp.res/temp.dep.res/temp.point/p1.cpp
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
+// XFAIL: *
 
 // Note: we fail this test because we perform template instantiation
 // at the end of the translation unit, so argument-dependent lookup
diff --git a/clang/test/CodeGen/asm-inout.c b/clang/test/CodeGen/asm-inout.c
index 0d8dbdfb9d381afe0a0eec9d6e8b30cba9235de4..bd287ad0ee69d0b2f97774eb31606a2288529f09 100644
--- a/clang/test/CodeGen/asm-inout.c
+++ b/clang/test/CodeGen/asm-inout.c
@@ -1,6 +1,6 @@
 // RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t &&
 // RUN: grep "load i8\*\*\* %p.addr"  %t | count 1
-// XFAIL
+// XFAIL: *
 
 // PR3800
 void f(void **p)
diff --git a/clang/test/CodeGen/blocks-2.c b/clang/test/CodeGen/blocks-2.c
index bc6c2b916abd062dfd84e46f1a19aac820062858..acbaafd95605c5f8723dcefc47dfe2b555b8be4e 100644
--- a/clang/test/CodeGen/blocks-2.c
+++ b/clang/test/CodeGen/blocks-2.c
@@ -1,7 +1,7 @@
 // RUN: clang-cc -g %s -emit-llvm -o %t -fblocks &&
 // RUN: grep "func.start" %t | count 4
 // 1 declaration, 1 bar, 1 test_block_dbg and 1 for the block.
-// XFAIL
+// XFAIL: *
 
 static __inline__ __attribute__((always_inline)) int bar(int va, int vb) { return (va == vb); }
 
diff --git a/clang/test/CodeGenObjC/PR4894-recursive-debug-crash.m b/clang/test/CodeGenObjC/PR4894-recursive-debug-crash.m
index c5f901c2680e1f06f1e5d604d5043ac59afe9f9a..d7379111c11a2a95d1adf78d54fef66e98139ff5 100644
--- a/clang/test/CodeGenObjC/PR4894-recursive-debug-crash.m
+++ b/clang/test/CodeGenObjC/PR4894-recursive-debug-crash.m
@@ -3,7 +3,7 @@
 //
 // This test is actually just making sure we can generate the debug info for the
 // return type from im0 without crashing.
-// XFAIL
+// XFAIL: *
 
 @interface I0 {
   I0 *_iv0;
diff --git a/clang/test/SemaObjC/id-isa-ref.m b/clang/test/SemaObjC/id-isa-ref.m
index dc42f9a539650ff453a9320068505ea83314ea6d..fa3293ce79b57fdd3a0893abbf8bc9912220e242 100644
--- a/clang/test/SemaObjC/id-isa-ref.m
+++ b/clang/test/SemaObjC/id-isa-ref.m
@@ -1,7 +1,7 @@
 // RUN: clang-cc -fsyntax-only -verify %s
 
 // Failing currently due to Obj-C type representation changes. 2009-09-17
-// XFAIL
+// XFAIL: *
 
 typedef struct objc_object {
   struct objc_class *isa;
diff --git a/clang/test/SemaObjCXX/overload.mm b/clang/test/SemaObjCXX/overload.mm
index 47141002864c17effd46a02925491abcb74ced28..56dc5108eb957c9d78fb8623ff7912ebafa9446b 100644
--- a/clang/test/SemaObjCXX/overload.mm
+++ b/clang/test/SemaObjCXX/overload.mm
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
+// XFAIL: *
 @interface Foo
 @end
 
diff --git a/clang/test/SemaObjCXX/references.mm b/clang/test/SemaObjCXX/references.mm
index 82797cef77c77671f966893306f86f24e6c96f0f..e02f360f7876043434e43625da14af760a6c1c34 100644
--- a/clang/test/SemaObjCXX/references.mm
+++ b/clang/test/SemaObjCXX/references.mm
@@ -1,7 +1,7 @@
 // FIXME: This crashes, disable it until fixed.
 // RN: clang-cc -verify -emit-llvm -o - %s
 // RUN: false
-// XFAIL
+// XFAIL: *
 
 // Test reference binding.
 
diff --git a/clang/test/SemaTemplate/instantiate-function-1.mm b/clang/test/SemaTemplate/instantiate-function-1.mm
index be995e7ff615134b635b3f4b60e878e0a73417d9..c119ab5da8b98624e26fc98690d5eca9e5362114 100644
--- a/clang/test/SemaTemplate/instantiate-function-1.mm
+++ b/clang/test/SemaTemplate/instantiate-function-1.mm
@@ -1,5 +1,5 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
+// XFAIL: *
 
 template<typename T> struct Member0 {
   void f(T t) {