diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 447578ee6f..99d1e8530f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-24  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/valgrind-db-attach.exp: Handle removed support for
+	--db-attach in valgrind.
+
 2018-10-23  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.arch/riscv-reg-aliases.c: New file.
diff --git a/gdb/testsuite/gdb.base/valgrind-db-attach.exp b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
index 3be6af5ca9..3e40283a95 100644
--- a/gdb/testsuite/gdb.base/valgrind-db-attach.exp
+++ b/gdb/testsuite/gdb.base/valgrind-db-attach.exp
@@ -51,6 +51,10 @@ set use_gdb_stub 1
 set test "valgrind started"
 # The trailing '.' differs for different memcheck versions.
 gdb_test_multiple "" $test {
+    -re "valgrind: Unknown option: --db-attach=yes" {
+	unsupported $test
+	return -1
+    }
     -re "Memcheck, a memory error detector\\.?\r\n" {
 	pass $test
     }