diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e33cbd27b72..23eea6bf81f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-11  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.server/server-kill.exp: Remove "delete_breakpoints".
+
 2014-10-11  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.threads/thread-find.exp: Don't execute command
diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.server/server-kill.exp
index 5d31103ef66..b23c2b54d7f 100644
--- a/gdb/testsuite/gdb.server/server-kill.exp
+++ b/gdb/testsuite/gdb.server/server-kill.exp
@@ -33,10 +33,6 @@ gdb_test "disconnect" ".*"
 
 gdbserver_run ""
 
-# Otherwise the breakpoint at 'main' would not cause insert
-# breakpoints during first step.
-delete_breakpoints
-
 set server_pid [exp_pid -i [board_info target fileid]]
 remote_exec target "kill -9 $server_pid"