diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3a48bcd0248..3c8ecc01a47 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-22  Yao Qi  <yao.qi@linaro.org>
+
+	* boards/remote-gdbserver-on-localhost.exp: Add comments.
+
 2015-06-22  Yao Qi  <yao.qi@linaro.org>
 
 	* lib/gdb.exp (skip_hw_breakpoint_tests): Return 0 for target
diff --git a/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp b/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp
index 6a42b901db0..138782c1a40 100644
--- a/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp
+++ b/gdb/testsuite/boards/remote-gdbserver-on-localhost.exp
@@ -27,6 +27,9 @@ set_board_info compiler  "[find_gcc]"
 
 process_multilib_options ""
 
+# The sshd should be running on localhost and ssh key should be
+# correctly set up that you ssh to localhost without having to type
+# password.
 set_board_info rcp_prog "/usr/bin/scp"
 set_board_info rsh_prog "/usr/bin/ssh"
 set_board_info protocol standard