Index: test/python_api/event/TestEvents.py
===================================================================
--- test/python_api/event/TestEvents.py
+++ test/python_api/event/TestEvents.py
@@ -272,7 +272,11 @@
                         match = pattern.search(desc)
                         if not match:
                             break;
-                        if self.context.state == 0 and match.group(1) == 'running':
+                        if match.group(1) == 'connected':
+                            # When debugging remote targets with lldb-server, we
+                            # first get the 'connected' event.
+                            pass
+                        elif self.context.state == 0 and match.group(1) == 'running':
                             self.context.state = 1
                             continue
                         elif self.context.state == 1 and match.group(1) == 'stopped':
@@ -281,7 +285,8 @@
                             break
                         else:
                             break
-                    print "Timeout: listener.WaitForEvent"
+                    else:
+                        print "Timeout: listener.WaitForEvent"
                     count = count + 1
                     if count > 6:
                         break