diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 76f57e13c4..4fd53449d7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-23  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.server/connect-stopped-target.exp (do_test): Pass "" to
+	gdbserver_spawn.
+	* gdb.server/connect-without-multi-process.exp (do_test):
+	Likewise.
+
 2016-08-23  Yao Qi  <yao.qi@linaro.org>
 
 	* gdb.base/signals-state-child.exp: Set variables gdb_txt and
diff --git a/gdb/testsuite/gdb.server/connect-stopped-target.exp b/gdb/testsuite/gdb.server/connect-stopped-target.exp
index b083d899c7..9e445b041d 100644
--- a/gdb/testsuite/gdb.server/connect-stopped-target.exp
+++ b/gdb/testsuite/gdb.server/connect-stopped-target.exp
@@ -44,7 +44,7 @@ proc do_test {nonstop} {
 
     gdb_test "set non-stop $nonstop"
 
-    set res [gdbserver_spawn ${binfile}]
+    set res [gdbserver_spawn ""]
     set gdbserver_protocol [lindex $res 0]
     set gdbserver_gdbport [lindex $res 1]
 
diff --git a/gdb/testsuite/gdb.server/connect-without-multi-process.exp b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
index 79d7d72699..2e9769bec6 100644
--- a/gdb/testsuite/gdb.server/connect-without-multi-process.exp
+++ b/gdb/testsuite/gdb.server/connect-without-multi-process.exp
@@ -41,7 +41,7 @@ proc do_test {multiprocess} {
 
     gdb_test_no_output "set remote multiprocess-feature $multiprocess"
 
-    set res [gdbserver_spawn ${binfile}]
+    set res [gdbserver_spawn ""]
     set gdbserver_protocol [lindex $res 0]
     set gdbserver_gdbport [lindex $res 1]