diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 75e500ad9e0..1524b829c87 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-07  Tom de Vries  <tdevries@suse.de>
+
+	PR testsuite/27908
+	* gdb.base/run-attach-while-running.exp (test): Don't match prompt
+	after attach using '$gdb_prompt $'.
+
 2021-06-07  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/info-types.exp.tcl: Remove "File .*" matching from regexp
diff --git a/gdb/testsuite/gdb.base/run-attach-while-running.exp b/gdb/testsuite/gdb.base/run-attach-while-running.exp
index 7c16aa6f5c4..1cc754a87ee 100644
--- a/gdb/testsuite/gdb.base/run-attach-while-running.exp
+++ b/gdb/testsuite/gdb.base/run-attach-while-running.exp
@@ -33,6 +33,8 @@ unset binfile
 #   - run-or-attach: "run" or "attach"
 
 proc_with_prefix test { non-stop threaded run-or-attach } {
+    global gdb_prompt
+
     if { ${run-or-attach} == "attach" && ![can_spawn_for_attach] } {
 	unsupported "attach not supported"
 	return
@@ -91,7 +93,11 @@ proc_with_prefix test { non-stop threaded run-or-attach } {
 	set test_spawn_id [spawn_wait_for_attach $::binfile]
 	set test_pid [spawn_id_get_pid $test_spawn_id]
 
-	gdb_test "attach $test_pid" "Attaching to program: .*" "attach to process"
+	gdb_test_multiple "attach $test_pid" "attach to process" {
+	    -re "Attaching to program: .*$gdb_prompt " {
+		pass $gdb_test_name
+	    }
+	}
 
 	gdb_exit
 	kill_wait_spawned_process $test_spawn_id