diff --git a/tests/e2e/controlplane/control_plane_suite_test.go b/tests/e2e/controlplane/control_plane_suite_test.go
index 7cc6ffc9d..fefc6fe1b 100644
--- a/tests/e2e/controlplane/control_plane_suite_test.go
+++ b/tests/e2e/controlplane/control_plane_suite_test.go
@@ -90,6 +90,10 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Success("Operator is deployed in the namespace and Running")
 })
 
-var _ = AfterSuite(func(ctx SpecContext) {
+var _ = ReportAfterSuite("Condiotnal cleanup", func(ctx SpecContext, r Report) {
+	if !r.SuiteSucceeded && keepOnFailure {
+		return
+	}
+
 	clr.Cleanup(ctx)
 })