diff --git a/test/Other/2007-06-16-Funcname.ll b/test/Other/2007-06-16-Funcname.ll
index a2cdd18d53e..75b96e6c373 100644
--- a/test/Other/2007-06-16-Funcname.ll
+++ b/test/Other/2007-06-16-Funcname.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm2cpp -funcname=WAKKA | not grep makeLLVMModule
+; RUN: llvm-as < %s | llc -march=cpp -cppfname=WAKKA | not grep makeLLVMModule
 ; PR1515
 
 define void @foo() {
diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp
index a0a023213f9..d8a65ffc4be 100644
--- a/test/lib/llvm2cpp.exp
+++ b/test/lib/llvm2cpp.exp
@@ -9,7 +9,7 @@ proc llvm2cpp-test { files } {
   global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot 
   set timeout 30
   set path [file join $objdir $subdir]
-  set llvm2cpp [file join $llvmtoolsdir llvm2cpp ]
+  set llc [file join $llvmtoolsdir llc ]
   set llvmas [file join $llvmtoolsdir llvm-as ]
   set llvmdis [file join $llvmtoolsdir llvm-dis ]
 
@@ -65,7 +65,7 @@ proc llvm2cpp-test { files } {
     }
 
     set retval [ catch { 
-      exec -keepnewline $llvm2cpp -f -o $generated < $bytecode 2>/dev/null } msg]
+      exec -keepnewline $llc -march=cpp -f -o $generated < $bytecode 2>/dev/null } msg]
 
     if { $retval != 0 } {
       fail "$test: llvm2cpp returned $retval\n$msg"