diff --git a/src/tests/e2e-test b/src/tests/e2e-test
index 2ccd009..2c891dd 100755
--- a/src/tests/e2e-test
+++ b/src/tests/e2e-test
@@ -209,7 +209,11 @@ for run in $server_tests; do
 	# Actually execute code under test
 	# XXX tmux 1.8 requires shell command as a single arg; once we move to 2.0, undo these quotes
 	# XXX this ignores $TMPDIR, because it results in an overlong pathname on OS X
-	if ! ${tmux_stdin} tmux -S "/tmp/.tmux-mosh-test-$$" -C new-session "${srcdir}/print-exitstatus ${client_wrapper} ${sut} \"${srcdir}/e2e-test-server\" \"${PWD}/${test_dir}/${run}\" \"${PWD}/${test_script} ${testarg}\"" > "${test_dir}/${run}.tmux.log"; then
+	tmux_socket="/tmp/.tmux-mosh-test-$$"
+	${tmux_stdin} tmux -S "${tmux_socket}" -C new-session "${srcdir}/print-exitstatus ${client_wrapper} ${sut} \"${srcdir}/e2e-test-server\" \"${PWD}/${test_dir}/${run}\" \"${PWD}/${test_script} ${testarg}\"" > "${test_dir}/${run}.tmux.log"
+	rv=$?
+	rm -f "${tmux_socket}"
+	if [ $rv -ne 0 ]; then
 	    test_error "tmux failure on test %s\n" "$run"
 	fi
 	# Check for mosh failures