diff --git a/test/utils/shippable/integration.sh b/test/utils/shippable/integration.sh
index f9b04ae5c76..4be0624e093 100755
--- a/test/utils/shippable/integration.sh
+++ b/test/utils/shippable/integration.sh
@@ -34,6 +34,7 @@ fi
 
 container_id=
 httptester_id=
+tests_completed=
 
 function show_environment
 {
@@ -51,6 +52,10 @@ function cleanup
         rm -rf "${controller_shared_dir}"
     fi
 
+    if [ "${keep_containers}" == "onfailure" ] && [ "${tests_completed}" != "" ]; then
+        keep_containers=
+    fi
+
     if [ "${keep_containers}" == "" ]; then
         if [ "${container_id}" ]; then
             docker rm -f "${container_id}"
@@ -111,3 +116,5 @@ docker exec "${container_id}" mkdir -p "${test_shared_dir}/shippable/testresults
 docker exec "${container_id}" /bin/sh -c "cd '${test_ansible_dir}' && . hacking/env-setup && cd test/integration && \
     JUNIT_OUTPUT_DIR='${test_shared_dir}/shippable/testresults' ANSIBLE_CALLBACK_WHITELIST=junit \
     HTTPTESTER=1 TEST_FLAGS='${test_flags}' LC_ALL=en_US.utf-8 make ${test_target}"
+
+tests_completed=1