diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp
index c33c11d8cc82d..a07025dc283bf 100644
--- a/lldb/source/Target/ThreadPlanStepOut.cpp
+++ b/lldb/source/Target/ThreadPlanStepOut.cpp
@@ -431,8 +431,10 @@ bool ThreadPlanStepOut::ShouldStop(Event *event_ptr) {
     else
       return m_step_through_inline_plan_sp->ShouldStop(event_ptr);
   } else if (m_step_out_further_plan_sp) {
-    if (m_step_out_further_plan_sp->MischiefManaged())
+    if (m_step_out_further_plan_sp->MischiefManaged()) {
       m_step_out_further_plan_sp.reset();
+      done = true;
+    }
     else
       return m_step_out_further_plan_sp->ShouldStop(event_ptr);
   }
diff --git a/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py b/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
index 84d2cd30f9b63..5844023cebc1f 100644
--- a/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
+++ b/lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
@@ -3,7 +3,6 @@
 from lldbsuite.test.decorators import *
 import lldbsuite.test.lldbutil as lldbutil
 
-@skipIf(bugnumber = "rdar://159531304")
 class TestSwiftObjcProtocol(TestBase):
     def skip_debug_info_libraries(self):
         if platform.system() == "Darwin":
diff --git a/lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py b/lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py
index 0a97a07585549..6ec75a637543d 100644
--- a/lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py
+++ b/lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py
@@ -5,7 +5,6 @@
 import os
 import platform
 
-@skipIf(bugnumber ="rdar://159531310")
 class TestStepThroughAllocatingInit(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 
diff --git a/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py b/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
index e247559ef50e2..2d654d28cfbbb 100644
--- a/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
+++ b/lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
@@ -19,7 +19,6 @@
 import os
 import platform
 
-@skipIf(bugnumber="rdar://159531088")
 class TestSwiftStepping(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)