diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestContinue.py b/lldb/test/API/functionalities/gdb_remote_client/TestContinue.py
index f0f0df81d321d..8d26cfbfdcc4e 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestContinue.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestContinue.py
@@ -38,6 +38,8 @@ def qfThreadInfo(self):
         self.runCmd("platform select remote-linux")
         target = self.createTarget("a.yaml")
         process = self.connect(target)
+        lldbutil.expect_state_changes(self, self.dbg.GetListener(), process,
+                                      [lldb.eStateExited])
         self.assertPacketLogContains(["vCont;C13:401"])
 
     def test_continue_no_vCont(self):
@@ -55,6 +57,8 @@ def other(self, packet):
         self.runCmd("platform select remote-linux")
         target = self.createTarget("a.yaml")
         process = self.connect(target)
+        lldbutil.expect_state_changes(self, self.dbg.GetListener(), process,
+                                      [lldb.eStateExited])
         self.assertPacketLogContains(["Hc401", "C13"])
 
     def test_continue_multiprocess(self):
@@ -65,4 +69,6 @@ class MyResponder(self.BaseResponder):
         self.runCmd("platform select remote-linux")
         target = self.createTarget("a.yaml")
         process = self.connect(target)
+        lldbutil.expect_state_changes(self, self.dbg.GetListener(), process,
+                                      [lldb.eStateExited])
         self.assertPacketLogContains(["vCont;C13:p400.401"])