diff --git a/llvm/test/Other/2009-03-31-CallGraph.ll b/llvm/test/Other/2009-03-31-CallGraph.ll
--- a/llvm/test/Other/2009-03-31-CallGraph.ll
+++ b/llvm/test/Other/2009-03-31-CallGraph.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 define void @f2() personality i32 (...)* @__gxx_personality_v0 {
     invoke void @f6()
         to label %ok1 unwind label %lpad1
diff --git a/llvm/test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll b/llvm/test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll
--- a/llvm/test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll
+++ b/llvm/test/Transforms/Inline/2004-04-20-InlineLinkOnce.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 
 define linkonce void @caller() {
         call void @callee( )
diff --git a/llvm/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll b/llvm/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
--- a/llvm/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
+++ b/llvm/test/Transforms/Inline/2006-01-14-CallGraphUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 
         %"struct.std::__codecvt_abstract_base<char,char,__mbstate_t>" = type { %"struct.std::locale::facet" }
         %"struct.std::basic_streambuf<wchar_t,std::char_traits<wchar_t> >" = type { i32 (...)**, i32*, i32*, i32*, i32*, i32*, i32*, %"struct.std::locale" }
diff --git a/llvm/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll b/llvm/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
--- a/llvm/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
+++ b/llvm/test/Transforms/Inline/2006-07-12-InlinePruneCGUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 ; PR827
 @_ZTV8CRjii = internal global [1 x i32 (...)*] [ i32 (...)* @_ZN8CRjii12NlFeeEPN5Jr7sE ]		; <[1 x i32 (...)*]*> [#uses=0]
 
diff --git a/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll b/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
--- a/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
+++ b/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 ; PR993
 target datalayout = "e-p:32:32"
 target triple = "i386-unknown-openbsd3.9"
diff --git a/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll b/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
--- a/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
+++ b/llvm/test/Transforms/Inline/2006-11-09-InlineCGUpdate.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -prune-eh -disable-output
+; RUN: opt < %s -inline -prune-eh -disable-output -enable-new-pm=0
 ; PR992
 target datalayout = "e-p:32:32"
 target triple = "i686-pc-linux-gnu"
diff --git a/llvm/test/Transforms/JumpThreading/pr26096.ll b/llvm/test/Transforms/JumpThreading/pr26096.ll
--- a/llvm/test/Transforms/JumpThreading/pr26096.ll
+++ b/llvm/test/Transforms/JumpThreading/pr26096.ll
@@ -1,4 +1,4 @@
-; RUN: opt -prune-eh -inline -jump-threading -S < %s | FileCheck %s
+; RUN: opt -prune-eh -inline -jump-threading -S -enable-new-pm=0 < %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/PruneEH/2008-06-02-Weak.ll b/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll
--- a/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll
+++ b/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -prune-eh -S | FileCheck %s
+; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s
 ; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 ; We should not infer 'nounwind' for/from a weak function,
diff --git a/llvm/test/Transforms/PruneEH/ipo-nounwind.ll b/llvm/test/Transforms/PruneEH/ipo-nounwind.ll
--- a/llvm/test/Transforms/PruneEH/ipo-nounwind.ll
+++ b/llvm/test/Transforms/PruneEH/ipo-nounwind.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -prune-eh < %s | FileCheck %s
+; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck %s
 ; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck %s
 
 declare void @may_throw()
diff --git a/llvm/test/Transforms/PruneEH/looptest.ll b/llvm/test/Transforms/PruneEH/looptest.ll
--- a/llvm/test/Transforms/PruneEH/looptest.ll
+++ b/llvm/test/Transforms/PruneEH/looptest.ll
@@ -1,4 +1,5 @@
-; RUN: opt < %s -prune-eh -S | FileCheck %s
+; RUN: opt < %s -prune-eh -S -enable-new-pm=0 | FileCheck %s
+; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 declare void @nounwind() nounwind
 
diff --git a/llvm/test/Transforms/PruneEH/musttail.ll b/llvm/test/Transforms/PruneEH/musttail.ll
--- a/llvm/test/Transforms/PruneEH/musttail.ll
+++ b/llvm/test/Transforms/PruneEH/musttail.ll
@@ -1,4 +1,5 @@
-; RUN: opt -prune-eh -S < %s | FileCheck %s
+; RUN: opt -prune-eh -enable-new-pm=0 -S < %s | FileCheck %s
+; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 declare void @noreturn()
 
diff --git a/llvm/test/Transforms/PruneEH/operand-bundles.ll b/llvm/test/Transforms/PruneEH/operand-bundles.ll
--- a/llvm/test/Transforms/PruneEH/operand-bundles.ll
+++ b/llvm/test/Transforms/PruneEH/operand-bundles.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -prune-eh -S | FileCheck %s
+; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s
 ; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 declare void @nounwind() nounwind
diff --git a/llvm/test/Transforms/PruneEH/pr23971.ll b/llvm/test/Transforms/PruneEH/pr23971.ll
--- a/llvm/test/Transforms/PruneEH/pr23971.ll
+++ b/llvm/test/Transforms/PruneEH/pr23971.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -prune-eh < %s | FileCheck %s
+; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck %s
 ; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/Transforms/PruneEH/pr26263.ll b/llvm/test/Transforms/PruneEH/pr26263.ll
--- a/llvm/test/Transforms/PruneEH/pr26263.ll
+++ b/llvm/test/Transforms/PruneEH/pr26263.ll
@@ -2,7 +2,7 @@
 ; so it leaves some of the unreachable stuff hanging around.
 ; Checking it with CHECK-OLD.
 ;
-; RUN: opt -prune-eh -S < %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-OLD
+; RUN: opt -prune-eh -enable-new-pm=0 -S < %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-OLD
 ; RUN: opt -passes='function-attrs,function(simplify-cfg)' -S < %s | FileCheck %s  --check-prefix=CHECK --check-prefix=CHECK-NEW
 
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
diff --git a/llvm/test/Transforms/PruneEH/recursivetest.ll b/llvm/test/Transforms/PruneEH/recursivetest.ll
--- a/llvm/test/Transforms/PruneEH/recursivetest.ll
+++ b/llvm/test/Transforms/PruneEH/recursivetest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -prune-eh -S | FileCheck %s
+; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s
 ; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 ; CHECK-LABEL: define internal i32 @foo()
diff --git a/llvm/test/Transforms/PruneEH/seh-nounwind.ll b/llvm/test/Transforms/PruneEH/seh-nounwind.ll
--- a/llvm/test/Transforms/PruneEH/seh-nounwind.ll
+++ b/llvm/test/Transforms/PruneEH/seh-nounwind.ll
@@ -1,4 +1,4 @@
-; RUN: opt -S -prune-eh < %s | FileCheck %s
+; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck %s
 ; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck %s
 
 ; Don't remove invokes of nounwind functions if the personality handles async
diff --git a/llvm/test/Transforms/PruneEH/simplenoreturntest.ll b/llvm/test/Transforms/PruneEH/simplenoreturntest.ll
--- a/llvm/test/Transforms/PruneEH/simplenoreturntest.ll
+++ b/llvm/test/Transforms/PruneEH/simplenoreturntest.ll
@@ -1,13 +1,13 @@
-; RUN: opt < %s -prune-eh -S | not grep "ret i32"
+; RUN: opt < %s -prune-eh -S -enable-new-pm=0 | not grep "ret i32"
 
 declare void @noreturn() noreturn
 
 define i32 @caller() {
-	call void @noreturn( )
+	call void @noreturn()
 	ret i32 17
 }
 
 define i32 @caller2() {
-	%T = call i32 @caller( )		; <i32> [#uses=1]
+	%T = call i32 @caller()
 	ret i32 %T
 }
diff --git a/llvm/test/Transforms/PruneEH/simpletest.ll b/llvm/test/Transforms/PruneEH/simpletest.ll
--- a/llvm/test/Transforms/PruneEH/simpletest.ll
+++ b/llvm/test/Transforms/PruneEH/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -prune-eh -S | FileCheck %s
+; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s
 ; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s
 
 declare void @nounwind() nounwind