diff --git a/regress/renumber-window-limit.sh b/regress/renumber-window-limit.sh
index 6224df7ff..a0ca8a828 100644
--- a/regress/renumber-window-limit.sh
+++ b/regress/renumber-window-limit.sh
@@ -6,7 +6,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -LtestRWL$$"
+TMUX="$TEST_TMUX -LtestRWLA$$"
 $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
@@ -28,6 +28,9 @@ echo $($TMUX lsw -t a -F'#{window_index}') >$TMP
 (echo "10 11"|cmp -s - $TMP) || exit 1
 $TMUX kill-server 2>/dev/null
 
+# Use a different socket because the previous server may still be exiting.
+TMUX="$TEST_TMUX -LtestRWLB$$"
+
 cat <<EOF >$CONF
 set -g base-index 2147483646
 set -g renumber-windows on