diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9e1d61f726a..b7c2e7222ab 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-05  Mark Wielaard  <mark@klomp.org>
+
+	* lib/valgrind.exp (vgdb_start): Add --wait=1 to vgdbcmd.
+
 2021-03-06  Weimin Pan  <weimin.pan@oracle.com>
 
 	* gdb.base/ctf-ptype.exp: Add function tests and fix typos.
diff --git a/gdb/testsuite/lib/valgrind.exp b/gdb/testsuite/lib/valgrind.exp
index c0b4dc720a8..c214491f7b8 100644
--- a/gdb/testsuite/lib/valgrind.exp
+++ b/gdb/testsuite/lib/valgrind.exp
@@ -87,7 +87,7 @@ proc vgdb_start { {active_at_startup 1} } {
     # gdbserver and connect to it.
     gdb_test "disconnect" ".*"
 
-    set vgdbcmd "target remote | vgdb --pid=$vgdbpid"
+    set vgdbcmd "target remote | vgdb --wait=1 --pid=$vgdbpid"
     if { $active_at_startup } {
 	gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb"
     } else {