diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 570ba5396d..ec7a8197a5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-13  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* lib/gdbserver-support.exp (gdbserver_start): Expect for the
+	message "No address associated with hostname" when gdbserver
+	cannot resolve the hostname.
+
 2018-07-12  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
 	* gdb.threads/pthreads.exp: Test qcs FLAG arguments.
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index ed9b31b3ab..a0ba4673c8 100644
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -326,7 +326,7 @@ proc gdbserver_start { options arguments } {
 		    continue
 		}
 	    }
-	    -re ".*: cannot resolve name: Name or service not known\r\n" {
+	    -re ".*: cannot resolve name: \(No address associated with hostname|Name or service not known\)\r\n" {
 		error "gdbserver cannot resolve name."
 	    }
 	    timeout {