diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 671164cf450..eef5fdfdd46 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-30  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* lib/gdbserver-support.exp (gdbserver_start): Match any kind of
+	error after "cannot resolve name" string.
+
 2018-07-28  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.trace/tspeed.exp: Only call gdb_load_shlib after gdb has
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index a0ba4673c85..a741876a3a7 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: \(No address associated with hostname|Name or service not known\)\r\n" {
+	    -re ".*: cannot resolve name: .*\r\n" {
 		error "gdbserver cannot resolve name."
 	    }
 	    timeout {