diff --git a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
index 65003c2e66f92..a110b41a8f243 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-DirectCall.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Call graph node <<null function>>
 ; CHECK:  CS<{{.*}}> calls function 'callee'
diff --git a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
index a2192cc21fb40..76d9900ae229b 100644
--- a/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
+++ b/llvm/test/Analysis/CallGraph/2008-09-09-UsedByGlobal.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 @a = global ptr @f		; <ptr> [#uses=0]
 
diff --git a/llvm/test/Analysis/CallGraph/callback-calls.ll b/llvm/test/Analysis/CallGraph/callback-calls.ll
index 4f0f406dc56fa..59d73186e96f3 100644
--- a/llvm/test/Analysis/CallGraph/callback-calls.ll
+++ b/llvm/test/Analysis/CallGraph/callback-calls.ll
@@ -1,5 +1,5 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; CHECK: Call graph node for function: 'caller'
 ; CHECK-NEXT:   CS<{{.*}}> calls function 'broker'
diff --git a/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll b/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
index 9c6ed2a8801ac..bdf6d3a07ca9b 100644
--- a/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
+++ b/llvm/test/Analysis/CallGraph/ignore-assumelike-calls.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 ; CHECK: Call graph node <<null function>><<{{.*}}>>  #uses=0
 ; CHECK-NEXT:   CS<None> calls function 'other_intrinsic_use'
 ; CHECK-NEXT:   CS<None> calls function 'other_cast_intrinsic_use'
diff --git a/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll b/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
index ea2bdab7e0027..8342ed366e15c 100644
--- a/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
+++ b/llvm/test/Analysis/CallGraph/ignore-callback-uses.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 ; CHECK: Call graph node <<null function>><<{{.*}}>>  #uses=0
 ; CHECK-NEXT:   CS<{{.*}}> calls function 'f'
 ; CHECK-NEXT:   CS<{{.*}}> calls function '__kmpc_fork_call'
diff --git a/llvm/test/Analysis/CallGraph/llvm-used.ll b/llvm/test/Analysis/CallGraph/llvm-used.ll
index b75d4b07817c2..9f0df15780563 100644
--- a/llvm/test/Analysis/CallGraph/llvm-used.ll
+++ b/llvm/test/Analysis/CallGraph/llvm-used.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; The test will report used1 and used2 functions as used on the grounds
 ; of llvm.*.used references. Passing IgnoreLLVMUsed = true into the
diff --git a/llvm/test/Analysis/CallGraph/no-intrinsics.ll b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
index 7a955ecc1f9dc..2c01207282cd6 100644
--- a/llvm/test/Analysis/CallGraph/no-intrinsics.ll
+++ b/llvm/test/Analysis/CallGraph/no-intrinsics.ll
@@ -1,5 +1,5 @@
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -print-callgraph -disable-output 2>&1 | FileCheck %s
-; RUN: opt -temporarily-allow-old-pass-syntax < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
+; RUN: opt < %s -passes=print-callgraph -disable-output 2>&1 | FileCheck %s
 
 ; Check that intrinsics aren't added to the call graph
 
diff --git a/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll b/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
index 8ec0d6a42f6d5..a6744932b07be 100644
--- a/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
+++ b/llvm/test/Analysis/CallGraph/non-leaf-intrinsics.ll
@@ -1,4 +1,4 @@
-; RUN: opt -temporarily-allow-old-pass-syntax -S -print-callgraph -disable-output < %s 2>&1 | FileCheck %s
+; RUN: opt -S -passes=print-callgraph -disable-output < %s 2>&1 | FileCheck %s
 
 declare void @llvm.experimental.patchpoint.void(i64, i32, ptr, i32, ...)
 declare token @llvm.experimental.gc.statepoint.p0(i64, i32, ptr, i32, i32, ...)