diff --git a/test/C++Frontend/2006-11-06-StackTrace.cpp b/test/C++Frontend/2006-11-06-StackTrace.cpp
index 0c2c0afab95..55b34ad82d5 100644
--- a/test/C++Frontend/2006-11-06-StackTrace.cpp
+++ b/test/C++Frontend/2006-11-06-StackTrace.cpp
@@ -1,7 +1,7 @@
 // This is a regression test on debug info to make sure that we can get a
 // meaningful stack trace from a C++ program.
 // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o %t.s -f
-// RUN: as %t.s -o %t.o
+// RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
 // RUN: echo {break DeepStack::deepest\nrun 17\nwhere\n} > %t.in 
 // RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | \
diff --git a/test/C++Frontend/2006-11-30-NoCompileUnit.cpp b/test/C++Frontend/2006-11-30-NoCompileUnit.cpp
index 4203ab1ad1c..c1fa9aed894 100644
--- a/test/C++Frontend/2006-11-30-NoCompileUnit.cpp
+++ b/test/C++Frontend/2006-11-30-NoCompileUnit.cpp
@@ -2,8 +2,8 @@
 // unit size issue with gdb.
 // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
 // RUN:   llc --disable-fp-elim -o NoCompileUnit.s -f
-// RUN: as NoCompileUnit.s -o NoCompileUnit.o
-// RUN: g++ NoCompileUnit.o -o NoCompileUnit.exe
+// RUN: %compile_c NoCompileUnit.s -o NoCompileUnit.o
+// RUN: %compile_cxx NoCompileUnit.o -o NoCompileUnit.exe
 // RUN: echo {break main\nrun\np NoCompileUnit::pubname} > %t2
 // RUN: gdb -q -batch -n -x %t2 NoCompileUnit.exe | \
 // RUN:   tee NoCompileUnit.out | not grep {"low == high"}
diff --git a/test/C++Frontend/2006-11-30-Pubnames.cpp b/test/C++Frontend/2006-11-30-Pubnames.cpp
index 698f30bc052..c6165a6e354 100644
--- a/test/C++Frontend/2006-11-30-Pubnames.cpp
+++ b/test/C++Frontend/2006-11-30-Pubnames.cpp
@@ -2,7 +2,7 @@
 // qualified global names.
 // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
 // RUN:   llc --disable-fp-elim -o %t.s -f
-// RUN: as %t.s -o %t.o
+// RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
 // RUN: echo {break main\nrun\np Pubnames::pubname} > %t.in
 // RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | grep {\$1 = 10}