diff --git a/scripts/container-test b/scripts/container-test
index 8a3abe08d..71852f54f 100755
--- a/scripts/container-test
+++ b/scripts/container-test
@@ -17,8 +17,8 @@ cleanup() {
     echo "cleaning up docker images"
     docker ps | grep devbundle | awk '{print $1}' | xargs docker stop
     docker ps | grep devbundle | awk '{print $1}' | xargs docker rm
+    rm -rf $TEST_DIR
   fi
-  rm -rf $TEST_DIR
 }
 trap cleanup EXIT