diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3fc26805a8..4d2933c4e1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* lib/gdbserver-support.exp (gdbserver_start): Set timeout to
+	120 on waiting for the TCP socket to open.
+
 2014-09-09  Doug Evans  <xdje42@gmail.com>
 
 	* gdb.base/default.exp (show_conv_list): Add _caller_is,
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 8c91e281f2..e3cae631b1 100644
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -275,6 +275,7 @@ proc gdbserver_start { options arguments } {
 	# Wait for the server to open its TCP socket, so that GDB can connect.
 	expect {
 	    -i $server_spawn_id
+	    -timeout 120
 	    -notransfer
 	    -re "Listening on" { }
 	    -re "Can't bind address: Address already in use\\.\r\n" {