diff --git a/src/server/testsuite/config/unix.exp b/src/server/testsuite/config/unix.exp
index 8c3c7edb6a32f2b1b63585a8cdca348e2fd01981..e302770b24696dd34354cc95e85bff030fbdf23e 100644
--- a/src/server/testsuite/config/unix.exp
+++ b/src/server/testsuite/config/unix.exp
@@ -53,7 +53,7 @@ set clientport 53262
 set aux_item_default_conf_file "$top_srcdir/run-support/aux-items.conf"
 
 # Fix the tty settings for minimum impact on the data flow.
-set stty_init "-echo -onlcr -ocrnl -istrip"
+set stty_init "-echo -onlcr -istrip -isig erase ^- kill ^- werase ^-"
 
 # State variables.
 set line_leader ""
@@ -246,8 +246,8 @@ proc unanchored_expect {regex testname} {
 	    fail "$test (unexpected line '$expect_out(1,string)' waiting for '$regex')"
 	    exp_continue
 	}
-	-re "($any*)l2g>" {
-	    fail "$test (unexpected incomplete line '\$expect_out(1,string)' waiting for '$regex')"
+	-re "($any*)l2g> " {
+	    fail "$test (unexpected incomplete line '$expect_out(1,string)' waiting for '$regex')"
 	}
     }
     unset test