diff --git a/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx b/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
index c1e6aba5e05e..29378a357c94 100644
--- a/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
+++ b/llvm/test/Regression/Assembler/2002-04-29-NameBinding.llx
@@ -4,7 +4,7 @@
 ; Check by running globaldce, which will remove the constant if there are
 ; no references to it!
 ; 
-; RUN: as < %s | opt -globaldce | dis | grep-not constant
+; RUN: as < %s | opt -globaldce | dis | not grep constant
 ;
 	
 %v1 = internal constant int 5
diff --git a/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx b/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
index 34e5654b8589..3dc6aacb2746 100644
--- a/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
+++ b/llvm/test/Regression/Assembler/ConstantExprFoldCast.llx
@@ -1,6 +1,6 @@
 ; This test checks to make sure that constant exprs fold in some simple situations
 
-; RUN: as < %s | dis | grep-not cast
+; RUN: as < %s | dis | not grep cast
 
 %A = global int* cast (sbyte* null to int*)  ; Cast null -> fold
 %B = global int** cast (int** %A to int**)   ; Cast to same type -> fold
diff --git a/llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll b/llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll
index b3e4b8ef3fcb..1b4206455047 100644
--- a/llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll
+++ b/llvm/test/Regression/Linker/2003-05-31-LinkerRename.ll
@@ -5,7 +5,7 @@
 
 ; RUN: echo "implementation internal int %foo() { ret int 7 }" | as > Output/%s.1.bc
 ; RUN: as < %s > Output/%s.2.bc
-; RUN: link Output/%s.[12].bc | dis | grep 'internal' | grep-not '%foo('
+; RUN: link Output/%s.[12].bc | dis | grep 'internal' | not grep '%foo('
 
 implementation
 declare int %foo() 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll b/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll
index dd859c512233..101351e695ca 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2002-05-14-SubFailure.ll
@@ -1,7 +1,7 @@
 ; Instcombine was missing a test that caused it to make illegal transformations
 ; sometimes.  In this case, it transforms the sub into an add:
 ; RUN: echo foo
