diff --git a/regress/cmd-client-argv.sh b/regress/cmd-client-argv.sh
index 193f8f8c0..4a9cd0b52 100755
--- a/regress/cmd-client-argv.sh
+++ b/regress/cmd-client-argv.sh
@@ -11,7 +11,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 # Multi-command argv: starts the server and runs all commands in order.
diff --git a/regress/cmd-command-alias.sh b/regress/cmd-command-alias.sh
index fbf01656f..36bc176a6 100755
--- a/regress/cmd-command-alias.sh
+++ b/regress/cmd-command-alias.sh
@@ -13,7 +13,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 CONF=$(mktemp)
diff --git a/regress/cmd-invoke-deferred.sh b/regress/cmd-invoke-deferred.sh
index 6eaf24c35..54545c6db 100755
--- a/regress/cmd-invoke-deferred.sh
+++ b/regress/cmd-invoke-deferred.sh
@@ -13,8 +13,8 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUT="$TEST_TMUX -Ltest -f/dev/null"
-IN="$TEST_TMUX -Ltest2 -f/dev/null"
+OUT="$TEST_TMUX -LtestA$$ -f/dev/null"
+IN="$TEST_TMUX -LtestB$$ -f/dev/null"
 
 $OUT kill-server 2>/dev/null
 $IN kill-server 2>/dev/null
diff --git a/regress/cmd-invoke-expand.sh b/regress/cmd-invoke-expand.sh
index 4ad188a1b..ad808a374 100755
--- a/regress/cmd-invoke-expand.sh
+++ b/regress/cmd-invoke-expand.sh
@@ -14,7 +14,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 CONF=$(mktemp)
diff --git a/regress/cmd-invoke-failure-scope.sh b/regress/cmd-invoke-failure-scope.sh
index 1e2c88c35..5260f21c3 100755
--- a/regress/cmd-invoke-failure-scope.sh
+++ b/regress/cmd-invoke-failure-scope.sh
@@ -14,7 +14,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 TMP=$(mktemp)
diff --git a/regress/cmd-invoke-hooks.sh b/regress/cmd-invoke-hooks.sh
index 461355125..8a7f74374 100755
--- a/regress/cmd-invoke-hooks.sh
+++ b/regress/cmd-invoke-hooks.sh
@@ -10,7 +10,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 $TMUX -f/dev/null start \; new-session -d -sfirst -nbase 2>/dev/null || exit 1
diff --git a/regress/cmd-invoke-readonly.sh b/regress/cmd-invoke-readonly.sh
index 7a843e587..fdff31e97 100755
--- a/regress/cmd-invoke-readonly.sh
+++ b/regress/cmd-invoke-readonly.sh
@@ -11,8 +11,8 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-OUT="$TEST_TMUX -Ltest -f/dev/null"
-IN="$TEST_TMUX -Ltest2 -f/dev/null"
+OUT="$TEST_TMUX -LtestA$$ -f/dev/null"
+IN="$TEST_TMUX -LtestB$$ -f/dev/null"
 
 $OUT kill-server 2>/dev/null
 $IN kill-server 2>/dev/null
diff --git a/regress/cmd-parse-errors.sh b/regress/cmd-parse-errors.sh
index e3e4e5a80..910d50aee 100755
--- a/regress/cmd-parse-errors.sh
+++ b/regress/cmd-parse-errors.sh
@@ -12,7 +12,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-TMUX="$TEST_TMUX -Ltest -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
 $TMUX -f/dev/null start \; new-session -d 2>/dev/null || exit 1
diff --git a/regress/cmd-parse-print.sh b/regress/cmd-parse-print.sh
index 3a35d7004..6196b6b25 100755
--- a/regress/cmd-parse-print.sh
+++ b/regress/cmd-parse-print.sh
@@ -15,8 +15,7 @@ PATH=/bin:/usr/bin
 TERM=screen
 
 [ -z "$TEST_TMUX" ] && TEST_TMUX=$(readlink -f ../tmux)
-SOCKET=$(mktemp -u testXXXXXX)
-TMUX="$TEST_TMUX -L$SOCKET -f/dev/null"
+TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 TMUX2=
 $TMUX kill-server 2>/dev/null
 
@@ -104,8 +103,7 @@ cmp -s $TMP $EXP || {
 # identical key list.
 $TMUX list-keys -T parsetest >$RT1 || exit 1
 $TMUX kill-server 2>/dev/null
-SOCKET2=$(mktemp -u testXXXXXX)
-TMUX2="$TEST_TMUX -L$SOCKET2 -f/dev/null"
+TMUX2="$TEST_TMUX -LtestB$$ -f/dev/null"
 $TMUX2 -f/dev/null start \; new-session -d 2>/dev/null || exit 1
 $TMUX2 source-file $RT1 || exit 1
 $TMUX2 list-keys -T parsetest >$RT2 || exit 1
diff --git a/regress/new-session-environment.sh b/regress/new-session-environment.sh
index fc935687f..9ae6ba983 100644
--- a/regress/new-session-environment.sh
+++ b/regress/new-session-environment.sh
@@ -8,7 +8,9 @@ PATH=/bin:/usr/bin
 TMUX="$TEST_TMUX -LtestA$$ -f/dev/null"
 $TMUX kill-server 2>/dev/null
 
-TERM=$($TMUX start \; show -gv default-terminal)
+# The query starts a server with no sessions which exits asynchronously. Use
+# another socket so the session below cannot connect to that exiting server.
+TERM=$($TEST_TMUX -LtestB$$ -f/dev/null start \; show -gv default-terminal)
 TMP=$(mktemp)
 OUT=$(mktemp)
 SCRIPT=$(mktemp)