diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c5cbe9aadd..9a8ca24be2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* lib/gdb.exp (gdb_run_cmd): Return on $gdb_prompt.
+	(runto): Catch "The target does not support running in non-stop mode.".
+
 2010-06-11  Michael Snyder  <msnyder@vmware.com>
 
 	* gdb.base/setshow.exp (set language asm): Don't use
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index eb949f8dd2..833fbf2e6d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -290,6 +290,9 @@ proc gdb_run_cmd {args} {
 	    exp_continue
 	}
 	-notransfer -re "Starting program: \[^\r\n\]*" {}
+	-notransfer -re "$gdb_prompt $" {
+	    # There is no more input expected.
+	}
     }
 }
 
@@ -416,6 +419,10 @@ proc runto { function args } {
 	-re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { 
 	    return 1
 	}
+	-re "The target does not support running in non-stop mode.\r\n$gdb_prompt $" {
+	    unsupported "Non-stop mode not supported"
+	    return 0
+	}
 	-re "$gdb_prompt $" { 
 	    fail "running to $function in runto"
 	    return 0