diff --git a/regress/new-pane-mouse-status.sh b/regress/new-pane-mouse-status.sh
index 1c923c7ba..3048cb530 100644
--- a/regress/new-pane-mouse-status.sh
+++ b/regress/new-pane-mouse-status.sh
@@ -39,6 +39,20 @@ wait_status()
 	fail "status lines were not redrawn"
 }
 
+wait_option()
+{
+	option=$1
+	want=$2
+	i=0
+	while [ "$i" -lt 100 ]; do
+		got=$($TMUX show -gv "$option" 2>/dev/null)
+		[ "$got" = "$want" ] && return
+		sleep 0.05
+		i=$((i + 1))
+	done
+	fail "got $option '$got', expected '$want'"
+}
+
 mouse()
 {
 	seq=$(printf '\033[<%s;%s;%s%s' "$1" "$2" "$3" "$4")
@@ -100,16 +114,17 @@ wait_status
 
 row=1
 for range in window pane control; do
+	$TMUX set -g @status-range '' || exit 1
 	mouse 0 10 "$row" M
 	mouse 0 10 "$row" m
-	got=$($TMUX show -gv @status-range)
-	[ "$got" = "$range" ] || fail "got range '$got', expected '$range'"
+	wait_option @status-range "$range"
+
 	$TMUX set -g @status-drag '' || exit 1
 	check_drag "$row" 9
-	got=$($TMUX show -gv @status-drag)
 	want=status
 	[ "$range" = control ] && want=control
-	[ "$got" = "$want" ] || fail "got drag '$got', expected '$want'"
+	wait_option @status-drag "$want"
+
 	row=$((row + 1))
 done
 
diff --git a/regress/tty-keys-replies.sh b/regress/tty-keys-replies.sh
index 515049011..b49f2247b 100644
--- a/regress/tty-keys-replies.sh
+++ b/regress/tty-keys-replies.sh
@@ -78,7 +78,7 @@ for name, report in reports:
                 if delivery == "expired":
                     run("set-option", "-s", "escape-time", "100")
                 else:
-                    run("set-option", "-s", "escape-time", "5000")
+                    run("set-option", "-s", "escape-time", "60000")
                 run("set-option", "-g", "@seen", "")
                 run("bind-key", "-n", "Escape", "set-option", "-gF",
                     "@seen", "#{@seen}E")