diff --git a/test_e2e.sh b/test_e2e.sh
index c004ef8..838c717 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -1958,5 +1958,9 @@ done
 
 # Finally...
 echo
-echo "cleaning up $DIR"
-rm -rf "$DIR"
+if [[ "${CLEANUP:-}" == 0 ]]; then
+    echo "leaving logs in $DIR"
+else
+    echo "cleaning up $DIR"
+    rm -rf "$DIR"
+fi