diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 276749ecf9..87f6c98125 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Pedro Alves  <palves@redhat.com>
+
+	* lib/gdb.exp (delete_breakpoints): Rewrite using
+	gdb_test_multiple.
+
 2015-02-23  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/info-os.c: Include stdlib.h.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index bbc657c885..08db806c79 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -181,25 +181,35 @@ proc delete_breakpoints {} {
     # we need a larger timeout value here or this thing just confuses
     # itself.  May need a better implementation if possible. - guo
     #
-    send_gdb "delete breakpoints\n"
-    gdb_expect 100 {
-	 -re "Delete all breakpoints.*y or n.*$" {
+    set timeout 100
+
+    set msg "delete all breakpoints in delete_breakpoints"
+    set deleted 0
+    gdb_test_multiple "delete breakpoints" "$msg" {
+	-re "Delete all breakpoints.*y or n.*$" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	 -re "$gdb_prompt $" { # This happens if there were no breakpoints
-	    }
-	 timeout { perror "Delete all breakpoints in delete_breakpoints (timeout)" ; return }
+	-re "$gdb_prompt $" {
+	    set deleted 1
+	}
     }
-    send_gdb "info breakpoints\n"
-    gdb_expect 100 {
-	 -re "No breakpoints or watchpoints..*$gdb_prompt $" {}
-	 -re "$gdb_prompt $" { perror "breakpoints not deleted" ; return }
-	 -re "Delete all breakpoints.*or n.*$" {
-	    send_gdb "y\n"
-	    exp_continue
+
+    if {$deleted} {
+	# Confirm with "info breakpoints".
+	set deleted 0
+	set msg "info breakpoints"
+	gdb_test_multiple $msg $msg {
+	    -re "No breakpoints or watchpoints..*$gdb_prompt $" {
+		set deleted 1
+	    }
+	    -re "$gdb_prompt $" {
+	    }
 	}
-	 timeout { perror "info breakpoints (timeout)" ; return }
+    }
+
+    if {!$deleted} {
+	perror "breakpoints not deleted"
     }
 }