diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
index 8478036f10f..d115d3da778 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise.ll
@@ -2,10 +2,7 @@
 ; successful, all cast instructions should be eliminated from this testcase.
 ;
 
-; RUN: if as < %s | opt -raise | dis | grep cast 
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep-not cast 
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int }
diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
index 0a0772613fc..4ca8c1673d3 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise2.ll
@@ -3,10 +3,7 @@
 ; prevented reg115 from being able to change.
 ;
 
-; RUN: if as < %s | opt -raise | dis | grep '= cast' | grep \*
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep '= cast' | grep-not \*
 	
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
diff --git a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
index c5b21574994..52cf2682dfd 100644
--- a/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
+++ b/test/Transforms/LevelRaise/2002-03-21-MissedRaise3.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -raise | dis | grep '= cast' | grep \*
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
 
 	%Hash = type { { uint, sbyte *, \2 } * *, int (uint) *, int } *
 	%HashEntry = type { uint, sbyte *, \2 } *
@@ -9,9 +6,7 @@
 	%hash_entry = type { uint, sbyte *, \2 * }
 implementation
 
-%Hash "MakeHash"(int %size, int (uint) * %map)
-begin
-bb0:					;[#uses=1]
+%Hash "MakeHash"(int %size, int (uint) * %map) {
 	%reg112 = malloc sbyte * *, uint 3		; <sbyte * * *> [#uses=5]
 	%reg107-uint = cast int %size to uint		; <uint> [#uses=1]
 	%reg115 = malloc sbyte *, uint %reg107-uint		; <sbyte * *> [#uses=1]
@@ -19,5 +14,5 @@ bb0:					;[#uses=1]
 
 	%cast246 = cast sbyte * * * %reg112 to %Hash		; <%Hash> [#uses=1]
 	ret %Hash %cast246
-end
+}
 
diff --git a/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll b/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
index b7a9e32eed0..e04c39705ce 100644
--- a/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-04-09-MissedRaise.ll
@@ -8,10 +8,7 @@
 ;     x[j*i-12] = j;
 ; }
 
-; RUN: if as < %s | opt -raise | dis | grep ' cast ' | grep '*'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
index 1ca027e979e..a856fe23b0a 100644
--- a/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-04-16-MissedRaise.ll
@@ -5,18 +5,11 @@
 ;   return (int*)malloc(i+j);
 ; }
 
-; RUN: if as < %s | opt -raise | dis | grep ' cast ' | grep '*'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
 
 implementation
 
-declare sbyte* "malloc"(uint)
-
-int* "test"(uint %N, uint %M)
-begin
-bb0:					;[#uses=0]
+int* %test(uint %N, uint %M) {
 	%reg111 = shl uint %N, ubyte 2		; <uint> [#uses=1]
 	%reg109 = add uint %reg111, 4		; <uint> [#uses=1]
 	%reg114 = shl uint %M, ubyte 2		; <uint> [#uses=1]
@@ -25,4 +18,4 @@ bb0:					;[#uses=0]
 	%reg117 = malloc sbyte, uint %reg116		; <sbyte*> [#uses=1]
 	%cast221 = cast sbyte* %reg117 to int*		; <int*> [#uses=1]
 	ret int* %cast221
-end
+}
diff --git a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
index 7c14c47d779..d23ffd3a4e8 100644
--- a/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-05-02-MissedRaise.ll
@@ -1,9 +1,6 @@
 ; This testcase is not level raised properly...
 ;
-; RUN: if as < %s | opt -raise | dis | grep ' cast ' | grep '*'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
 
 	%List = type { int, %List* }
 
diff --git a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
index 7e9c713babc..dafd4e000df 100644
--- a/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
+++ b/test/Transforms/LevelRaise/2002-05-10-LoadPeephole.ll
@@ -1,10 +1,7 @@
 ; This testcase should have the cast propogated through the load
 ; just like a store does...
 ;
-; RUN: if as < %s | opt -raise | dis | grep ' cast ' | grep '*'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep ' cast ' | not grep '*'
 
 int "test"(uint * %Ptr) {
 	%P2 = cast uint *%Ptr to int *
diff --git a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
index 8708d86b9ac..50176e23579 100644
--- a/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-05-23-MissedRaise.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -raise | dis | grep '= cast' | grep \*
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
 
 %FILE = type { int, ubyte*, ubyte*, ubyte, ubyte, uint, uint, uint }
 
diff --git a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
index 3b716b5860e..11a3967d1a5 100644
--- a/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
+++ b/test/Transforms/LevelRaise/2002-07-16-MissedRaise.ll
@@ -5,10 +5,7 @@
 ; This could be fixed by making all stores add themselves to a list, and check
 ; their arguments are consistent AFTER all other values are propogated.
 
-; RUN: if as < %s | opt -raise | dis | grep '= cast' 
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | not grep '= cast' 
 
         %Tree = type %struct.tree*
         %struct.tree = type { int, double, double, %Tree, %Tree, %Tree, %Tree }
diff --git a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
index 0f0484d04de..8653e269802 100644
--- a/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
+++ b/test/Transforms/LevelRaise/2002-07-18-MissedAllocaRaise.ll
@@ -1,9 +1,6 @@
 ; Looks like we don't raise alloca's like we do mallocs
 ;
-; RUN: if as < %s | opt -raise | dis | grep '= cast' | grep \*
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep '= cast' | not grep \*
 
 implementation   ; Functions:
 
diff --git a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
index 26949f3bd05..7cfd02e899d 100644
--- a/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
+++ b/test/Transforms/LevelRaise/2002-10-02-SignExtensionProblem.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -raise | dis | grep 4294967295
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep -v uint | not grep 4294967295
 
 %length_code = uninitialized global [256 x ubyte]
 
diff --git a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
index 651d595be93..8c0fcf4ffce 100644
--- a/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
+++ b/test/Transforms/LevelRaise/2002-10-08-VarArgCall.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -raise | dis | grep call | grep \.\.\.
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | grep call | not grep '\.\.\.'
 
 implementation
 
diff --git a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
index 588c77dc188..33556feabb8 100644
--- a/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
+++ b/test/Transforms/LevelRaise/2002-11-13-PointerFunction.ll
@@ -1,9 +1,6 @@
 ; This testcase should be able to eliminate at least one of the casts.
 ;
-; RUN: if as < %s | opt -raise | dis | grep 'REMOVE'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | not grep 'REMOVE'
 
 int %foo(sbyte * %PF) {
 	%UPF = cast sbyte* %PF to uint()*
diff --git a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
index 8c5a22e6b17..55557de0731 100644
--- a/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
+++ b/test/Transforms/LevelRaise/2003-05-01-CallCast.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -raise | dis | grep cast
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | not grep cast
 
 void %test(...) { ret void }
 
diff --git a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
index 0b0255a22df..f4edb6fa8d8 100644
--- a/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
+++ b/test/Transforms/LevelRaise/2003-06-25-ExprAnalysis.ll
@@ -1,9 +1,6 @@
 ; The expr analysis routines were being too aggressive across cast instructions!
 
-; RUN: if as < %s | opt -raise | dis | grep 4294967295
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -raise | dis | not grep 4294967295
 
 target endian = big
 target pointersize = 64