diff --git test/Analysis/domtest.c test/Analysis/domtest.c
index 0f370db..dd72117 100644
--- test/Analysis/domtest.c
+++ test/Analysis/domtest.c
@@ -1,5 +1,5 @@
 // RUN: rm -f %t
-// RUN: %clang -cc1 -analyze -analyzer-checker=debug.DumpDominators %s > %t 2>&1
+// RUN: %clang_cc1 -analyze -analyzer-checker=debug.DumpDominators %s > %t 2>&1
 // RUN: FileCheck --input-file=%t %s
 
 // Test the DominatorsTree implementation with various control flows
diff --git test/CodeGenCXX/debug-info-pubtypes.cpp test/CodeGenCXX/debug-info-pubtypes.cpp
index a7abade..612b6b5 100644
--- test/CodeGenCXX/debug-info-pubtypes.cpp
+++ test/CodeGenCXX/debug-info-pubtypes.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: x86-64-registered-target
-// RUN: %clang -cc1 -triple x86_64-apple-darwin10  -g -fno-limit-debug-info -S %s -o %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10  -g -fno-limit-debug-info -S %s -o %t
 // RUN: FileCheck %s < %t
 
 // FIXME: This testcase shouldn't rely on assembly emission.
diff --git test/CodeGenObjC/debug-info-pubtypes.m test/CodeGenObjC/debug-info-pubtypes.m
index 658430d..e68bbee 100644
--- test/CodeGenObjC/debug-info-pubtypes.m
+++ test/CodeGenObjC/debug-info-pubtypes.m
@@ -1,5 +1,5 @@
 // REQUIRES: x86-64-registered-target
-// RUN: %clang -cc1 -triple x86_64-apple-darwin10 -g -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -g -emit-llvm %s -o - | FileCheck %s
 
 // CHECK: !5 = metadata !{i32 {{.*}}, metadata !6, metadata !"H", metadata !6, i32 6, i64 0, i64 8, i32 0, i32 512, null, metadata !2, i32 16, i32 0} ; [ DW_TAG_structure_type ]
 
diff --git test/CodeGenObjC/debug-info-self.m test/CodeGenObjC/debug-info-self.m
index 48ad5ce..9f23435 100644
--- test/CodeGenObjC/debug-info-self.m
+++ test/CodeGenObjC/debug-info-self.m
@@ -1,4 +1,4 @@
-// RUN: %clang -cc1 -emit-llvm -g %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -g %s -o - | FileCheck %s
 // self and _cmd are marked as DW_AT_artificial. 
 // myarg is not marked as DW_AT_artificial.
 
diff --git test/Modules/import-decl.cpp test/Modules/import-decl.cpp
index 7696693..0f05f92 100644
--- test/Modules/import-decl.cpp
+++ test/Modules/import-decl.cpp
@@ -1,6 +1,6 @@
 // RUN: rm -rf %t
 // RUN: %clang -fmodule-cache-path %t -fmodules -x objective-c -I %S/Inputs -emit-ast -o %t.ast %s
-// RUN: %clang -cc1 -ast-print -x ast - < %t.ast | FileCheck %s
+// RUN: %clang_cc1 -ast-print -x ast - < %t.ast | FileCheck %s
 
 @__experimental_modules_import import_decl;
 // CHECK: struct T
diff --git test/PCH/objc_container.m test/PCH/objc_container.m
index 1e59054..26a848a 100644
--- test/PCH/objc_container.m
+++ test/PCH/objc_container.m
@@ -4,8 +4,8 @@
 // Test with pch.
 // RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_container.h
 // RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
-// RUN: %clang -cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
-// RUN: %clang -cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// RUN: %clang_cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
+// RUN: %clang_cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
 
 // CHECK-PRINT: id oldObject = array[10];
 // CHECK-PRINT: array[10] = oldObject;
diff --git test/PCH/objc_literals.m test/PCH/objc_literals.m
index cce3173..79f9b40 100644
--- test/PCH/objc_literals.m
+++ test/PCH/objc_literals.m
@@ -1,7 +1,7 @@
-// RUN: %clang -cc1 -emit-pch -o %t %s
-// RUN: %clang -cc1 -include-pch %t -verify %s
-// RUN: %clang -cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
-// RUN: %clang -cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// RUN: %clang_cc1 -emit-pch -o %t %s
+// RUN: %clang_cc1 -include-pch %t -verify %s
+// RUN: %clang_cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
+// RUN: %clang_cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
 
 #ifndef HEADER
 #define HEADER
diff --git test/PCH/objc_literals.mm test/PCH/objc_literals.mm
index 8ef3351..474eca5 100644
--- test/PCH/objc_literals.mm
+++ test/PCH/objc_literals.mm
@@ -1,7 +1,7 @@
-// RUN: %clang -cc1 -emit-pch -x objective-c++ -std=c++0x -o %t %s
-// RUN: %clang -cc1 -include-pch %t -x objective-c++ -std=c++0x  -verify %s
-// RUN: %clang -cc1 -include-pch %t -x objective-c++ -std=c++0x  -ast-print %s | FileCheck -check-prefix=PRINT %s
-// RUN: %clang -cc1 -include-pch %t -x objective-c++ -std=c++0x  -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// RUN: %clang_cc1 -emit-pch -x objective-c++ -std=c++0x -o %t %s
+// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x  -verify %s
+// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x  -ast-print %s | FileCheck -check-prefix=PRINT %s
+// RUN: %clang_cc1 -include-pch %t -x objective-c++ -std=c++0x  -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
 
 #ifndef HEADER
 #define HEADER
diff --git test/Parser/recovery.cpp test/Parser/recovery.cpp
index ff68758..2020deb 100644
--- test/Parser/recovery.cpp
+++ test/Parser/recovery.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang -cc1 -verify -std=c++11 %s
+// RUN: %clang_cc1 -verify -std=c++11 %s
 
 8gi///===--- recovery.cpp ---===// // expected-error {{unqualified-id}}
 namespace Std { // expected-note {{here}}
diff --git test/Preprocessor/user_defined_system_framework.c test/Preprocessor/user_defined_system_framework.c
index 8e3db56..74e7120 100644
--- test/Preprocessor/user_defined_system_framework.c
+++ test/Preprocessor/user_defined_system_framework.c
@@ -1,4 +1,4 @@
-// RUN: %clang -cc1 -fsyntax-only -F %S/Inputs -Wsign-conversion -verify %s
+// RUN: %clang_cc1 -fsyntax-only -F %S/Inputs -Wsign-conversion -verify %s
 
 // Check that TestFramework is treated as a system header.
 #include <TestFramework/TestFramework.h>