diff --git a/llvm/test/Analysis/PostDominators/infinite-loop.ll b/llvm/test/Analysis/PostDominators/infinite-loop.ll
index 5796b8614dbded..5146fd6e21c0ab 100644
--- a/llvm/test/Analysis/PostDominators/infinite-loop.ll
+++ b/llvm/test/Analysis/PostDominators/infinite-loop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 
 @a = external global i32, align 4
diff --git a/llvm/test/Analysis/PostDominators/infinite-loop2.ll b/llvm/test/Analysis/PostDominators/infinite-loop2.ll
index 139abb76e9512c..de7413e40874f8 100644
--- a/llvm/test/Analysis/PostDominators/infinite-loop2.ll
+++ b/llvm/test/Analysis/PostDominators/infinite-loop2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 
 @a = external global i32, align 4
diff --git a/llvm/test/Analysis/PostDominators/infinite-loop3.ll b/llvm/test/Analysis/PostDominators/infinite-loop3.ll
index f767df79d3a815..1536004ddc3145 100644
--- a/llvm/test/Analysis/PostDominators/infinite-loop3.ll
+++ b/llvm/test/Analysis/PostDominators/infinite-loop3.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 
 @a = external global i32, align 4
diff --git a/llvm/test/Analysis/PostDominators/pr1098.ll b/llvm/test/Analysis/PostDominators/pr1098.ll
index 1dae0c566f055d..62aaf96e0f69f4 100644
--- a/llvm/test/Analysis/PostDominators/pr1098.ll
+++ b/llvm/test/Analysis/PostDominators/pr1098.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 ; PR932
 
diff --git a/llvm/test/Analysis/PostDominators/pr24415.ll b/llvm/test/Analysis/PostDominators/pr24415.ll
index 536c36848b9a59..aaee72758afa6d 100644
--- a/llvm/test/Analysis/PostDominators/pr24415.ll
+++ b/llvm/test/Analysis/PostDominators/pr24415.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
 ; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 
 ; Function Attrs: nounwind ssp uwtable
@@ -15,4 +15,4 @@ define void @foo() {
 ; CHECK-NEXT:   [1]  <<exit node>>
 ; CHECK-NEXT:     [2] %2
 ; CHECK-NEXT:     [2] %1
-; CHECK-NEXT:       [3] %0
\ No newline at end of file
+; CHECK-NEXT:       [3] %0
diff --git a/llvm/test/Analysis/PostDominators/pr6047_a.ll b/llvm/test/Analysis/PostDominators/pr6047_a.ll
index 32ccbe61271f20..08153f9864c6a0 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_a.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_a.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 define internal void @f() {
 entry:
   br i1 undef, label %bb35, label %bb3.i
diff --git a/llvm/test/Analysis/PostDominators/pr6047_b.ll b/llvm/test/Analysis/PostDominators/pr6047_b.ll
index f1fbb648f5396f..6b970b5cf72688 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_b.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_b.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 define internal void @f() {
 entry:
   br i1 undef, label %a, label %bb3.i
@@ -22,4 +23,4 @@ bb35:
 ; CHECK-NEXT:       [3] %bb35.loopexit3
 ; CHECK-NEXT:     [2] %a
 ; CHECK-NEXT:     [2] %entry
-; CHECK-NEXT:     [2] %bb3.i
\ No newline at end of file
+; CHECK-NEXT:     [2] %bb3.i
diff --git a/llvm/test/Analysis/PostDominators/pr6047_c.ll b/llvm/test/Analysis/PostDominators/pr6047_c.ll
index 0eef023b418cac..d2a9516ce39c74 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_c.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_c.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 define internal void @f() {
 entry:
   br i1 undef, label %bb35, label %bb3.i
@@ -194,4 +195,4 @@ bb35:
 ; CHECK-NEXT:       [3] %bb35.loopexit3
 ; CHECK-NEXT:     [2] %entry
 ; CHECK-NEXT:     [2] %bb3.i
-; CHECK-NEXT: Roots: %bb35 %bb3.i
\ No newline at end of file
+; CHECK-NEXT: Roots: %bb35 %bb3.i
diff --git a/llvm/test/Analysis/PostDominators/pr6047_d.ll b/llvm/test/Analysis/PostDominators/pr6047_d.ll
index 45ed86c27f869c..93434af6ade836 100644
--- a/llvm/test/Analysis/PostDominators/pr6047_d.ll
+++ b/llvm/test/Analysis/PostDominators/pr6047_d.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -postdomtree -analyze | FileCheck %s
+; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='print<postdomtree>' 2>&1 | FileCheck %s
 define internal void @f() {
 entry:
   br i1 1, label %a, label %b
@@ -29,4 +30,4 @@ bb35:
 ; CHECK-NEXT:       [3] %a
 ; CHECK-NEXT:       [3] %entry
 ; CHECK-NEXT:       [3] %b
-; CHECK-NEXT:     [2] %bb3.i
\ No newline at end of file
+; CHECK-NEXT:     [2] %bb3.i