diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
index 011dabce6e9dd..4d86ac5daa68c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
@@ -231,9 +231,8 @@ def cleanup():
                 0) == 122,
             '*a_ptr = 122')
 
-        self.runCmd("n")
-        self.runCmd("n")
-        self.runCmd("n")
+        ret = line_number("main.cpp", "Done initializing")
+        self.runCmd("thread until " + str(ret))
 
         self.expect("frame variable numbers",
                     substrs=['1', '2', '3', '4', '5'])
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp
index 1b8ce48041f9e..4ca2504ff8cb5 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
 	foo1.b.i = 9999;
 	
 	int numbers[5] = {1,2,3,4,5};
-	
-	return 0;
-	
+
+	return 0; // Done initializing
+
 }