diff --git a/llvm/test/Transforms/GVNHoist/hoist-call.ll b/llvm/test/Transforms/GVNHoist/hoist-call.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-call.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Check that the call and fcmp are hoisted.
 ; CHECK-LABEL: define void @fun(
diff --git a/llvm/test/Transforms/GVNHoist/hoist-convergent.ll b/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-convergent.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 
 ; Check that convergent calls are not hoisted.
 ;
diff --git a/llvm/test/Transforms/GVNHoist/hoist-md.ll b/llvm/test/Transforms/GVNHoist/hoist-md.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-md.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-md.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll b/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-more-than-two-branches.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 
 ; CHECK: store
 ; CHECK-NOT: store
diff --git a/llvm/test/Transforms/GVNHoist/hoist-mssa.ll b/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-mssa.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist -newgvn < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist,newgvn' < %s | FileCheck %s
 
 ; Check that store hoisting works: there should be only one store left.
 ; CHECK-LABEL: @getopt
diff --git a/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll b/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-newgvn.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist,newgvn' -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll b/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr20242.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -gvn-hoist  -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist,newgvn' gvn-hoist,-S < %s | FileCheck %s
 ; Test to demonstrate that newgvn creates opportunities for
 ; more gvn-hoist when sibling branches contain identical expressions.
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll b/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr22005.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll b/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr28606.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr28933.ll b/llvm/test/Transforms/GVNHoist/hoist-pr28933.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-pr28933.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr28933.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist -verify-memoryssa -newgvn < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist,verify-memoryssa -passes='newgvn' < %s | FileCheck %s
 
 ; Check that we end up with one load and one store, in the right order
 ; CHECK-LABEL:  define void @test_it(
diff --git a/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll b/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-pr31891.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Hoisted inlinable calls need to have accurate scope information, but we're
 ; allowed to erase the line information.
diff --git a/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll b/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-recursive-geps.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -newgvn -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist,newgvn' -passes='gvn-hoist' -S < %s | FileCheck %s
 
 ; Check that recursive GEPs are hoisted. Since hoisting creates
 ; fully redundant instructions, newgvn is run to remove them which then
diff --git a/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll b/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-simplify-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-hoist' -S | FileCheck %s
 
 ; This test is meant to make sure that MemorySSAUpdater works correctly
 ; in non-trivial cases.
diff --git a/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll b/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-unsafe-pr31729.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 
 ; Check that urem is not hoisted.
 ; CHECK-LABEL: @main
diff --git a/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll b/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
--- a/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-very-busy.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 %struct.__jmp_buf_tag = type { [8 x i64], i32 }
 
diff --git a/llvm/test/Transforms/GVNHoist/hoist.ll b/llvm/test/Transforms/GVNHoist/hoist.ll
--- a/llvm/test/Transforms/GVNHoist/hoist.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll b/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
--- a/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
+++ b/llvm/test/Transforms/GVNHoist/infinite-loop-direct.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Checking gvn-hoist in case of infinite loops and irreducible control flow.
 
diff --git a/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll b/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
--- a/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
+++ b/llvm/test/Transforms/GVNHoist/infinite-loop-indirect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Checking gvn-hoist in case of indirect branches.
 
diff --git a/llvm/test/Transforms/GVNHoist/int_sideeffect.ll b/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
--- a/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
+++ b/llvm/test/Transforms/GVNHoist/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-hoist | FileCheck %s
+; RUN: opt -S < %s -passes='gvn-hoist' | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/GVNHoist/ld_hoist1.ll b/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
--- a/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
+++ b/llvm/test/Transforms/GVNHoist/ld_hoist1.ll
@@ -1,5 +1,5 @@
 ; Test load hoist
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc_linux"
 
diff --git a/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll b/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
--- a/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
+++ b/llvm/test/Transforms/GVNHoist/ld_hoist_st_sink.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure that loads and stores in a diamond get merged
 ; Loads are hoisted into the header. Stores sunks into the footer.
-; RUN: opt -gvn-hoist -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-hoist' -S < %s | FileCheck %s
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
 %struct.node = type { i64, %struct.node*, %struct.node*, %struct.node*, i64, %struct.arc*, i64, i64, i64 }
diff --git a/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll b/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
--- a/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
+++ b/llvm/test/Transforms/GVNHoist/non-trivial-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt -gvn-hoist %s -S -o - | FileCheck %s
+; RUN: opt -passes='gvn-hoist' %s -S -o - | FileCheck %s
 
 ; CHECK: store
 ; CHECK-NOT: store
diff --git a/llvm/test/Transforms/GVNHoist/pr28626.ll b/llvm/test/Transforms/GVNHoist/pr28626.ll
--- a/llvm/test/Transforms/GVNHoist/pr28626.ll
+++ b/llvm/test/Transforms/GVNHoist/pr28626.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/llvm/test/Transforms/GVNHoist/pr29031.ll b/llvm/test/Transforms/GVNHoist/pr29031.ll
--- a/llvm/test/Transforms/GVNHoist/pr29031.ll
+++ b/llvm/test/Transforms/GVNHoist/pr29031.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Check that the stores are not hoisted: it is invalid to hoist stores if they
 ; are not executed on all paths. In this testcase, there are paths in the loop
diff --git a/llvm/test/Transforms/GVNHoist/pr29034.ll b/llvm/test/Transforms/GVNHoist/pr29034.ll
--- a/llvm/test/Transforms/GVNHoist/pr29034.ll
+++ b/llvm/test/Transforms/GVNHoist/pr29034.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Check that the stores are not hoisted: it is invalid to hoist stores if they
 ; are not executed on all paths. In this testcase, there are paths in the loop
diff --git a/llvm/test/Transforms/GVNHoist/pr30216.ll b/llvm/test/Transforms/GVNHoist/pr30216.ll
--- a/llvm/test/Transforms/GVNHoist/pr30216.ll
+++ b/llvm/test/Transforms/GVNHoist/pr30216.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 
 ; Make sure the two stores @B do not get hoisted past the load @B.
 
diff --git a/llvm/test/Transforms/GVNHoist/pr30499.ll b/llvm/test/Transforms/GVNHoist/pr30499.ll
--- a/llvm/test/Transforms/GVNHoist/pr30499.ll
+++ b/llvm/test/Transforms/GVNHoist/pr30499.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s
+; RUN: opt -S -passes='gvn-hoist' < %s
 
 define void @_Z3fn2v() #0 {
 entry:
diff --git a/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll b/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
--- a/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
+++ b/llvm/test/Transforms/GVNHoist/pr35222-hoist-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -gvn-hoist < %s | FileCheck %s
+; RUN: opt -S -passes='gvn-hoist' < %s | FileCheck %s
 ; CHECK-LABEL: build_tree
 ; CHECK: load
 ; CHECK: load
diff --git a/llvm/test/Transforms/GVNHoist/pr36787.ll b/llvm/test/Transforms/GVNHoist/pr36787.ll
--- a/llvm/test/Transforms/GVNHoist/pr36787.ll
+++ b/llvm/test/Transforms/GVNHoist/pr36787.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-hoist' -S | FileCheck %s
 
 @g = external constant i8*
 
diff --git a/llvm/test/Transforms/GVNHoist/pr37445.ll b/llvm/test/Transforms/GVNHoist/pr37445.ll
--- a/llvm/test/Transforms/GVNHoist/pr37445.ll
+++ b/llvm/test/Transforms/GVNHoist/pr37445.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -early-cse-memssa -earlycse-debug-hash -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='early-cse-memssa' -earlycse-debug-hash -passes='gvn-hoist' -S | FileCheck %s
 
 ; Make sure opt won't crash and that this pair of
 ; instructions (load, icmp) is hoisted successfully
diff --git a/llvm/test/Transforms/GVNHoist/pr37808.ll b/llvm/test/Transforms/GVNHoist/pr37808.ll
--- a/llvm/test/Transforms/GVNHoist/pr37808.ll
+++ b/llvm/test/Transforms/GVNHoist/pr37808.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-hoist' -S | FileCheck %s
 
 define void @func() {
 ; CHECK-LABEL: @func()
diff --git a/llvm/test/Transforms/GVNHoist/pr38807.ll b/llvm/test/Transforms/GVNHoist/pr38807.ll
--- a/llvm/test/Transforms/GVNHoist/pr38807.ll
+++ b/llvm/test/Transforms/GVNHoist/pr38807.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -early-cse-memssa -earlycse-debug-hash -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='early-cse-memssa' -earlycse-debug-hash -passes='gvn-hoist' -S | FileCheck %s
 
 ; Make sure opt doesn't crash. On top of that, the instructions
 ; of the side blocks should be hoisted to the entry block.
diff --git a/llvm/test/Transforms/GVNHoist/pr45442.ll b/llvm/test/Transforms/GVNHoist/pr45442.ll
--- a/llvm/test/Transforms/GVNHoist/pr45442.ll
+++ b/llvm/test/Transforms/GVNHoist/pr45442.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-hoist -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-hoist' -S | FileCheck %s
 
 ; gvn-hoist shouldn't crash in this case.
 ; CHECK-LABEL: @func(i1 %b)
diff --git a/llvm/test/Transforms/GVNSink/dither.ll b/llvm/test/Transforms/GVNSink/dither.ll
--- a/llvm/test/Transforms/GVNSink/dither.ll
+++ b/llvm/test/Transforms/GVNSink/dither.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -gvn-sink | FileCheck %s
+; RUN: opt < %s -S -passes='gvn-sink' | FileCheck %s
 
 ; Because %tmp17 has flipped operands to its equivalents %tmp14 and %tmp7, we
 ; can't sink the zext as we'd need a shuffling PHI in between.
diff --git a/llvm/test/Transforms/GVNSink/fpmath.ll b/llvm/test/Transforms/GVNSink/fpmath.ll
--- a/llvm/test/Transforms/GVNSink/fpmath.ll
+++ b/llvm/test/Transforms/GVNSink/fpmath.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-sink | FileCheck %s
+; RUN: opt -S < %s -passes='gvn-sink' | FileCheck %s
 
 ; CHECK-LABEL: sink
 ; CHECK-NOT: fneg
diff --git a/llvm/test/Transforms/GVNSink/indirect-call.ll b/llvm/test/Transforms/GVNSink/indirect-call.ll
--- a/llvm/test/Transforms/GVNSink/indirect-call.ll
+++ b/llvm/test/Transforms/GVNSink/indirect-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-sink -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -hoist-common-insts=true -simplifycfg-sink-common=false -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-sink,simplifycfg' -passes='simplifycfg-require-and-preserve-domtree=1 -hoist-common-insts=true -passes=simplifycfg-sink-common=false -S | FileCheck %s
 
 declare i8 @ext(i1)
 
diff --git a/llvm/test/Transforms/GVNSink/int_sideeffect.ll b/llvm/test/Transforms/GVNSink/int_sideeffect.ll
--- a/llvm/test/Transforms/GVNSink/int_sideeffect.ll
+++ b/llvm/test/Transforms/GVNSink/int_sideeffect.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -gvn-sink | FileCheck %s
+; RUN: opt -S < %s -passes='gvn-sink' | FileCheck %s
 
 declare void @llvm.sideeffect()
 
diff --git a/llvm/test/Transforms/GVNSink/operand-mismatch.ll b/llvm/test/Transforms/GVNSink/operand-mismatch.ll
--- a/llvm/test/Transforms/GVNSink/operand-mismatch.ll
+++ b/llvm/test/Transforms/GVNSink/operand-mismatch.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -gvn-sink -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-sink' -S < %s | FileCheck %s
 
 ; This would assert/crash because the calls have different numbers of operands:
 ; https://bugs.llvm.org/show_bug.cgi?id=42346
diff --git a/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll b/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
--- a/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
+++ b/llvm/test/Transforms/GVNSink/sink-combine-metadata.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-sink -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-sink' -S | FileCheck %s
 
 ; Check that nonnull metadata for non-dominating loads is not propagated.
 ; CHECK-LABEL: @test1(
diff --git a/llvm/test/Transforms/GVNSink/sink-common-code.ll b/llvm/test/Transforms/GVNSink/sink-common-code.ll
--- a/llvm/test/Transforms/GVNSink/sink-common-code.ll
+++ b/llvm/test/Transforms/GVNSink/sink-common-code.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn-sink -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -hoist-common-insts=true -simplifycfg-sink-common=false -S | FileCheck %s
+; RUN: opt < %s -passes='gvn-sink,simplifycfg' -passes='simplifycfg-require-and-preserve-domtree=1 -hoist-common-insts=true -passes=simplifycfg-sink-common=false -S | FileCheck %s
 
 define zeroext i1 @test1(i1 zeroext %flag, i32 %blksA, i32 %blksB, i32 %nblks) {
 entry:
diff --git a/llvm/test/Transforms/GVNSink/struct.ll b/llvm/test/Transforms/GVNSink/struct.ll
--- a/llvm/test/Transforms/GVNSink/struct.ll
+++ b/llvm/test/Transforms/GVNSink/struct.ll
@@ -1,5 +1,5 @@
-; RUN: opt -gvn-sink -S < %s | FileCheck %s
-; RUN: opt -passes=gvn-sink -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-sink' -S < %s | FileCheck %s
+; RUN: opt -passes='gvn-sink' -S < %s | FileCheck %s
 
 %struct = type {i32, i32}
 %struct2 = type { [ 2 x i32], i32 }