diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp
index b68dcb532b4..5ec7f8ddc6d 100644
--- a/gdb/testsuite/gdb.ada/mi_prot.exp
+++ b/gdb/testsuite/gdb.ada/mi_prot.exp
@@ -41,7 +41,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 set line [gdb_get_line_number "STOP" ${testdir}/prot.adb]
-mi_continue_to_line $line "continue to protected method"
+mi_continue_to_line "$srcfile:$line" "continue to protected method"
 
 # The bug was that this crashed.
 mi_gdb_test "-stack-list-arguments --no-frame-filters 1" \
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 857a04519cf..701c53f1321 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1802,13 +1802,13 @@ proc mi_get_inline_test {testcase} {
 }
 
 # Sets temporary breakpoint at LOCATION.
-proc mi_tbreak {location} {
+proc mi_tbreak {location test} {
 
     global mi_gdb_prompt
 
     mi_gdb_test "-break-insert -t $location" \
 	{\^done,bkpt=.*} \
-	"run to $location (set breakpoint)"
+	$test
 }
 
 # Send COMMAND that must be a command that resumes
@@ -1864,10 +1864,10 @@ proc mi_send_resuming_command {command test} {
 # be determined.
 # Does not check that the line is the same as requested.
 # The caller can check itself if required.
-proc mi_continue_to_line {location test} {
+proc_with_prefix mi_continue_to_line {location test} {
 
-    mi_tbreak $location
-    mi_send_resuming_command "exec-continue" "run to $location (exec-continue)"
+    mi_tbreak $location "set temporary breakpoint"
+    mi_send_resuming_command "exec-continue" "continue to breakpoint"
     return [mi_get_stop_line $test]
 }
 
@@ -1954,7 +1954,7 @@ proc mi_run_inline_test { testcase } {
 
 	if {$first==1} {
 	    # Start the program afresh.
-	    mi_tbreak "$mi_autotest_source:$line"
+	    mi_tbreak "$mi_autotest_source:$line" "set temporary breakpoint"
 	    if { [mi_run_cmd] < 0 } {
 		return -1
 	    }