diff --git a/regress/input-requests.sh b/regress/input-requests.sh
index 5cb348760..e020ae607 100644
--- a/regress/input-requests.sh
+++ b/regress/input-requests.sh
@@ -70,7 +70,6 @@ def wait_file(path, length, timeout=5):
 
 def respawn(command):
     run("respawn-window", "-k", "-t", "requests:0", command)
-    time.sleep(0.2)
 
 def wait_pane(expected, context):
     end = time.monotonic() + 5
diff --git a/regress/new-pane-mouse-status.sh b/regress/new-pane-mouse-status.sh
index 88fa312f9..1c923c7ba 100644
--- a/regress/new-pane-mouse-status.sh
+++ b/regress/new-pane-mouse-status.sh
@@ -23,6 +23,22 @@ fail()
 	exit 1
 }
 
+wait_status()
+{
+	i=0
+	while [ "$i" -lt 100 ]; do
+		screen=$($TMUX2 capture-pane -p -t outer:0.0) || exit 1
+		if printf '%s\n' "$screen" | grep -q 'WINDOW WINDOW WINDOW' &&
+		    printf '%s\n' "$screen" | grep -q 'PANE PANE PANE PANE' &&
+		    printf '%s\n' "$screen" | grep -q 'CONTROL CONTROL CONTROL'; then
+			return
+		fi
+		sleep 0.05
+		i=$((i + 1))
+	done
+	fail "status lines were not redrawn"
+}
+
 mouse()
 {
 	seq=$(printf '\033[<%s;%s;%s%s' "$1" "$2" "$3" "$4")
@@ -80,7 +96,7 @@ $TMUX bind -n MouseDown1Status set -gF @status-range '#{mouse_status_range}' ||
 $TMUX bind -n MouseDown1Control0 set -gF @status-range '#{mouse_status_range}' || exit 1
 $TMUX bind -n C-MouseDrag1Status set -g @status-drag status || exit 1
 $TMUX bind -n C-MouseDrag1Control0 set -g @status-drag control || exit 1
-sleep 0.5
+wait_status
 
 row=1
 for range in window pane control; do
diff --git a/regress/tty-keys-replies.sh b/regress/tty-keys-replies.sh
index 292f43fd3..515049011 100644
--- a/regress/tty-keys-replies.sh
+++ b/regress/tty-keys-replies.sh
@@ -75,7 +75,10 @@ for name, report in reports:
                     "-y", "24", "stty raw -echo; exec cat -v")
                 run("set-option", "-g", "status", "off")
                 run("set-option", "-g", "assume-paste-time", "0")
-                run("set-option", "-s", "escape-time", "1000")
+                if delivery == "expired":
+                    run("set-option", "-s", "escape-time", "100")
+                else:
+                    run("set-option", "-s", "escape-time", "5000")
                 run("set-option", "-g", "@seen", "")
                 run("bind-key", "-n", "Escape", "set-option", "-gF",
                     "@seen", "#{@seen}E")