-; RUN: as < %s | opt -instcombine | dis | grep-not add
+; RUN: as < %s | opt -instcombine | dis | not grep add
 ;
 
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
index 96c692438e7b..6fa77b676351 100644
--- a/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine | dis | grep-not add
+; RUN: as < %s | opt -instcombine | dis | not grep add
 
 int %test(int %A) {
   %A.neg = sub int 0, %A
diff --git a/llvm/test/Regression/Transforms/InstCombine/add.ll b/llvm/test/Regression/Transforms/InstCombine/add.ll
index b2850d37dec2..e3b9c98f317b 100644
--- a/llvm/test/Regression/Transforms/InstCombine/add.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/add.ll
@@ -3,7 +3,7 @@
 ; This also tests that a subtract with a constant is properly converted
 ; to a add w/negative constant
 
-; RUN: as < %s | opt -instcombine -die | dis | grep-not add
+; RUN: as < %s | opt -instcombine -die | dis | not grep add
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/and.ll b/llvm/test/Regression/Transforms/InstCombine/and.ll
index a06fc33fced7..f01de784e198 100644
--- a/llvm/test/Regression/Transforms/InstCombine/and.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/and.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not and
+; RUN: as < %s | opt -instcombine | dis | not grep and
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/call.ll b/llvm/test/Regression/Transforms/InstCombine/call.ll
index 665a09c76392..cf06244506cc 100644
--- a/llvm/test/Regression/Transforms/InstCombine/call.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/call.ll
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -instcombine -die | dis | grep call | grep-not cast
+; RUN: as < %s | opt -instcombine -die | dis | grep call | not grep cast
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast-set.ll b/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
index ef3821a1f04b..55947d6b7e51 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast-set.ll
@@ -3,7 +3,7 @@
 ; slow.  Might it be better to make there be an instcombine prepass before
 ; level raise that takes care of the obvious stuff?
 
-; RUN: as < %s | opt -instcombine | dis | grep-not cast
+; RUN: as < %s | opt -instcombine | dis | not grep cast
 
 bool %test1(int %X) {
 	%A = cast int %X to uint
diff --git a/llvm/test/Regression/Transforms/InstCombine/cast.ll b/llvm/test/Regression/Transforms/InstCombine/cast.ll
index 32556c070e81..a19a2f1f2e19 100644
--- a/llvm/test/Regression/Transforms/InstCombine/cast.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/cast.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 
-; RUN: as < %s | opt -instcombine -die | dis | grep '%c' | grep-not cast
+; RUN: as < %s | opt -instcombine -die | dis | grep '%c' | not grep cast
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/div.ll b/llvm/test/Regression/Transforms/InstCombine/div.ll
index 913d3ccef5c0..543bd21238e8 100644
--- a/llvm/test/Regression/Transforms/InstCombine/div.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/div.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not div
+; RUN: as < %s | opt -instcombine | dis | not grep div
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll b/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
index 011554cffd7e..09642cdbcc9c 100644
--- a/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/getelementptr.ll
@@ -1,6 +1,6 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: as < %s | opt -instcombine -die | dis | grep getelementptr | grep-not '%A '
+; RUN: as < %s | opt -instcombine -die | dis | grep getelementptr | not grep '%A '
 
 %Global = constant [10 x sbyte] c"helloworld"
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/load.ll b/llvm/test/Regression/Transforms/InstCombine/load.ll
index f80e02e464e1..f085346597ba 100644
--- a/llvm/test/Regression/Transforms/InstCombine/load.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not load
+; RUN: as < %s | opt -instcombine | dis | not grep load
 
 %X = constant int 42
 %Y = constant [2 x { int, float }] [ { int, float } { int 12, float 1.0 }, 
diff --git a/llvm/test/Regression/Transforms/InstCombine/mul.ll b/llvm/test/Regression/Transforms/InstCombine/mul.ll
index 3ffcc8320154..d90ffd2feb7f 100644
--- a/llvm/test/Regression/Transforms/InstCombine/mul.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/mul.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that mul instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not mul
+; RUN: as < %s | opt -instcombine | dis | not grep mul
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/not.ll b/llvm/test/Regression/Transforms/InstCombine/not.ll
index 0928ce7bc304..92ddffdcab4a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/not.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/not.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | grep-not xor
+; RUN: as < %s | opt -instcombine -die | dis | not grep xor
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/or.ll b/llvm/test/Regression/Transforms/InstCombine/or.ll
index 09141a3c0ac9..a9863db935a5 100644
--- a/llvm/test/Regression/Transforms/InstCombine/or.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/or.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep -v '%OROK = or' | grep-not 'or '
+; RUN: as < %s | opt -instcombine | dis | grep -v '%OROK = or' | not grep 'or '
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/phi.ll b/llvm/test/Regression/Transforms/InstCombine/phi.ll
index f867bdf42657..2c16f7256afb 100644
--- a/llvm/test/Regression/Transforms/InstCombine/phi.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/phi.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | grep-not phi
+; RUN: as < %s | opt -instcombine -die | dis | not grep phi
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/pow.ll b/llvm/test/Regression/Transforms/InstCombine/pow.ll
index 66027cde1248..ee84ac6825c8 100644
--- a/llvm/test/Regression/Transforms/InstCombine/pow.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/pow.ll
@@ -2,7 +2,7 @@
 ;
 ; Equivalent to: http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01786.html
 
-; RUN: as < %s | opt -instcombine | dis | grep-not 'call double %pow'
+; RUN: as < %s | opt -instcombine | dis | not grep 'call double %pow'
 
 declare double %pow(double, double)
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/rem.ll b/llvm/test/Regression/Transforms/InstCombine/rem.ll
index 09300a56726d..3c941454cab2 100644
--- a/llvm/test/Regression/Transforms/InstCombine/rem.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/rem.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not rem
+; RUN: as < %s | opt -instcombine | dis | not grep rem
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/set.ll b/llvm/test/Regression/Transforms/InstCombine/set.ll
index 760e14d1e29a..37370fd3411a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/set.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/set.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not set
+; RUN: as < %s | opt -instcombine | dis | not grep set
 
 %X = uninitialized global int
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll b/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
index 9051d032cff0..17ad7dc2e69a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -3,7 +3,7 @@
 ; into equivalent setne,eq instructions.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep -v seteq | grep -v setne | grep-not set
+; RUN: as < %s | opt -instcombine | dis | grep -v seteq | grep -v setne | not grep set
 
 bool "test1"(uint %A) {
 	%B = setge uint %A, 1   ; setne %A, 0
diff --git a/llvm/test/Regression/Transforms/InstCombine/shift.ll b/llvm/test/Regression/Transforms/InstCombine/shift.ll
index 67e2827007f7..2def834e8726 100644
--- a/llvm/test/Regression/Transforms/InstCombine/shift.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/shift.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine | dis | grep-not sh
+; RUN: as < %s | opt -instcombine | dis | not grep sh
 
 implementation
 
diff --git a/llvm/test/Regression/Transforms/InstCombine/sub.ll b/llvm/test/Regression/Transforms/InstCombine/sub.ll
index 4bd9be645b5e..2003abdbc1bd 100644
--- a/llvm/test/Regression/Transforms/InstCombine/sub.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/sub.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: as < %s | opt -instcombine -die | dis | grep sub | grep-not -v 'sub int %Cok, %Bok'
+; RUN: as < %s | opt -instcombine -die | dis | grep sub | not grep -v 'sub int %Cok, %Bok'
 
 implementation