diff --git a/llvm/test/Assembler/AutoUpgradeIntrinsics.ll b/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
index 15f638ce06fd..af4ec92e0991 100644
--- a/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
+++ b/llvm/test/Assembler/AutoUpgradeIntrinsics.ll
@@ -7,7 +7,7 @@
 ; RUN: llvm-as < %s | llvm-dis | \
 ; RUN:   not grep {llvm\\.bswap\\.i\[0-9\]*\\.i\[0-9\]*}
 ; RUN: llvm-as < %s | llvm-dis | \
-; RUN:   grep {llvm\\.x86\\.mmx\\.ps} | grep {2 x i32> | count 6
+; RUN:   grep {llvm\\.x86\\.mmx\\.ps} | grep {\\\<2 x i32\\\>} | count 6
 
 declare i32 @llvm.ctpop.i28(i28 %val)
 declare i32 @llvm.cttz.i29(i29 %val)
diff --git a/llvm/test/Feature/packed_struct.ll b/llvm/test/Feature/packed_struct.ll
index 5bf609b7772b..4d4ace9534d6 100644
--- a/llvm/test/Feature/packed_struct.ll
+++ b/llvm/test/Feature/packed_struct.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\<\{} %t2.ll
+; RUN: grep {\\}>} %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i32, i32, i32 }>
diff --git a/llvm/test/Integer/packed_struct_bt.ll b/llvm/test/Integer/packed_struct_bt.ll
index 3713917ac972..a4d01e7d84b5 100644
--- a/llvm/test/Integer/packed_struct_bt.ll
+++ b/llvm/test/Integer/packed_struct_bt.ll
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\<\{} %t2.ll
+; RUN: grep {\\}>} %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i35, i35, i35 }>
diff --git a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
index b3e64da35b34..f61d8861049c 100644
--- a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
+++ b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
@@ -1,6 +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/Linker/2004-12-03-DisagreeingType.ll b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
index 63d851b1673b..7378fdd35795 100644
--- a/llvm/test/Linker/2004-12-03-DisagreeingType.ll
+++ b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
@@ -1,7 +1,7 @@
 ; RUN: echo {@G = weak global \{\{\{\{double\}\}\}\} zeroinitializer } | \
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\}}
+; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\\}}
 
 ; When linked, the global above should be eliminated, being merged with the 
 ; global below.
diff --git a/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll b/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
index ef48cf8d2138..dbac15c3a521 100644
--- a/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
+++ b/llvm/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
@@ -1,7 +1,7 @@
 ; Scalar replacement was incorrectly promoting this alloca!!
 ;
 ; RUN: llvm-as < %s | opt -scalarrepl | llvm-dis | \
-; RUN:   sed {s/;.*//g} | grep \[
+; RUN:   sed {s/;.*//g} | grep {\\\[}
 
 define i8* @test() {
 	%A = alloca [30 x i8]		; <[30 x i8]*> [#uses=1]
diff --git a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index 47b70351e971..e366a655940d 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*)