diff --git a/test/CodeGen/builtins-ffs_parity_popcount.c b/test/CodeGen/builtins-ffs_parity_popcount.c
deleted file mode 100644
index 74e104b..0000000
--- a/test/CodeGen/builtins-ffs_parity_popcount.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: clang-cc -emit-llvm -o - %s > %t
-// RUN: not grep "__builtin" %t
-
-#include <stdio.h>
-
-void test(int M, long long N) {
-  printf("%d %lld: %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
-         M, N,
-         __builtin_ffs(M), __builtin_ffsl(M), __builtin_ffsll(M),
-         __builtin_parity(M), __builtin_parityl(M), __builtin_parityll(M),
-         __builtin_popcount(M), __builtin_popcountl(M), __builtin_popcountll(M),
-         __builtin_ffs(N), __builtin_ffsl(N), __builtin_ffsll(N),
-         __builtin_parity(N), __builtin_parityl(N), __builtin_parityll(N),
-         __builtin_popcount(N), __builtin_popcountl(N), __builtin_popcountll(N));
-}
diff --git a/test/CodeGen/builtins-powi.c b/test/CodeGen/builtins-powi.c
deleted file mode 100644
index 945ec5d..0000000
--- a/test/CodeGen/builtins-powi.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// RUN: clang-cc -emit-llvm -o - %s > %t
-// RUN: not grep "__builtin" %t
-
-#include <stdio.h>
-#include <stdlib.h>
-
-void test(long double a, int b) {
-  printf("%Lf**%d: %08x %08x %016Lx\n", 
-         a, b,
-         __builtin_powi(a, b),
-         __builtin_powif(a, b),
-         __builtin_powil(a, b)
-         );
-}
-
-int main() {
-  int i;
-
-  test(-1,-1LL);
-  test(0,0);
-  test(1,1);
-
-  for (i=0; i<3; i++) {
-    test(random(), i);
-  }
-
-  return 0;
-}
diff --git a/test/Misc/diag-checker.c b/test/Misc/diag-checker.c
deleted file mode 100644
index 4733ee1..0000000
--- a/test/Misc/diag-checker.c
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-
-#include <stdio.h>
-
-void foo(FILE *FP) {}