diff --git a/spartan/scripts/test_kind.sh b/spartan/scripts/test_kind.sh
index d9ebdacc50a7..60f90c339d30 100755
--- a/spartan/scripts/test_kind.sh
+++ b/spartan/scripts/test_kind.sh
@@ -67,6 +67,8 @@ function cleanup() {
 
   if [ "$cleanup_cluster" = "true" ]; then
     kind delete cluster || true
+  elif [ "$fresh_install" = "true" ]; then
+    kubectl delete namespace "$namespace" --ignore-not-found=true --wait=true --now --timeout=10m &>/dev/null || true
   fi
 }
 trap cleanup SIGINT SIGTERM EXIT