diff --git a/llvm/test/CodeGen/X86/dollar-name.ll b/llvm/test/CodeGen/X86/dollar-name.ll
index 9d9235e647f4..885700ef82a5 100644
--- a/llvm/test/CodeGen/X86/dollar-name.ll
+++ b/llvm/test/CodeGen/X86/dollar-name.ll
@@ -1,12 +1,12 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep {(\$bar)} | count 1
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep {(\$qux)} | count 1
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep {(\$hen)} | count 1
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i386-linux | grep {(\$bar)} | count 1
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i386-linux | grep {(\$qux)} | count 1
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i386-linux | grep {(\$hen)} | count 1
 ; PR1339
 
 @"$bar" = global i32 zeroinitializer
 @"$qux" = external global i32
 
-define i32 @"$foo"() {
+define i32 @"$foo"() nounwind {
   %m = load i32* @"$bar"
   %n = load i32* @"$qux"
   %t = add i32 %m, %n
diff --git a/llvm/test/FrontendC/2004-02-13-IllegalVararg.c b/llvm/test/FrontendC/2004-02-13-IllegalVararg.c
index 1f3eded0cdce..b6e5f2cb3829 100644
--- a/llvm/test/FrontendC/2004-02-13-IllegalVararg.c
+++ b/llvm/test/FrontendC/2004-02-13-IllegalVararg.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc %s -c -o - | llc
+// RUN: %llvmgcc -xc %s -w -c -o - | llc
 
 #include <stdarg.h>
 
diff --git a/llvm/test/FrontendC/2006-09-18-fwrite-cast-crash.c b/llvm/test/FrontendC/2006-09-18-fwrite-cast-crash.c
index 8ba20520714e..0e02907ddba3 100644
--- a/llvm/test/FrontendC/2006-09-18-fwrite-cast-crash.c
+++ b/llvm/test/FrontendC/2006-09-18-fwrite-cast-crash.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc %s -S -o -
+// RUN: %llvmgcc %s -S -o /dev/null
 // PR910
 
 struct l_struct_2E_FILE { char x; };
diff --git a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
index f61d8861049c..4f98a2003253 100644
--- a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
+++ b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
@@ -1,7 +1,6 @@
 ; RUN: llvm-as < %s > %t.out1.bc
 ; RUN: echo { %S = type \[8 x i32\] external global %S } | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep {\\{}
-
+; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep \\{
 %S = type { i32 }
 
 
diff --git a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index e366a655940d..feadc3e3ce4c 100644
--- a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
+++ b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | \
-; RUN:   grep alloca | grep {\\{}
+; RUN:   grep alloca | grep \\{
 
 declare i32 @.callback_1(i8*)