diff --git a/e2e/dragonfly_controller_test.go b/e2e/dragonfly_controller_test.go
index fb91842..4a1c1ca 100644
--- a/e2e/dragonfly_controller_test.go
+++ b/e2e/dragonfly_controller_test.go
@@ -484,12 +484,12 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 			stopChan := make(chan struct{}, 1)
 			rc, err := checkAndK8sPortForwardRedis(ctx, clientset, cfg, stopChan, name, namespace, password, 6395)
 			Expect(err).To(BeNil())
+			defer close(stopChan)
 
 			// Check for test data
 			data, err := rc.Get(ctx, "foo").Result()
 			Expect(err).To(BeNil())
 			Expect(data).To(Equal("bar"))
-			defer close(stopChan)
 		})
 
 		It("Change Service specification to LoadBalancer", func() {
@@ -516,10 +516,10 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
 			Expect(err).To(BeNil())
 
 			// Wait until Dragonfly object is marked ready
-			err = waitForDragonflyPhase(ctx, k8sClient, name, namespace, controller.PhaseReady, 3*time.Minute)
-			Expect(err).To(BeNil())
-			err = waitForStatefulSetReady(ctx, k8sClient, name, namespace, 3*time.Minute)
-			Expect(err).To(BeNil())
+			// err = waitForDragonflyPhase(ctx, k8sClient, name, namespace, controller.PhaseReady, 3*time.Minute)
+			// Expect(err).To(BeNil())
+			// err = waitForStatefulSetReady(ctx, k8sClient, name, namespace, 3*time.Minute)
+			// Expect(err).To(BeNil())
 
 			var svc corev1.Service
 			err = k8sClient.Get(ctx, types.NamespacedName{