diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh
index a3e8a35ca..9d48224fa 100755
--- a/test/e2e/run_test.sh
+++ b/test/e2e/run_test.sh
@@ -192,13 +192,11 @@ function cleanup_kind_cluster() {
 }
 
 function cleanup_docker_registry() {
-    local REG_NAME="${KIND_REGISTRY_NAME:-kind-registry}"
+    echo "Stopping Docker registry named '${KIND_REGISTRY_NAME}'..."
+    docker stop "${KIND_REGISTRY_NAME}" || echo "Failed to stop or no such registry '${KIND_REGISTRY_NAME}'."
 
-    echo "Stopping Docker registry named '${REG_NAME}'..."
-    docker stop "${REG_NAME}" || echo "Failed to stop or no such registry '${REG_NAME}'."
-
-    echo "Removing Docker registry named '${REG_NAME}'..."
-    docker rm "${REG_NAME}" || echo "Failed to remove or no such registry '${REG_NAME}'."
+    echo "Removing Docker registry named '${KIND_REGISTRY_NAME}'..."
+    docker rm "${KIND_REGISTRY_NAME}" || echo "Failed to remove or no such registry '${KIND_REGISTRY_NAME}'."
 }
 
 while (( "$#" )); do
@@ -225,15 +223,7 @@ while (( "$#" )); do
       IPV6=true
       shift
     ;;
-    --cleanup-kind)
-      CLEANUP_KIND=true
-      shift
-    ;;
-    --cleanup-registry)
-      CLEANUP_REGISTRY=true
-      shift
-    ;;
-    --cleanup-all)
+    --cleanup)
       CLEANUP_KIND=true
       CLEANUP_REGISTRY=true
       shift