diff --git a/test/CFrontend/2007-06-15-AnnotateAttribute.c b/test/CFrontend/2007-06-15-AnnotateAttribute.c
index 6fe09c2..56bdc6a 100644
--- a/test/CFrontend/2007-06-15-AnnotateAttribute.c
+++ b/test/CFrontend/2007-06-15-AnnotateAttribute.c
@@ -1,5 +1,5 @@
 // RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.global.annotations
-// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep -c llvm.var.annotation | grep 3 
+// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.var.annotation | count 3 
 
 #include <stdio.h>
 
diff --git a/test/CFrontend/2007-08-01-LoadStoreAlign.c b/test/CFrontend/2007-08-01-LoadStoreAlign.c
index 3d5b1fb..ef890bf 100644
--- a/test/CFrontend/2007-08-01-LoadStoreAlign.c
+++ b/test/CFrontend/2007-08-01-LoadStoreAlign.c
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep -c {align 1} | grep 2
+// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep {align 1} | count 2
 // RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llvm-as | llc
 
 struct p {
diff --git a/test/CodeGen/ARM/aliases.ll b/test/CodeGen/ARM/aliases.ll
index bd7555a..70b2c4d 100644
--- a/test/CodeGen/ARM/aliases.ll
+++ b/test/CodeGen/ARM/aliases.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=arm-linux-gnueabi -o %t -f
-; RUN: grep -c set %t   | grep 5
-; RUN: grep -c globl %t | grep 4
-; RUN: grep -c weak %t  | grep 1
+; RUN: grep set %t   | count 5
+; RUN: grep globl %t | count 4
+; RUN: grep weak %t  | count 1
 
 @bar = external global i32
 @foo1 = alias i32* @bar
diff --git a/test/CodeGen/ARM/unaligned_load_store.ll b/test/CodeGen/ARM/unaligned_load_store.ll
index 211d748..dad1897 100644
--- a/test/CodeGen/ARM/unaligned_load_store.ll
+++ b/test/CodeGen/ARM/unaligned_load_store.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -o %t -f
-; RUN: grep -c ldrb %t | grep 4
-; RUN: grep -c strb %t | grep 4
+; RUN: grep ldrb %t | count 4
+; RUN: grep strb %t | count 4
 
 
 	%struct.p = type <{ i8, i32 }>
diff --git a/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll b/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
index f891599..16d7a16 100644
--- a/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
+++ b/test/CodeGen/Generic/2007-04-27-BitTestsBadMask.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep -c je | grep 3
+; RUN: llvm-as < %s | llc -march=x86 | grep je | count 3
 ; RUN: llvm-as < %s | llc -march=x86-64 | grep 4297064449
 ; PR 1325+
 
diff --git a/test/CodeGen/X86/aliases.ll b/test/CodeGen/X86/aliases.ll
index 9bd6140..4a69eae 100644
--- a/test/CodeGen/X86/aliases.ll
+++ b/test/CodeGen/X86/aliases.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=i686-pc-linux-gnu -o %t -f
-; RUN: grep -c set %t   | grep 5
-; RUN: grep -c globl %t | grep 4
-; RUN: grep -c weak %t  | grep 1
+; RUN: grep set %t   | count 5
+; RUN: grep globl %t | count 4
+; RUN: grep weak %t  | count 1
 
 @bar = external global i32
 @foo1 = alias i32* @bar
diff --git a/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll b/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
index 07bf098..366d3d6 100644
--- a/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
+++ b/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -predsimplify -instcombine -simplifycfg  | llvm-dis > %t
 ; RUN: grep -v declare %t | not grep fail
-; RUN: grep -v declare %t | grep -c pass | grep 3
+; RUN: grep -v declare %t | grep pass | count 3
 
 int %test1(int %x, int %y) {
 entry:
diff --git a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
index a904012..0d9d2d4 100644
--- a/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
+++ b/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -predsimplify -instcombine -simplifycfg | llvm-dis | \
-; RUN:   grep -v declare | grep -c pass | grep 2
+; RUN:   grep -v declare | grep pass | count 2
 
 int %test(int %x, int %y) {
 entry:
diff --git a/test/Transforms/PredicateSimplifier/predsimplify.ll b/test/Transforms/PredicateSimplifier/predsimplify.ll
index b88122f..76546dc 100644
--- a/test/Transforms/PredicateSimplifier/predsimplify.ll
+++ b/test/Transforms/PredicateSimplifier/predsimplify.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -predsimplify -instcombine -simplifycfg | llvm-dis > %t
 ; RUN: grep -v declare %t | not grep fail 
-; RUN: grep -v declare %t | grep -c pass | grep 4
+; RUN: grep -v declare %t | grep pass | count 4
 
 void %test1(int %x) {
 entry:
diff --git a/test/Transforms/SimplifyLibCalls/ExitInMain.ll b/test/Transforms/SimplifyLibCalls/ExitInMain.ll
index 13f1a11..3fded2c 100644
--- a/test/Transforms/SimplifyLibCalls/ExitInMain.ll
+++ b/test/Transforms/SimplifyLibCalls/ExitInMain.ll
@@ -1,6 +1,6 @@
 ; Test that the ExitInMainOptimization pass works correctly
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    grep -c {ret i32 3} | grep 1
+; RUN:    grep {ret i32 3} | count 1
 ; END.
 
 declare void %exit(int)