diff --git a/run-qemu-robot-test.sh b/run-qemu-robot-test.sh
index 9becd9c..2d0b186 100755
--- a/run-qemu-robot-test.sh
+++ b/run-qemu-robot-test.sh
@@ -36,7 +36,8 @@
 
 # Start QEMU docker instance
 # root in docker required to open up the https/ssh ports
-obmc_qemu_docker=$(docker run --detach \
+obmc_qemu_docker=$(docker run --rm \
+                              --detach \
                               --user root \
                               --env HOME=${HOME} \
                               --env QEMU_RUN_TIMER=${QEMU_RUN_TIMER} \
@@ -86,7 +87,8 @@
 
 # Run the docker container to execute the robot test cases
 # The test results will be put in ${WORKSPACE}
-docker run --user root \
+docker run --rm \
+           --user root \
            --env HOME=${HOME} \
            --env IP_ADDR=${DOCKER_QEMU_IP_ADDR} \
            --env SSH_PORT=${DOCKER_SSH_PORT} \