diff --git a/llvm/test/Transforms/Inline/inline_nossp.ll b/llvm/test/Transforms/Inline/inline_nossp.ll
--- a/llvm/test/Transforms/Inline/inline_nossp.ll
+++ b/llvm/test/Transforms/Inline/inline_nossp.ll
@@ -1,14 +1,17 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -inline -o - -S %s -pass-remarks-missed=inline 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-INLINE %s
-; RUN: opt -passes='cgscc(inline)' %s -S -pass-remarks-missed=inline 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-INLINE %s
-; RUN: opt -always-inline -o - -S %s | FileCheck %s
-; RUN: opt -passes=always-inline -o - -S %s | FileCheck %s
+; RUN: opt -enable-new-pm=0 -inline -o - -S %s -pass-remarks-missed=inline 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-INLINE %s
+; RUN: opt -passes='cgscc(inline)' %s -S -pass-remarks-missed=inline 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-INLINE,CHECK-NPM %s
+; RUN: opt -enable-new-pm=0 -always-inline -o - -S %s | FileCheck %s --check-prefixes=CHECK,CHECK-AI-OPM
+; RUN: opt -passes=always-inline -o - -S %s | FileCheck --check-prefixes=CHECK,CHECK-NPM %s
 
 ; CHECK-INLINE: ssp not inlined into nossp_caller because it should never be inlined (cost=never): stack protected callee but caller requested no stack protector
 ; CHECK-INLINE: nossp not inlined into ssp_caller because it should never be inlined (cost=never): stack protected caller but callee requested no stack protector
 
 ; Not interesting to test.
 define i32 @nossp() { ret i32 41 }
+; CHECK-LABEL: @nossp(
+; CHECK-NEXT:    ret i32 41
+;
 define i32 @ssp() sspstrong { ret i32 42 }
 define i32 @nossp_alwaysinline() alwaysinline { ret i32 43 }
 define i32 @ssp_alwaysinline() sspstrong alwaysinline { ret i32 44 }
@@ -17,7 +20,8 @@
 ; @ssp_alwaysinline should be inlined due to alwaysinline.
 define i32 @nossp_caller() {
 ; CHECK-LABEL: @nossp_caller(
-; CHECK-NEXT:    [[TMP1:%.*]] = call i32 @ssp()
+; CHECK-NPM-NEXT:    [[TMP1:%.*]] = call i32 @ssp()
+; CHECK-AI-OPM-NEXT: [[TMP1:%.*]] = call i32 @ssp()
 ; CHECK-NEXT:    ret i32 44
 ;
   call i32 @ssp()