Index: lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py
===================================================================
--- lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py
+++ lldb/trunk/test/tools/lldb-mi/TestMiPrompt.py
@@ -18,9 +18,6 @@
 
         self.spawnLldbMi(args = None)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that lldb-mi is ready after unknown command
         self.runCmd("-unknown-command")
         self.expect("\^error,msg=\"Driver\. Received command '-unknown-command'\. It was not handled\. Command 'unknown-command' not in Command Factory\"")
Index: lldb/trunk/test/tools/lldb-mi/data/TestMiData.py
===================================================================
--- lldb/trunk/test/tools/lldb-mi/data/TestMiData.py
+++ lldb/trunk/test/tools/lldb-mi/data/TestMiData.py
@@ -85,7 +85,6 @@
         """Test that -data-read-memory-bytes can access local buffers."""
 
         self.spawnLldbMi(args = None)
-        self.expect(self.child_prompt, exactly = True)
 
         # Load executable
         self.runCmd('-file-exec-and-symbols %s' % self.myexe)
Index: lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py
===================================================================
--- lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py
+++ lldb/trunk/test/tools/lldb-mi/lldbmi_testcase.py
@@ -36,6 +36,8 @@
             self.lldbMiExec, args if args else ""))
         self.child.setecho(True)
         self.child.logfile_read = open(self.mylog, "w")
+        # wait until lldb-mi has started up and is ready to go
+        self.expect(self.child_prompt, exactly = True)
 
     def runCmd(self, cmd):
         self.child.sendline(cmd)
Index: lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
===================================================================
--- lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ lldb/trunk/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
@@ -18,9 +18,6 @@
 
         self.spawnLldbMi(args = "%s" % self.myexe)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable is loaded when file was specified
         self.expect("-file-exec-and-symbols \"%s\"" % self.myexe)
         self.expect("\^done")
@@ -44,9 +41,6 @@
 
         self.spawnLldbMi(args = "%s" % path)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable isn't loaded when unknown file was specified
         self.expect("-file-exec-and-symbols \"%s\"" % path)
         self.expect("\^error,msg=\"Command 'file-exec-and-symbols'. Target binary '%s' is invalid. error: unable to find executable for '%s'\"" % (path, path))
@@ -66,9 +60,6 @@
 
         self.spawnLldbMi(args = "%s" % path)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable is loaded when file was specified using absolute path
         self.expect("-file-exec-and-symbols \"%s\"" % path)
         self.expect("\^done")
@@ -92,9 +83,6 @@
 
         self.spawnLldbMi(args = "%s" % path)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable is loaded when file was specified using relative path
         self.expect("-file-exec-and-symbols \"%s\"" % path)
         self.expect("\^done")
@@ -118,9 +106,6 @@
 
         self.spawnLldbMi(args = "%s" % path)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable isn't loaded when file was specified using unknown path
         self.expect("-file-exec-and-symbols \"%s\"" % path)
         self.expect("\^error,msg=\"Command 'file-exec-and-symbols'. Target binary '%s' is invalid. error: unable to find executable for '%s'\"" % (path, path))
@@ -241,9 +226,6 @@
         logDirectory = "."
         self.spawnLldbMi(args = "%s --log" % self.myexe)
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable is loaded when file was specified
         self.expect("-file-exec-and-symbols \"%s\"" % self.myexe)
         self.expect("\^done")
@@ -279,9 +261,6 @@
 
         self.spawnLldbMi(args = "%s --log --log-dir=%s" % (self.myexe,logDirectory))
 
-        # Test that lldb-mi is ready after startup
-        self.expect(self.child_prompt, exactly = True)
-
         # Test that the executable is loaded when file was specified
         self.expect("-file-exec-and-symbols \"%s\"" % self.myexe)
         self.expect("\^done")