diff --git a/scripts/test-env/setup.sh b/scripts/test-env/setup.sh
index c2547505..86bff77a 100755
--- a/scripts/test-env/setup.sh
+++ b/scripts/test-env/setup.sh
@@ -75,6 +75,10 @@ log_ok "Phase 2 complete"
 # ============================================
 log_info "Phase 3/6: Docker infrastructure"
 cd "$SCRIPT_DIR"
+
+# Stop and remove any existing v2test containers (clean restart)
+docker compose -f docker-compose.infra.yml down --remove-orphans 2>/dev/null || true
+
 docker compose -f docker-compose.infra.yml up -d
 
 log_info "Waiting for Consul..."