diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c4338ff49e..ec99787cd5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-04  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.mi/mi-breakpoint-changed.exp: Add some with_test_prefix.
+	(test_insert_delete_modify): Call mi_load_shlibs before trying to
+	run.
+
 2016-04-01  Artemiy Volkov  <artemiyv@acm.org>
 
 	PR gdb/19820
diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
index c12f8b8789..cda8c4a3e2 100644
--- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
+++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp
@@ -45,12 +45,15 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""
 
 proc test_insert_delete_modify { } {
     global mi_gdb_prompt
+    global lib_sl1 lib_sl2
 
     gdb_exit
     if [mi_gdb_start] {
 	continue
     }
 
+    mi_load_shlibs $lib_sl1 $lib_sl2
+
     mi_run_to_main
 
     mi_gdb_test "break marker" \
@@ -150,7 +153,9 @@ proc test_insert_delete_modify { } {
     }
 }
 
-test_insert_delete_modify
+with_test_prefix "test_insert_delete_modify" {
+    test_insert_delete_modify
+}
 
 # Test 'breakpoint-modified' notification is emited when pending breakpoints are
 # resolved.
@@ -251,4 +256,6 @@ proc test_pending_resolved { } {
     }
 }
 
-test_pending_resolved
+with_test_prefix "test_pending_resolved" {
+    test_pending_resolved
+}