diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh
index 61f2e8c9a..bac219198 100755
--- a/ci_scripts/remote_python_packaging.sh
+++ b/ci_scripts/remote_python_packaging.sh
@@ -30,6 +30,8 @@ set +x
 
 ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE
     set +x -e
+    # make sure all processes exit when ssh dies
+    shopt -s huponexit
     cd $BUILDDIR
     export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG
     export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL
diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh
index 05df27417..99b4d0169 100755
--- a/ci_scripts/remote_tests_python.sh
+++ b/ci_scripts/remote_tests_python.sh
@@ -22,8 +22,12 @@ set +x
 
 echo "--- Running $CIRCLE_JOB remotely"
 
-ssh $SSHTARGET <<_HERE
+ssh -t -t $SSHTARGET <<_HERE
     set +x -e
+
+    # make sure all processes exit when ssh dies
+    shopt -s huponexit
+
     export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
     # let's share the target dir with our last run on this branch/job-type
diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh
index 0e2ea280f..3679232b2 100755
--- a/ci_scripts/remote_tests_rust.sh
+++ b/ci_scripts/remote_tests_rust.sh
@@ -18,8 +18,10 @@ rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR"
 
 echo "--- Running $CIRCLE_JOB remotely"
 
-ssh $SSHTARGET <<_HERE
+ssh -t -t $SSHTARGET <<_HERE
     set +x -e
+    # make sure all processes exit when ssh dies
+    shopt -s huponexit
     export RUSTC_WRAPPER=\`which sccache\`
     cd $BUILDDIR
     # let's share the target dir with our last run on this branch/job-type