diff --git a/test/Transforms/SCCP/calltest.ll b/test/Transforms/SCCP/calltest.ll
index f4e0186fff4..9dec22f4d1c 100644
--- a/test/Transforms/SCCP/calltest.ll
+++ b/test/Transforms/SCCP/calltest.ll
@@ -1,5 +1,4 @@
-; RUN: opt %s -sccp -loop-deletion -simplifycfg -S | \
-; RUN:   not grep br
+; RUN: opt < %s -sccp -loop-deletion -simplifycfg -S | not grep br
 
 ; No matter how hard you try, sqrt(1.0) is always 1.0.  This allows the
 ; optimizer to delete this loop.
diff --git a/test/Transforms/SCCP/phitest.ll b/test/Transforms/SCCP/phitest.ll
index 616307d6e67..4c5c3dcc690 100644
--- a/test/Transforms/SCCP/phitest.ll
+++ b/test/Transforms/SCCP/phitest.ll
@@ -1,5 +1,4 @@
-; RUN: opt %s -sccp -dce -simplifycfg -S | \
-; RUN:   not grep br
+; RUN: opt < %s -sccp -dce -simplifycfg -S | not grep br
 
 define i32 @test(i32 %param) {
 entry:
diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index 8217e8bd084..88f32bc0827 100644
--- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
@@ -1,7 +1,7 @@
 ; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
 ; should be fixed eventually
 
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define i32 @main(i32 %argc) {
 ; <label>:0
diff --git a/test/Transforms/SimplifyCFG/HoistCode.ll b/test/Transforms/SimplifyCFG/HoistCode.ll
index f52d1607148..9697e56a719 100644
--- a/test/Transforms/SimplifyCFG/HoistCode.ll
+++ b/test/Transforms/SimplifyCFG/HoistCode.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define void @foo(i1 %C, i32* %P) {
         br i1 %C, label %T, label %F
diff --git a/test/Transforms/SimplifyCFG/PhiEliminate2.ll b/test/Transforms/SimplifyCFG/PhiEliminate2.ll
index c0270e4b29b..c0f6781293d 100644
--- a/test/Transforms/SimplifyCFG/PhiEliminate2.ll
+++ b/test/Transforms/SimplifyCFG/PhiEliminate2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define i32 @test(i1 %C, i32 %V1, i32 %V2) {
 entry:
diff --git a/test/Transforms/SimplifyCFG/SpeculativeExec.ll b/test/Transforms/SimplifyCFG/SpeculativeExec.ll
index 891b566f3ab..5cfc77ce08a 100644
--- a/test/Transforms/SimplifyCFG/SpeculativeExec.ll
+++ b/test/Transforms/SimplifyCFG/SpeculativeExec.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -simplifycfg  -S | grep select
-; RUN: opt %s -simplifycfg  -S | grep br | count 2
+; RUN: opt < %s -simplifycfg  -S | grep select
+; RUN: opt < %s -simplifycfg  -S | grep br | count 2
 
 define i32 @t2(i32 %a, i32 %b, i32 %c) nounwind  {
 entry:
diff --git a/test/Transforms/SimplifyCFG/basictest.ll b/test/Transforms/SimplifyCFG/basictest.ll
index 0bf5b5eed4b..468b6ed11bc 100644
--- a/test/Transforms/SimplifyCFG/basictest.ll
+++ b/test/Transforms/SimplifyCFG/basictest.ll
@@ -1,6 +1,6 @@
 ; Test CFG simplify removal of branch instructions...
 ;
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define void @test1() {
         br label %BB1
diff --git a/test/Transforms/SimplifyCFG/hoist-common-code.dbg.ll b/test/Transforms/SimplifyCFG/hoist-common-code.dbg.ll
index 9a73cbc5a76..2e7ef7a8dfb 100644
--- a/test/Transforms/SimplifyCFG/hoist-common-code.dbg.ll
+++ b/test/Transforms/SimplifyCFG/hoist-common-code.dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 
         %llvm.dbg.anchor.type = type { i32, i32 }
diff --git a/test/Transforms/SimplifyCFG/hoist-common-code.ll b/test/Transforms/SimplifyCFG/hoist-common-code.ll
index 3568571bf8c..5c83e2a3aa4 100644
--- a/test/Transforms/SimplifyCFG/hoist-common-code.ll
+++ b/test/Transforms/SimplifyCFG/hoist-common-code.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 declare void @bar(i32)
 
diff --git a/test/Transforms/SimplifyCFG/return-merge.ll b/test/Transforms/SimplifyCFG/return-merge.ll
index ddc791d91e9..977b6dff87c 100644
--- a/test/Transforms/SimplifyCFG/return-merge.ll
+++ b/test/Transforms/SimplifyCFG/return-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define i32 @test1(i1 %C) {
 entry:
diff --git a/test/Transforms/SimplifyCFG/switch_create.ll b/test/Transforms/SimplifyCFG/switch_create.ll
index 5df9210e16e..9b3aaf7f20d 100644
--- a/test/Transforms/SimplifyCFG/switch_create.ll
+++ b/test/Transforms/SimplifyCFG/switch_create.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 declare void @foo1()
 
diff --git a/test/Transforms/SimplifyCFG/switch_formation.dbg.ll b/test/Transforms/SimplifyCFG/switch_formation.dbg.ll
index 9b4b4ae6d0e..f5f4c935a36 100644
--- a/test/Transforms/SimplifyCFG/switch_formation.dbg.ll
+++ b/test/Transforms/SimplifyCFG/switch_formation.dbg.ll
@@ -1,5 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
-; END.
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 
         %llvm.dbg.anchor.type = type { i32, i32 }
diff --git a/test/Transforms/SimplifyCFG/switch_formation.ll b/test/Transforms/SimplifyCFG/switch_formation.ll
index 6eea141e6d0..787904a5d4f 100644
--- a/test/Transforms/SimplifyCFG/switch_formation.ll
+++ b/test/Transforms/SimplifyCFG/switch_formation.ll
@@ -1,5 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
-; END.
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define i1 @_ZN4llvm11SetCondInst7classofEPKNS_11InstructionE({ i32, i32 }* %I) {
 entry:
diff --git a/test/Transforms/SimplifyCFG/two-entry-phi-return.dbg.ll b/test/Transforms/SimplifyCFG/two-entry-phi-return.dbg.ll
index ff85810c76d..3a6c2ed6680 100644
--- a/test/Transforms/SimplifyCFG/two-entry-phi-return.dbg.ll
+++ b/test/Transforms/SimplifyCFG/two-entry-phi-return.dbg.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
         %llvm.dbg.anchor.type = type { i32, i32 }
         %llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8*, i1, i1, i8* }
diff --git a/test/Transforms/SimplifyCFG/two-entry-phi-return.ll b/test/Transforms/SimplifyCFG/two-entry-phi-return.ll
index f28c8c97ebf..fb18624c71f 100644
--- a/test/Transforms/SimplifyCFG/two-entry-phi-return.ll
+++ b/test/Transforms/SimplifyCFG/two-entry-phi-return.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | not grep br
 
 define i1 @qux(i8* %m, i8* %n, i8* %o, i8* %p) nounwind  {
 entry: