diff --git a/lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s b/lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s
--- a/lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s
+++ b/lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s
@@ -10,6 +10,7 @@
 # Executing 'thread step-out' here will initially attempt to write a
 # breakpoint to that stack address, but should fail because of the executable
 # memory check.
+nonstandard_stub:
 _nonstandard_stub:
         mov (%rsp), %rdi
         mov (%rdi), %rsi
@@ -18,3 +19,5 @@
 
         add $0x10, %rsp
         ret
+
+        .section .note.GNU-stack,"",@progbits
diff --git a/lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test b/lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test
--- a/lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test
+++ b/lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test
@@ -7,7 +7,7 @@
 # RUN: %lldb %t -s %s -b 2>&1 | FileCheck %s
 
 breakpoint set -n nonstandard_stub
-# CHECK: Breakpoint 1: where = {{.*}}`nonstandard_stub
+# CHECK: Breakpoint 1: where = {{.*`_?}}nonstandard_stub
 
 process launch
 # CHECK: stop reason = breakpoint 1.1