diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dc921257de1..cd62633f35c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/batch-preserve-term-settings.exp (spawn_shell): Fix
+	matching of initial prompt.
+
 2021-06-08  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.threads/multi-create-ns-info-thr.exp: Limit breakpoint regexp to
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index da39485c00d..1f042097a06 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -44,10 +44,20 @@ proc spawn_shell {} {
 
     send_gdb "PS1=\"$shell_prompt_ps1\"\n"
 
+    # Try to match:
+    #   PS1="gdb-subshell$ "^M
+    #   $ gdb-subshell$ 
+    # or:
+    #   PS1="gdb-subshell$ "^M
+    #   sh-4.4$ PS1="gdb-subshell$ "^M
+    #   gdb-subshell$ 
     set gotit 0
     set test "spawn shell"
     gdb_expect {
-	-re "PS1=\[^\r\n\]*\r\n.*$shell_prompt_re$" {
+	-re "PS1=\"$shell_prompt_re" {
+	    exp_continue
+	}
+	-re "$shell_prompt_re$" {
 	    pass $test
 	    set gotit 1
 	}