diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 326ba47961f..2be97a2f394 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-05  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/fork-plus-threads.exp: Handle "New LWP <n>" and
+	"LWP <n> exited" messages.
+
 2021-05-04  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* gdb.python/py-type.exp (test_fields): Test calling fields on
diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index f5cfb279ce7..7fe3c603bcd 100644
--- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
@@ -87,11 +87,11 @@ proc do_test { detach-on-fork } {
 	    set saw_thread_stopped 1
 	    exp_continue
 	}
-	-re "Thread \[^\r\n\]+ exited" {
+	-re "(Thread|LWP) \[^\r\n\]+ exited" {
 	    # Avoid timeout with check-read1
 	    exp_continue
 	}
-	-re "New Thread \[^\r\n\]+" {
+	-re "New (Thread|LWP) \[^\r\n\]+" {
 	    # Avoid timeout with check-read1
 	    exp_continue
 	}