diff --git a/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp b/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
index 239d3f525b79..fc7beeb932ce 100644
--- a/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
+++ b/llvm/test/FrontendC++/2006-11-30-Pubnames.cpp
@@ -1,7 +1,7 @@
 // This is a regression test on debug info to make sure that we can access 
 // qualified global names.
 // RUN: %llvmgcc -S -O0 -g %s -o - | \
-// RUN:   llc --disable-fp-elim -o %t.s -O0
+// RUN:   llc -disable-cfi --disable-fp-elim -o %t.s -O0
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
 // RUN: %llvmdsymutil %t.exe 
diff --git a/llvm/test/FrontendC/2009-02-17-BitField-dbg.c b/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
index 80ccc4a0ea3a..88d2cbba48d8 100644
--- a/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
+++ b/llvm/test/FrontendC/2009-02-17-BitField-dbg.c
@@ -1,6 +1,6 @@
 // Check bitfields.
 // RUN: %llvmgcc -S -O0 -g %s -o - | \
-// RUN: llc --disable-fp-elim -o 2009-02-17-BitField-dbg.s
+// RUN: llc -disable-cfi --disable-fp-elim -o 2009-02-17-BitField-dbg.s
 // RUN: %compile_c 2009-02-17-BitField-dbg.s -o 2009-02-17-BitField-dbg.o
 // RUN: echo {ptype mystruct} > %t2
 // RUN: gdb -q -batch -n -x %t2 2009-02-17-BitField-dbg.o | \
diff --git a/llvm/test/FrontendC/2010-01-14-StaticVariable.c b/llvm/test/FrontendC/2010-01-14-StaticVariable.c
index 80dd4d45259d..0635900bbce8 100644
--- a/llvm/test/FrontendC/2010-01-14-StaticVariable.c
+++ b/llvm/test/FrontendC/2010-01-14-StaticVariable.c
@@ -1,7 +1,7 @@
 // This is a regression test on debug info to make sure that llvm emitted
 // debug info does not crash gdb.
 // RUN: %llvmgcc -S -O0 -g %s -o - | \
-// RUN:    llc --disable-fp-elim -o %t.s -O0 -relocation-model=pic
+// RUN:    llc -disable-cfi --disable-fp-elim -o %t.s -O0 -relocation-model=pic
 // RUN: %compile_c %t.s -o %t.o
 // RUN: echo {quit\n} > %t.in 
 // RUN: gdb -q -batch -n -x %t.in %t.o > /dev/null
diff --git a/llvm/test/FrontendC/2010-02-16-DbgVarScope.c b/llvm/test/FrontendC/2010-02-16-DbgVarScope.c
index 1d912d0f5e5b..24910adc056b 100644
--- a/llvm/test/FrontendC/2010-02-16-DbgVarScope.c
+++ b/llvm/test/FrontendC/2010-02-16-DbgVarScope.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgcc -S -O0 -g %s -o - | \
-// RUN:    llc --disable-fp-elim -o %t.s -O0 -relocation-model=pic
+// RUN:    llc -disable-cfi --disable-fp-elim -o %t.s -O0 -relocation-model=pic
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe
 // RUN: echo {break 24\nrun\np loc\n} > %t.in 
diff --git a/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m b/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
index 8ed7c24dc134..825bbd75358c 100644
--- a/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
+++ b/llvm/test/FrontendObjC/2009-08-17-DebugInfo.m
@@ -1,6 +1,6 @@
 // This is a regression test on debug info to make sure that we can set a
 // breakpoint on a objective message.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llc -o %t.s -O0
+// RUN: %llvmgcc -S -O0 -g %s -o - | llc -disable-cfi -o %t.s -O0
 // RUN: %compile_c %t.s -o %t.o
 // RUN: %link %t.o -o %t.exe -framework Foundation
 // RUN: echo {break randomFunc\n} > %t.in