diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bf7e12beb6..79fc4c6030 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-18  Andrew Cagney  <ac131313@redhat.com>
+
+	* lib/mi-support.exp (mi_gdb_start): If a remote target, use the
+	CLI jump command to start it.
+	(mi_run_to_main): Fail immediatly when unexpected output.
+
 2001-08-18  Andrew Cagney  <ac131313@redhat.com>
 
 	* lib/mi-support.exp (mi_gdb_start): Move call to sid_start to
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index b3c01ec6db..76fad161a3 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -590,6 +590,18 @@ proc mi_run_cmd {args} {
 	    }
 	    return;
 	}
+
+	if [target_info exists gdb,start_symbol] {
+	    set start [target_info gdb,start_symbol];
+	} else {
+	    set start "start";
+	}
+
+	# HACK: Should either use 000-jump or fix the target code
+	# to better handle RUN.
+	send_gdb  "jump *$start\n"
+	warning "Using CLI jump command, expect run-to-main FAIL"
+	return
     }
 
     send_gdb "000-exec-run $args\n"
@@ -637,6 +649,9 @@ proc mi_run_to_main { } {
 	    pass "$test"
 	    return 0
 	}
+	-re ".*$mi_gdb_prompt$" {
+	    fail "$test (2)"
+	}
 	timeout {
 	    fail "$test (timeout)"
 	    return -1