diff --git a/test/Analysis/basicstore_wine_crash.c b/test/Analysis/basicstore_wine_crash.c
deleted file mode 100644
index cb5fac8d2919..000000000000
--- a/test/Analysis/basicstore_wine_crash.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: clang-cc -checker-cfref -analyze -analyzer-store=basic %s
-
-// Once xfail_regionstore_wine_crash.c passes, move this test case
-// into misc-ps.m.
-
-void foo() {
-  long x = 0;
-  char *y = (char *) &x;
-  if (!*y)
-    return;
-}
diff --git a/test/Analysis/no-outofbounds-basicstore.c b/test/Analysis/no-outofbounds-basicstore.c
deleted file mode 100644
index 9a0b35906d7c..000000000000
--- a/test/Analysis/no-outofbounds-basicstore.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: clang-cc -checker-cfref -analyze -analyzer-store=basic -verify %s
-
-void f() {
-  long x = 0;
-  char *y = (char*) &x;
-  char c = y[0] + y[1] + y[2]; // no-warning
-}
diff --git a/test/Analysis/rdar-6539791.c b/test/Analysis/rdar-6539791.c
deleted file mode 100644
index c1c989154337..000000000000
--- a/test/Analysis/rdar-6539791.c
+++ /dev/null
@@ -1,47 +0,0 @@
-// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
-
-typedef const struct __CFAllocator * CFAllocatorRef;
-typedef struct __CFDictionary * CFMutableDictionaryRef;
-typedef signed long CFIndex;
-typedef CFIndex CFNumberType;
-typedef const void * CFTypeRef;
-typedef struct {} CFDictionaryKeyCallBacks, CFDictionaryValueCallBacks;
-typedef const struct __CFNumber * CFNumberRef;
-extern const CFAllocatorRef kCFAllocatorDefault;
-extern const CFDictionaryKeyCallBacks kCFTypeDictionaryKeyCallBacks;
-extern const CFDictionaryValueCallBacks kCFTypeDictionaryValueCallBacks;
-enum { kCFNumberSInt32Type = 3 };
-CFMutableDictionaryRef CFDictionaryCreateMutable(CFAllocatorRef allocator, CFIndex capacity, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks);
-void CFDictionaryAddValue(CFMutableDictionaryRef theDict, const void *key, const void *value);
-void CFRelease(CFTypeRef cf);
-CFTypeRef CFRetain(CFTypeRef cf);
-extern CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType theType, const void *valuePtr);
-typedef const struct __CFArray * CFArrayRef;
-typedef struct __CFArray * CFMutableArrayRef;
-void CFArrayAppendValue(CFMutableArrayRef theArray, const void *value);
-
-void f(CFMutableDictionaryRef y, void* key, void* val_key) {
-  CFMutableDictionaryRef x = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-  CFDictionaryAddValue(y, key, x);
-  CFRelease(x); // the dictionary keeps a reference, so the object isn't deallocated yet
-  signed z = 1;
-  CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &z);
-  if (value) {
-    CFDictionaryAddValue(x, val_key, value); // no-warning
-    CFRelease(value);
-    CFDictionaryAddValue(y, val_key, value); // no-warning
-  }
-}
-
-// <rdar://problem/6560661>
-// Same issue, except with "AppendValue" functions.
-void f2(CFMutableArrayRef x) {
-  signed z = 1;
-  CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &z);
-  // CFArrayAppendValue keeps a reference to value.
-  CFArrayAppendValue(x, value);
-  CFRelease(value);
-  CFRetain(value);
-  CFRelease(value); // no-warning
-}
diff --git a/test/Analysis/xfail-no-outofbounds.c b/test/Analysis/xfail-no-outofbounds.c
deleted file mode 100644
index f2ee732c2570..000000000000
--- a/test/Analysis/xfail-no-outofbounds.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: clang-cc -checker-cfref -analyze -analyzer-store=region -verify %s 
-
-void f() {
-  long x = 0;
-  char *y = (char*) &x;
-  char c = y[0] + y[1] + y[2]; // no-warning
-}
diff --git a/test/Analysis/xfail_regionstore_wine_crash.c b/test/Analysis/xfail_regionstore_wine_crash.c
deleted file mode 100644
index af20ca2e28c2..000000000000
--- a/test/Analysis/xfail_regionstore_wine_crash.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
-
-// When this test passes we should put it in the misc-ps.m test file.
-// This test fails now because RegionStoreManager::Retrieve() does correctly 
-// retrieve the first byte of 'x' when retrieving '*y'.
-void foo() {
-  long x = 0;
-  char *y = (char *) &x;
-  if (!*y)
-    return;
-}
diff --git a/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p2.cpp b/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p2.cpp
deleted file mode 100644
index fa3101c6736c..000000000000
--- a/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.spec.auto/p2.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
-void f() {
-  auto a = a; // expected-error{{variable 'a' declared with 'auto' type cannot appear in its own initializer}}
-}
-
-struct S { auto a; }; // expected-error{{'auto' not allowed in struct member}}
-
-void f(auto a) // expected-error{{'auto' not allowed in function prototype}}
-{
-  try { } catch (auto a) {  } // expected-error{{'auto' not allowed in exception declaration}}
-}
-
-template <auto a = 10> class C { }; // expected-error{{'auto' not allowed in template parameter}}
diff --git a/test/CodeGen/2009-06-16-inc_test.c b/test/CodeGen/2009-06-16-inc_test.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/CodeGen/2009-06-16-test.c b/test/CodeGen/2009-06-16-test.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/test/CodeGen/PR3869-indirect-goto-long.c b/test/CodeGen/PR3869-indirect-goto-long.c
deleted file mode 100644
index 140e4ec14a86..000000000000
--- a/test/CodeGen/PR3869-indirect-goto-long.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: clang-cc -emit-llvm-bc -o - %s
-// PR3869
-int a(long long b) { goto *b; }
-
diff --git a/test/CodeGen/mmintrin-test.c b/test/CodeGen/mmintrin-test.c
deleted file mode 100644
index 2a9ab5672330..000000000000
--- a/test/CodeGen/mmintrin-test.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -mcpu=pentium4 -emit-llvm -o %t %s && 
-// RUN: grep define %t | count 1 &&
-// RUN: clang-cc -triple i386-apple-darwin9 -mcpu=pentium4 -g -emit-llvm -o %t %s && 
-// RUN: grep define %t | count 1
-
-#include <mmintrin.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[]) {
-  int array[16] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 };
-  __m64 *p = (__m64 *)array;
-  
-  __m64 accum = _mm_setzero_si64();
-  
-  for (int i=0; i<8; ++i)
-    accum = _mm_add_pi32(p[i], accum);
-  
-  __m64 accum2 = _mm_unpackhi_pi32(accum, accum);
-  accum = _mm_add_pi32(accum, accum2);
-  
-  int result = _mm_cvtsi64_si32(accum);
-  _mm_empty();
-  printf("%d\n", result );
-  
-  return 0;
-}
diff --git a/test/CodeGenObjC/debug-info.m b/test/CodeGenObjC/debug-info.m
deleted file mode 100644
index 9c461ba68fb4..000000000000
--- a/test/CodeGenObjC/debug-info.m
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -g -emit-llvm -o %t %s &&
-// RUN: grep '@.str3 = internal constant \[8 x i8\] c"-\[A m0\]\\00"' %t &&
-// RUN: grep '@.str4 = internal constant \[9 x i8\] c"\\01-\[A m0\]\\00"' %t &&
-// RUN: grep '@llvm.dbg.subprogram = .* @.str3, .* @.str3, .* @.str4,' %t &&
-// RUN: grep '@llvm.dbg.composite.* = .* i32 15, i64 0, i64 8, .* i32 16' %t &&
-// RUN: true
-
-
-
-
-
-
-
-
-@interface A @end
-@implementation A // Line 15
--(void) m0 {}
-@end
diff --git a/test/CodeGenObjC/objc2-strong-cast-2.m b/test/CodeGenObjC/objc2-strong-cast-2.m
deleted file mode 100644
index b617c9fee4ea..000000000000
--- a/test/CodeGenObjC/objc2-strong-cast-2.m
+++ /dev/null
@@ -1,27 +0,0 @@
-// RUN: clang-cc -triple x86_64-darwin-10 -fobjc-gc -emit-llvm -o %t %s &&
-// RUN: grep objc_assign_strongCast %t | count 4 &&
-// RUN: true
-
-@interface A
-@end
-
-typedef struct s0 {
-  A *a[4];
-} T;
-
-T g0;
-
-void f0(id x) {
-  g0.a[0] = x;
-}
-
-void f1(id x) {
-  ((T*) &g0)->a[0] = x;
-}
-
-void f2(unsigned idx)
-{
-   id *keys;
-   keys[idx] = 0;
-}
-
diff --git a/test/CodeGenObjC/predefined-expr-in-method.m b/test/CodeGenObjC/predefined-expr-in-method.m
deleted file mode 100644
index 812ef97252dc..000000000000
--- a/test/CodeGenObjC/predefined-expr-in-method.m
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
-
-@interface A
-@end
-@implementation A
-+(void) foo {
-  printf("__func__: %s\n", __func__);
-  printf("__FUNCTION__: %s\n", __FUNCTION__);
-  printf("__PRETTY_FUNCTION__: %s\n", __PRETTY_FUNCTION__);
-  return 0;
-}
-@end
-
-int main() {
-  [A foo];
-  return 0;
-}
diff --git a/test/Sema/attr-warn_unused_result.c b/test/Sema/attr-warn_unused_result.c
deleted file mode 100644
index b4ef1bbeaf0e..000000000000
--- a/test/Sema/attr-warn_unused_result.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: clang-cc %s -fsyntax-only -verify
-// rdar://6587766
-
-int fn1() __attribute__ ((warn_unused_result));
-int fn2() __attribute__ ((pure));
-int fn3() __attribute__ ((const));
-
-int foo() {
-  if (fn1() < 0 || fn2(2,1) < 0 || fn3(2) < 0)  // no warnings
-    return -1;
-  
-  fn1();  // expected-warning {{expression result unused}}
-  fn2(92, 21);  // expected-warning {{expression result unused}}
-  fn3(42);  // expected-warning {{expression result unused}}
-  return 0;
-}
-
-int bar __attribute__ ((warn_unused_result)); // expected-warning {{warning: 'warn_unused_result' attribute only applies to function types}}
-
diff --git a/test/Sema/block-explicit-return-type.c b/test/Sema/block-explicit-return-type.c
deleted file mode 100644
index c7b26b3d6bf6..000000000000
--- a/test/Sema/block-explicit-return-type.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// RUN: clang-cc -ObjC -fsyntax-only %s -verify -fblocks
-// FIXME: should compile
-// Test for blocks with explicit return type specified.
-
-typedef float * PF;
-float gf;
-
-@interface NSView
-  - (id) some_method_that_returns_id;
-@end
-
-NSView *some_object;
-
-void some_func (NSView * (^) (id));
-
-typedef struct dispatch_item_s *dispatch_item_t;
-typedef void (^completion_block_t)(void);
-
-typedef double (^myblock)(int);
-double test(myblock I);
-
-int main()
-{
-	 __block int x = 1;
- 	__block int y = 2;
-
-	(void)^void *{ return 0; };
-
-	(void)^float(float y){ return y; };
-
-	(void)^double (float y, double d)
-           {
-	      if (y)
-	       return d;
-	      else
-	       return y;
-	   };
-
-	const char * (^chb) (int flag, const char *arg, char *arg1) = ^ const char * (int flag, const char *arg, char *arg1) {
-	  if (flag)
-	    return 0;
-	  if (flag == 1)
-	    return arg;
-          else if (flag == 2)
-	    return "";
-	  return arg1; 
-	};
-
-	(void)^PF { return &gf; };
-
-	some_func(^ NSView * (id whatever) { return [some_object some_method_that_returns_id]; });
-
-	double res = test(^(int z){x = y+z; return (double)z; });	
-}
-
-void func()
-{
-  completion_block_t X;
-
-  completion_block_t (^blockx)(dispatch_item_t) = ^completion_block_t (dispatch_item_t item) {
-    return X;
-  };
-
-  completion_block_t (^blocky)(dispatch_item_t) = ^(dispatch_item_t item) {
-    return X;
-  };
-
-  blockx = blocky;
-
-}
-
-
-// intent: block taking int returning block that takes char,int and returns int
-int (^(^block)(double x))(char, short);
-
-void foo() {
-   int one = 1;
-   block = ^(double x){ return ^(char c, short y) { return one + c + y; };};  // expected-error {{returning block that lives on the local stack}}
-   // or:
-   block = ^(double x){ return ^(char c, short y) { return one + (int)c + y; };};  // expected-error {{returning block that lives on the local stack}}
-}
diff --git a/test/Sema/carbon-pth.c b/test/Sema/carbon-pth.c
deleted file mode 100644
index c956d2a7a1c8..000000000000
--- a/test/Sema/carbon-pth.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: clang-cc -mcpu=pentium4 -emit-pth -o %t %s && 
-// RUN: clang-cc -mcpu=pentium4 -token-cache %t %s &&
-// RUN: clang-cc -mcpu=pentium4 -token-cache %t %s -E %s -o /dev/null
-#ifdef __APPLE__
-#include <Carbon/Carbon.h>
-#endif
-
diff --git a/test/Sema/nonnull.c b/test/Sema/nonnull.c
deleted file mode 100644
index 3bed2feb5012..000000000000
--- a/test/Sema/nonnull.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// RUN: clang-cc -fblocks -fsyntax-only -verify %s
-
-int f1(int x) __attribute__((nonnull)); // expected-warning{{'nonnull' attribute applied to function with no pointer arguments}}
-int f2(int *x) __attribute__ ((nonnull (1)));
-int f3(int *x) __attribute__ ((nonnull (0))); // expected-error {{'nonnull' attribute parameter 1 is out of bounds}}
-int f4(int *x, int *y) __attribute__ ((nonnull (1,2)));
-int f5(int *x, int *y) __attribute__ ((nonnull (2,1)));
-
-extern void func1 (void (^block1)(), void (^block2)(), int) __attribute__((nonnull));
-
-extern void func3 (void (^block1)(), int, void (^block2)(), int)
-__attribute__((nonnull(1,3)));
-
-extern void func4 (void (^block1)(), void (^block2)()) __attribute__((nonnull(1)))
-__attribute__((nonnull(2)));
-
-void
-foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)())
-{
-  func1(cp1, cp2, i1);
-  
-  func1(0, cp2, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func1(cp1, 0, i1);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func1(cp1, cp2, 0);
-  
-  
-  func3(0, i2, cp3, i3); // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func3(cp3, i2, 0, i3);  // expected-warning {{null passed to a callee which requires a non-null argument}}
-  
-  func4(0, cp1); // expected-warning {{null passed to a callee which requires a non-null argument}}
-  func4(cp1, 0); // expected-warning {{null passed to a callee which requires a non-null argument}}
-}
diff --git a/test/SemaCXX/basic_lookup_argdep.cpp b/test/SemaCXX/basic_lookup_argdep.cpp
deleted file mode 100644
index 677df8284a72..000000000000
--- a/test/SemaCXX/basic_lookup_argdep.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-
-namespace N {
-  struct X { };
-  
-  X operator+(X, X);
-
-  void f(X);
-  void g(X); // expected-note{{candidate function}}
-
-  void test_multiadd(X x) {
-    (void)(x + x);
-  }
-}
-
-namespace M {
-  struct Y : N::X { };
-}
-
-void f();
-
-void test_operator_adl(N::X x, M::Y y) {
-  (void)(x + x);
-  (void)(y + y);
-}
-
-void test_func_adl(N::X x, M::Y y) {
-  f(x);
-  f(y);
-  (f)(x); // expected-error{{too many arguments to function call}}
-  ::f(x); // expected-error{{too many arguments to function call}}
-}
-
-namespace N {
-  void test_multiadd2(X x) {
-    (void)(x + x);
-  }
-}
-
-
-void test_func_adl_only(N::X x) {
-  g(x);
-}
-
-namespace M {
-  int g(N::X); // expected-note{{candidate function}}
-
-  void test(N::X x) {
-    g(x); // expected-error{{call to 'g' is ambiguous; candidates are:}}
-    int i = (g)(x);
-
-    int g(N::X);
-    g(x); // okay; calls locally-declared function, no ADL
-  }
-}
-
-
-void test_operator_name_adl(N::X x) {
-  (void)operator+(x, x);
-}
-
-struct Z { };
-int& f(Z);
-
-namespace O {
-  char &f();
-  void test_global_scope_adl(Z z) {
-    {
-      int& ir = f(z);
-    }
-  }
-}
-
diff --git a/test/SemaCXX/carbon.cpp b/test/SemaCXX/carbon.cpp
deleted file mode 100644
index 0e7570f33529..000000000000
--- a/test/SemaCXX/carbon.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: clang-cc -mcpu=pentium4 %s -fsyntax-only -print-stats
-#ifdef __APPLE__
-#include <Carbon/Carbon.h>
-#endif
-
diff --git a/test/SemaCXX/template-specialization.cpp b/test/SemaCXX/template-specialization.cpp
deleted file mode 100644
index e23a192d8034..000000000000
--- a/test/SemaCXX/template-specialization.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-// XFAIL
-template<int N> void f(int (&array)[N]);
-
-template<> void f<1>(int (&array)[1]) { }
diff --git a/test/SemaObjC/cocoa-pth.m b/test/SemaObjC/cocoa-pth.m
deleted file mode 100644
index dc806dfb7c09..000000000000
--- a/test/SemaObjC/cocoa-pth.m
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: clang-cc -mcpu=pentium4 -emit-pth -o %t %s && 
-// RUN: clang-cc -mcpu=pentium4 -token-cache %t %s &&
-// RUN: clang-cc -mcpu=pentium4 -token-cache %t %s -E %s -o /dev/null
-#ifdef __APPLE__
-#include <Cocoa/Cocoa.h>
-#endif
-
diff --git a/test/SemaObjC/warn-unused-parameters.m b/test/SemaObjC/warn-unused-parameters.m
deleted file mode 100644
index 618dc3ff596e..000000000000
--- a/test/SemaObjC/warn-unused-parameters.m
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: clang -fsyntax-only -Wunused -Xclang -verify %s
-
-@interface foo
-- (int)meth: (int)x: (int)y: (int)z ;
-@end
-
-@implementation foo
-- (int) meth: (int)x: 
-              (int)y: // expected-warning{{unused}} 
-              (int) __attribute__((unused))z { return x; }
-@end
diff --git a/test/SemaObjCXX/cocoa.mm b/test/SemaObjCXX/cocoa.mm
deleted file mode 100644
index c061d4e09684..000000000000
--- a/test/SemaObjCXX/cocoa.mm
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: clang-cc -mcpu=pentium4 %s -print-stats
-#ifdef __APPLE__
-#include <Cocoa/Cocoa.h>
-#endif