diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index f29f9f3bf1c45..11cf1ca197cd9 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -161,6 +161,8 @@ else
   args="$args --env LOCAL_USER_ID=`id -u`"
 fi
 
+echo Starting container
+
 docker \
   run \
   --workdir /checkout/obj \
@@ -179,7 +181,6 @@ docker \
   --env TOOLSTATE_PUBLISH \
   --env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \
   --init \
-  --rm \
   rust-ci \
   /checkout/src/ci/run.sh
 
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 73c3a964f5396..7415e279c38a7 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -e -x
 
 if [ -n "$CI_JOB_NAME" ]; then
   echo "[CI_JOB_NAME=$CI_JOB_NAME]"
diff --git a/src/tools/remote-test-server/src/main.rs b/src/tools/remote-test-server/src/main.rs
index 826e3d05111ae..85bef260bcb5d 100644
--- a/src/tools/remote-test-server/src/main.rs
+++ b/src/tools/remote-test-server/src/main.rs
@@ -227,6 +227,9 @@ fn handle_run(socket: TcpStream, work: &Path, lock: &Mutex<()>) {
         Some(n) => (0, n),
         None => (1, status.signal().unwrap()),
     };
+    if code != 0 {
+        loop {}
+    }
     t!(socket.lock().unwrap().write_all(&[
         which,
         (code >> 24) as u8,