Index: test/CodeGen/X86/2003-11-03-GlobalBool.ll
===================================================================
--- test/CodeGen/X86/2003-11-03-GlobalBool.ll
+++ test/CodeGen/X86/2003-11-03-GlobalBool.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | \
-; RUN:   not grep ".byte[[:space:]]*true"
+; RUN: llc < %s -march=x86 | FileCheck %s
+; CHECK-NOT: {{.byte[[:space:]]*true}}
 
 @X = global i1 true             ; <i1*> [#uses=0]
Index: test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll
===================================================================
--- test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll
+++ test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll
@@ -1,6 +1,4 @@
-; RUN: llc < %s -march=x86 | grep "(%esp"
-; RUN: llc < %s -march=x86 | grep "pushl	%ebp" | count 1
-; RUN: llc < %s -march=x86 | grep "popl	%ebp" | count 1
+; RUN: llc < %s -march=x86 | FileCheck %s
 
 declare i8* @llvm.returnaddress(i32)
 
@@ -9,10 +7,15 @@
 define i8* @test1() {
         %X = call i8* @llvm.returnaddress( i32 0 )              ; <i8*> [#uses=1]
         ret i8* %X
+; CHECK-LABEL: test1
+; CHECK: (%esp
 }
 
 define i8* @test2() {
         %X = call i8* @llvm.frameaddress( i32 0 )               ; <i8*> [#uses=1]
         ret i8* %X
+; CHECK-LABEL: test2
+; CHECK: pushl %ebp
+; CHECK: popl %ebp
 }
 
Index: test/CodeGen/X86/2004-02-14-InefficientStackPointer.ll
===================================================================
--- test/CodeGen/X86/2004-02-14-InefficientStackPointer.ll
+++ test/CodeGen/X86/2004-02-14-InefficientStackPointer.ll
@@ -1,5 +1,7 @@
-; RUN: llc < %s -march=x86 | grep -i ESP | not grep sub
+; RUN: llc < %s -march=x86 | FileCheck %s
 
 define i32 @test(i32 %X) {
         ret i32 %X
+; CHECK-LABEL: test
+; CHECK-NOT: {{sub.*esp}}
 }
Index: test/CodeGen/X86/2005-01-17-CycleInDAG.ll
===================================================================
--- test/CodeGen/X86/2005-01-17-CycleInDAG.ll
+++ test/CodeGen/X86/2005-01-17-CycleInDAG.ll
@@ -3,7 +3,7 @@
 ; is invalid code (there is no correct way to order the instruction).  Check
 ; that we do not fold the load into the sub.
 
-; RUN: llc < %s -march=x86 | not grep sub.*GLOBAL
+; RUN: llc < %s -march=x86 | FileCheck %s
 
 @GLOBAL = external global i32           ; <i32*> [#uses=1]
 
@@ -13,5 +13,7 @@
         %Y = load i32, i32* %P3              ; <i32> [#uses=1]
         %Z = sub i32 %Y, %L             ; <i32> [#uses=1]
         ret i32 %Z
+; CHECK-LABEL: test
+; CHECK-NOT: {{sub.*GLOBAL}}
 }
 
Index: test/CodeGen/X86/2005-02-14-IllegalAssembler.ll
===================================================================
--- test/CodeGen/X86/2005-02-14-IllegalAssembler.ll
+++ test/CodeGen/X86/2005-02-14-IllegalAssembler.ll
@@ -1,4 +1,5 @@
-; RUN: llc < %s -march=x86 | not grep 18446744073709551612
+; RUN: llc < %s -march=x86 | FileCheck %s
+; CHECK-NOT: 18446744073709551612
 
 @A = external global i32                ; <i32*> [#uses=1]
 @Y = global i32* getelementptr (i32, i32* @A, i32 -1)                ; <i32**> [#uses=0]
Index: test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
===================================================================
--- test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
+++ test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll
@@ -1,5 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=generic | \
-; RUN:   grep shld | count 1
+; RUN: llc < %s -march=x86 -mcpu=generic | FileCheck %s
 ;
 ; Check that the isel does not fold the shld, which already folds a load
 ; and has two uses, into a store.
@@ -16,5 +15,8 @@
         %tmp.5 = or i32 %tmp.4, %tmp.2          ; <i32> [#uses=2]
         store i32 %tmp.5, i32* @A
         ret i32 %tmp.5
+; CHECK-LABEL: test5
+; CHECK: shld
+; CHECK-NOT: shld
 }