Index: test/functionalities/process_group/TestChangeProcessGroup.py
===================================================================
--- test/functionalities/process_group/TestChangeProcessGroup.py
+++ test/functionalities/process_group/TestChangeProcessGroup.py
@@ -91,7 +91,12 @@
         thread = process.GetSelectedThread()
         # this gives a chance for the thread to exit the sleep syscall and sidesteps
         # <https://llvm.org/bugs/show_bug.cgi?id=23659> on linux
-        thread.StepInstruction(False)
+        # thread.StepInstruction(False)
+        while True:
+            frame = thread.GetSelectedFrame()
+            if frame.GetFunctionName() == 'main':
+                break
+            thread.StepOutOfFrame(frame)
 
         # release the child from its loop
         self.expect("expr release_child_flag = 1", substrs = ["= 1"])