diff --git a/llvm/test/Linker/2003-01-30-LinkerRename.ll b/llvm/test/Linker/2003-01-30-LinkerRename.ll
index e7431ec15886..cbf754133411 100644
--- a/llvm/test/Linker/2003-01-30-LinkerRename.ll
+++ b/llvm/test/Linker/2003-01-30-LinkerRename.ll
@@ -3,7 +3,8 @@
 
 ; RUN: echo "define internal i32 @foo() { ret i32 7 } " | llvm-as > %t.1.bc
 ; RUN: llvm-as %s -o %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "@foo()" | grep -v internal
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: internal{{.*}}@foo{{[0-9]}}()
 
 define i32 @foo() { ret i32 0 }
 
diff --git a/llvm/test/Linker/2003-01-30-LinkerTypeRename.ll b/llvm/test/Linker/2003-01-30-LinkerTypeRename.ll
index 94fb5e0826c5..d61eb6d7abb3 100644
--- a/llvm/test/Linker/2003-01-30-LinkerTypeRename.ll
+++ b/llvm/test/Linker/2003-01-30-LinkerTypeRename.ll
@@ -3,8 +3,9 @@
 
 ; RUN: echo "%%Ty = type opaque @GV = external global %%Ty*" | llvm-as > %t.1.bc
 ; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "%%Ty " | not grep opaque
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: = global %Ty
 
 %Ty = type {i32}
 
-@GV = global %Ty* null
\ No newline at end of file
+@GV = global %Ty* null
diff --git a/llvm/test/Linker/2003-04-23-LinkOnceLost.ll b/llvm/test/Linker/2003-04-23-LinkOnceLost.ll
index 98a943a5344b..e4528906e024 100644
--- a/llvm/test/Linker/2003-04-23-LinkOnceLost.ll
+++ b/llvm/test/Linker/2003-04-23-LinkOnceLost.ll
@@ -4,7 +4,8 @@
 ; RUN: echo " define linkonce void @foo() { ret void } " | \
 ; RUN:   llvm-as -o %t.2.bc
 ; RUN: llvm-as %s -o %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep foo | grep linkonce
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: linkonce{{.*}}foo
 
 declare void @foo()
 
diff --git a/llvm/test/Linker/2003-05-31-LinkerRename.ll b/llvm/test/Linker/2003-05-31-LinkerRename.ll
index dff861dc4bb1..2e734beba6d9 100644
--- a/llvm/test/Linker/2003-05-31-LinkerRename.ll
+++ b/llvm/test/Linker/2003-05-31-LinkerRename.ll
@@ -6,7 +6,8 @@
 
 ; RUN: echo " define internal i32 @foo() { ret i32 7 } " | llvm-as > %t.1.bc
 ; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep internal | not grep "@foo("
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: internal {{.*}} @foo{{[0-9]}}(
 
 declare i32 @foo() 
 
diff --git a/llvm/test/Linker/2003-08-23-GlobalVarLinking.ll b/llvm/test/Linker/2003-08-23-GlobalVarLinking.ll
index e934836a6135..122bc41f554e 100644
--- a/llvm/test/Linker/2003-08-23-GlobalVarLinking.ll
+++ b/llvm/test/Linker/2003-08-23-GlobalVarLinking.ll
@@ -1,7 +1,8 @@
 ; RUN: llvm-as < %s > %t.out1.bc
 ; RUN: echo "%%T1 = type opaque %%T2 = type opaque @S = external global { i32, %%T1* } declare void @F(%%T2*)"\
 ; RUN:   | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep opaque
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | FileCheck %s
+; CHECK-NOT: opaque
 
 ; After linking this testcase, there should be no opaque types left.  The two
 ; S's should cause the opaque type to be resolved to 'int'.
diff --git a/llvm/test/Linker/2003-08-24-InheritPtrSize.ll b/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
index 51d544b83f90..dbaf9bc111b7 100644
--- a/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
+++ b/llvm/test/Linker/2003-08-24-InheritPtrSize.ll
@@ -3,7 +3,8 @@
 
 ; RUN: llvm-as < %s > %t.out1.bc
 ; RUN: echo "" | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc 2>&1 | not grep warning
+; RUN: llvm-link %t.out1.bc %t.out2.bc 2>&1 | FileCheck %s 
+; CHECK-NOT: warning
 
 target datalayout = "e-p:64:64"
 
diff --git a/llvm/test/Linker/2004-12-03-DisagreeingType.ll b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
index 73d7a4055046..63e15299252d 100644
--- a/llvm/test/Linker/2004-12-03-DisagreeingType.ll
+++ b/llvm/test/Linker/2004-12-03-DisagreeingType.ll
@@ -1,7 +1,8 @@
 ; 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 -S | not grep "}"
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | FileCheck %s
+; CHECK-NOT: }
 
 ; When linked, the global above should be eliminated, being merged with the 
 ; global below.
diff --git a/llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll b/llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll
index 30bfafeb13b5..7d2e81314651 100644
--- a/llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll
+++ b/llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll
@@ -3,6 +3,7 @@
 
 ; RUN: echo "@X = external constant i32" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "global i32 7"
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: global i32 7
 
 @X = global i32 7
diff --git a/llvm/test/Linker/2005-02-12-ConstantGlobals.ll b/llvm/test/Linker/2005-02-12-ConstantGlobals.ll
index 93709cf50bed..db990604d9a8 100644
--- a/llvm/test/Linker/2005-02-12-ConstantGlobals.ll
+++ b/llvm/test/Linker/2005-02-12-ConstantGlobals.ll
@@ -3,6 +3,7 @@
 
 ; RUN: echo "@X = global i32 7" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "global i32 7"
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: global i32 7
 
 @X = external constant i32		; <i32*> [#uses=0]
diff --git a/llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll b/llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
index d7a34c841e63..b99b3a823755 100644
--- a/llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
+++ b/llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
@@ -1,7 +1,8 @@
 ; RUN: echo " @G = appending global [0 x i32] zeroinitializer " | \
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc -S | grep "@G ="
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | FileCheck %s
+; CHECK: @G =
 
 ; When linked, the globals should be merged, and the result should still 
 ; be named '@G'.
diff --git a/llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll b/llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll
index eec8f637be0d..c9f9b0e2ab43 100644
--- a/llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll
+++ b/llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll
@@ -2,6 +2,7 @@
 
 ; RUN: echo "@X = global i32 7, align 8" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "align 8"
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: align 8
 
 @X = weak global i32 7, align 4
diff --git a/llvm/test/Linker/2008-03-07-DroppedSection_a.ll b/llvm/test/Linker/2008-03-07-DroppedSection_a.ll
index ec9d5c26ed3d..58baad95e498 100644
--- a/llvm/test/Linker/2008-03-07-DroppedSection_a.ll
+++ b/llvm/test/Linker/2008-03-07-DroppedSection_a.ll
@@ -1,7 +1,8 @@
 ; RUN: llvm-as < %s > %t.bc
 ; RUN: llvm-as < %p/2008-03-07-DroppedSection_b.ll > %t2.bc
 ; RUN: llvm-link %t.bc %t2.bc -o %t3.bc
-; RUN: llvm-dis < %t3.bc | grep ".data.init_task"
+; RUN: llvm-dis < %t3.bc | FileCheck %s
+; CHECK: .data.init_task
 
 ; ModuleID = 't.bc'
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
diff --git a/llvm/test/Linker/2008-03-07-DroppedSection_b.ll b/llvm/test/Linker/2008-03-07-DroppedSection_b.ll
index 63b64f6aa1aa..9bcb80d796d1 100644
--- a/llvm/test/Linker/2008-03-07-DroppedSection_b.ll
+++ b/llvm/test/Linker/2008-03-07-DroppedSection_b.ll
@@ -1,7 +1,8 @@
 ; RUN: llvm-as < %s > %t.bc
 ; RUN: llvm-as < %p/2008-03-07-DroppedSection_a.ll > %t2.bc
 ; RUN: llvm-link %t.bc %t2.bc -o %t3.bc
-; RUN: llvm-dis < %t3.bc | grep ".data.init_task"
+; RUN: llvm-dis < %t3.bc | FileCheck %s
+; CHECK: .data.init_task
 
 ; ModuleID = 'u.bc'
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
diff --git a/llvm/test/Linker/2008-06-26-AddressSpace.ll b/llvm/test/Linker/2008-06-26-AddressSpace.ll
index e1d35741e7f1..d4310bc816e2 100644
--- a/llvm/test/Linker/2008-06-26-AddressSpace.ll
+++ b/llvm/test/Linker/2008-06-26-AddressSpace.ll
@@ -2,8 +2,9 @@
 ; in different modules.
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: echo | llvm-as -o %t.foo2.bc
-; RUN: llvm-link %t.foo2.bc %t.foo1.bc -S | grep "addrspace(2)"
-; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S | grep "addrspace(2)"
+; RUN: llvm-link %t.foo2.bc %t.foo1.bc -S | FileCheck %s
+; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S | FileCheck %s
+; CHECK: addrspace(2)
 ; rdar://6038021
 
 @G = addrspace(2) global i32 256 
diff --git a/llvm/test/Linker/2011-08-18-unique-class-type.ll b/llvm/test/Linker/2011-08-18-unique-class-type.ll
index cae1245522ef..328e83bd07b9 100644
--- a/llvm/test/Linker/2011-08-18-unique-class-type.ll
+++ b/llvm/test/Linker/2011-08-18-unique-class-type.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-link %s %p/2011-08-18-unique-class-type2.ll -S -o - | grep DW_TAG_class_type | count 1
+; RUN: llvm-link %s %p/2011-08-18-unique-class-type2.ll -S -o - | FileCheck %s
+; CHECK: DW_TAG_class_type
+; CHECK-NOT: DW_TAG_class_type
 ; Test to check there is only one MDNode for class A after linking.
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
diff --git a/llvm/test/Linker/2011-08-18-unique-debug-type.ll b/llvm/test/Linker/2011-08-18-unique-debug-type.ll
index 696fdb3108b8..cc0df4d0165e 100644
--- a/llvm/test/Linker/2011-08-18-unique-debug-type.ll
+++ b/llvm/test/Linker/2011-08-18-unique-debug-type.ll
@@ -1,6 +1,6 @@
-
-; RUN: llvm-link %s %p/2011-08-18-unique-debug-type2.ll -S -o - | grep "int" | grep -v "^; ModuleID" | count 1
+; RUN: llvm-link %s %p/2011-08-18-unique-debug-type2.ll -S -o - | FileCheck %s
 ; Test to check only one MDNode for "int" after linking.
+; CHECK: !"int"
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-macosx10.7.0"
 
diff --git a/llvm/test/Linker/AppendingLinkage.ll b/llvm/test/Linker/AppendingLinkage.ll
index 014ead91bd10..5beff5a10777 100644
--- a/llvm/test/Linker/AppendingLinkage.ll
+++ b/llvm/test/Linker/AppendingLinkage.ll
@@ -3,7 +3,8 @@
 ; RUN: echo "@X = appending global [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 4 | grep 8
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: [i32 7, i32 4, i32 8]
 
 @X = appending global [2 x i32] [ i32 7, i32 4 ]		; <[2 x i32]*> [#uses=2]
 @Y = global i32* getelementptr ([2 x i32]* @X, i64 0, i64 0)		; <i32**> [#uses=0]
diff --git a/llvm/test/Linker/AppendingLinkage2.ll b/llvm/test/Linker/AppendingLinkage2.ll
index 7385efb1f9b0..341ca1606b81 100644
--- a/llvm/test/Linker/AppendingLinkage2.ll
+++ b/llvm/test/Linker/AppendingLinkage2.ll
@@ -3,6 +3,7 @@
 ; RUN: echo "@X = appending global [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 8
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: [i32 7, i32 8]
 
 @X = appending global [1 x i32] [ i32 7 ]		; <[1 x i32]*> [#uses=0]
diff --git a/llvm/test/Linker/ConstantGlobals1.ll b/llvm/test/Linker/ConstantGlobals1.ll
index 716eb3d02e92..a2bb6fbfba8a 100644
--- a/llvm/test/Linker/ConstantGlobals1.ll
+++ b/llvm/test/Linker/ConstantGlobals1.ll
@@ -3,7 +3,8 @@
 ; RUN: echo "@X = constant [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: constant
 
 @X = external global [1 x i32]		; <[1 x i32]*> [#uses=0]
 
diff --git a/llvm/test/Linker/ConstantGlobals2.ll b/llvm/test/Linker/ConstantGlobals2.ll
index ad0f8e25f2c6..471377998713 100644
--- a/llvm/test/Linker/ConstantGlobals2.ll
+++ b/llvm/test/Linker/ConstantGlobals2.ll
@@ -3,7 +3,8 @@
 ; RUN: echo "@X = external global [1 x i32] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: constant
 
 @X = constant [1 x i32] [ i32 12 ]		; <[1 x i32]*> [#uses=0]
 
diff --git a/llvm/test/Linker/ConstantGlobals3.ll b/llvm/test/Linker/ConstantGlobals3.ll
index 5aa26bc29b09..6b4ed24c31cf 100644
--- a/llvm/test/Linker/ConstantGlobals3.ll
+++ b/llvm/test/Linker/ConstantGlobals3.ll
@@ -3,6 +3,7 @@
 ; RUN: echo "@X = external constant [1 x i32] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | FileCheck %s
+; CHECK: constant
 
 @X = external global [1 x i32]		; <[1 x i32]*> [#uses=0]
diff --git a/llvm/test/Linker/link-global-to-func.ll b/llvm/test/Linker/link-global-to-func.ll
index 9d969d768dff..4d83fe59e894 100644
--- a/llvm/test/Linker/link-global-to-func.ll
+++ b/llvm/test/Linker/link-global-to-func.ll
@@ -1,7 +1,8 @@
 ; RUN: llvm-as %s -o %t1.bc
 ; RUN: echo "declare void @__eprintf(i8*, i8*, i32, i8*) noreturn     define void @foo() {      tail call void @__eprintf( i8* undef, i8* undef, i32 4, i8* null ) noreturn nounwind       unreachable }" | llvm-as -o %t2.bc
-; RUN: llvm-link %t2.bc %t1.bc -S | grep __eprintf
-; RUN: llvm-link %t1.bc %t2.bc -S | grep __eprintf
+; RUN: llvm-link %t2.bc %t1.bc -S | FileCheck %s
+; RUN: llvm-link %t1.bc %t2.bc -S | FileCheck %s
+; CHECK: __eprintf
 
 ; rdar://6072702
 
diff --git a/llvm/test/Linker/linknamedmdnode.ll b/llvm/test/Linker/linknamedmdnode.ll
index e6b779f1fc5d..73e7554a9077 100644
--- a/llvm/test/Linker/linknamedmdnode.ll
+++ b/llvm/test/Linker/linknamedmdnode.ll
@@ -1,6 +1,7 @@
 ; RUN: llvm-as < %s > %t.bc
 ; RUN: llvm-as < %p/linknamedmdnode2.ll > %t2.bc
-; RUN: llvm-link %t.bc %t2.bc -S | grep "!llvm.stuff = !{!0, !1}"
+; RUN: llvm-link %t.bc %t2.bc -S | FileCheck %s
+; CHECK: !llvm.stuff = !{!0, !1}
 
 !0 = metadata !{i32 42}
 !llvm.stuff = !{!0}
diff --git a/llvm/test/Linker/redefinition.ll b/llvm/test/Linker/redefinition.ll
index 23ba6a100f06..64a8c341fedb 100644
--- a/llvm/test/Linker/redefinition.ll
+++ b/llvm/test/Linker/redefinition.ll
@@ -3,8 +3,7 @@
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: llvm-as %s -o %t.foo2.bc
 ; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc
-; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | \
-; RUN:   grep "symbol multiply defined"
-; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | \
-; RUN:   grep "symbol multiply defined"
+; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | FileCheck %s
+; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | FileCheck %s
+; CHECK: symbol multiply defined
 define void @foo() { ret void }
diff --git a/llvm/test/Linker/weakextern.ll b/llvm/test/Linker/weakextern.ll
index 3a72a48aae00..b9f2584c7eef 100644
--- a/llvm/test/Linker/weakextern.ll
+++ b/llvm/test/Linker/weakextern.ll
@@ -1,9 +1,10 @@
 ; RUN: llvm-as < %s > %t.bc
 ; RUN: llvm-as < %p/testlink1.ll > %t2.bc
 ; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc
-; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak"
-; RUN: llvm-dis < %t1.bc | grep "MyVar = external global i32"
-; RUN: llvm-dis < %t1.bc | grep "Inte = global i32"
+; RUN: llvm-dis < %t1.bc | FileCheck %s
+; CHECK: kallsyms_names = extern_weak
+; CHECK: Inte = global i32
+; CHECK: MyVar = external global i32
 
 @kallsyms_names = extern_weak global [0 x i8]		; <[0 x i8]*> [#uses=0]
 @MyVar = extern_weak global i32		; <i32*> [#uses=0]