diff --git a/llvm/test/Transforms/PlaceSafepoints/basic.ll b/llvm/test/Transforms/PlaceSafepoints/basic.ll
index 8cdbc217b849..ade219e3703f 100644
--- a/llvm/test/Transforms/PlaceSafepoints/basic.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/basic.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -place-safepoints | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 
 ; Do we insert a simple entry safepoint?
diff --git a/llvm/test/Transforms/PlaceSafepoints/call-in-loop.ll b/llvm/test/Transforms/PlaceSafepoints/call-in-loop.ll
index 9edfeb75e0c4..003548ffad7c 100644
--- a/llvm/test/Transforms/PlaceSafepoints/call-in-loop.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/call-in-loop.ll
@@ -1,7 +1,7 @@
 ; If there's a call in the loop which dominates the backedge, we 
 ; don't need a safepoint poll (since the callee must contain a 
 ; poll test).
-;; RUN: opt %s -place-safepoints -S | FileCheck %s
+;; RUN: opt < %s -place-safepoints -S | FileCheck %s
 
 declare void @foo()
 
diff --git a/llvm/test/Transforms/PlaceSafepoints/call_gc_result.ll b/llvm/test/Transforms/PlaceSafepoints/call_gc_result.ll
index f2929bfd58ab..a382cea3b14a 100644
--- a/llvm/test/Transforms/PlaceSafepoints/call_gc_result.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/call_gc_result.ll
@@ -1,4 +1,4 @@
-;; RUN: opt %s -place-safepoints -S | FileCheck %s
+;; RUN: opt < %s -place-safepoints -S | FileCheck %s
 
 ;; This test is to verify that gc_result from a call statepoint
 ;; can have preceding phis in its parent basic block. Unlike
diff --git a/llvm/test/Transforms/PlaceSafepoints/finite-loops.ll b/llvm/test/Transforms/PlaceSafepoints/finite-loops.ll
index b98073d6a6e6..ea090eea1bc8 100644
--- a/llvm/test/Transforms/PlaceSafepoints/finite-loops.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/finite-loops.ll
@@ -1,7 +1,7 @@
 ; Tests to ensure that we are not placing backedge safepoints in
 ; loops which are clearly finite.
-;; RUN: opt %s -place-safepoints -spp-counted-loop-trip-width=32 -S | FileCheck %s
-;; RUN: opt %s -place-safepoints -spp-counted-loop-trip-width=64 -S | FileCheck %s -check-prefix=COUNTED-64
+;; RUN: opt < %s -place-safepoints -spp-counted-loop-trip-width=32 -S | FileCheck %s
+;; RUN: opt < %s -place-safepoints -spp-counted-loop-trip-width=64 -S | FileCheck %s -check-prefix=COUNTED-64
 
 
 ; A simple counted loop with trivially known range
diff --git a/llvm/test/Transforms/PlaceSafepoints/invokes.ll b/llvm/test/Transforms/PlaceSafepoints/invokes.ll
index a28fe262027f..e5258c18952f 100644
--- a/llvm/test/Transforms/PlaceSafepoints/invokes.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/invokes.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -place-safepoints | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 declare i64 addrspace(1)* @some_call(i64 addrspace(1)*)
 declare i32 @personality_function()
diff --git a/llvm/test/Transforms/PlaceSafepoints/leaf-function.ll b/llvm/test/Transforms/PlaceSafepoints/leaf-function.ll
index 2f4193827ae7..5d914c12778f 100644
--- a/llvm/test/Transforms/PlaceSafepoints/leaf-function.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/leaf-function.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -place-safepoints | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 declare void @foo() "gc-leaf-function"
 declare void @bar()
diff --git a/llvm/test/Transforms/PlaceSafepoints/memset.ll b/llvm/test/Transforms/PlaceSafepoints/memset.ll
index 534b2f120581..7edca282292b 100644
--- a/llvm/test/Transforms/PlaceSafepoints/memset.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/memset.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -place-safepoints %s | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 define void @test(i32, i8 addrspace(1)* %ptr) gc "statepoint-example" {
 ; CHECK-LABEL: @test
diff --git a/llvm/test/Transforms/PlaceSafepoints/split-backedge.ll b/llvm/test/Transforms/PlaceSafepoints/split-backedge.ll
index b9fad45709d0..5695441408a7 100644
--- a/llvm/test/Transforms/PlaceSafepoints/split-backedge.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/split-backedge.ll
@@ -1,5 +1,5 @@
 ;; A very basic test to make sure that splitting the backedge keeps working
-;; RUN: opt -place-safepoints -spp-split-backedge=1 -S %s | FileCheck %s
+;; RUN: opt < %s -place-safepoints -spp-split-backedge=1 -S | FileCheck %s
 
 define void @test(i32, i1 %cond) gc "statepoint-example" {
 ; CHECK-LABEL: @test
diff --git a/llvm/test/Transforms/PlaceSafepoints/statepoint-coreclr.ll b/llvm/test/Transforms/PlaceSafepoints/statepoint-coreclr.ll
index 0228549025ef..3cc3b1805ebe 100644
--- a/llvm/test/Transforms/PlaceSafepoints/statepoint-coreclr.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/statepoint-coreclr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -place-safepoints | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 ; Basic test to make sure that safepoints are placed
 ; for CoreCLR GC
diff --git a/llvm/test/Transforms/PlaceSafepoints/statepoint-frameescape.ll b/llvm/test/Transforms/PlaceSafepoints/statepoint-frameescape.ll
index c4e250957a8f..13a5c6e6d8d0 100644
--- a/llvm/test/Transforms/PlaceSafepoints/statepoint-frameescape.ll
+++ b/llvm/test/Transforms/PlaceSafepoints/statepoint-frameescape.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -S -place-safepoints | FileCheck %s
+; RUN: opt < %s -S -place-safepoints | FileCheck %s
 
 declare void @llvm.localescape(...)