diff --git a/internal/ingress/controller/nginx_test.go b/internal/ingress/controller/nginx_test.go
index 7c4a32c3a..4d27e45b4 100644
--- a/internal/ingress/controller/nginx_test.go
+++ b/internal/ingress/controller/nginx_test.go
@@ -154,18 +154,10 @@ func TestConfigureDynamically(t *testing.T) {
 
 	}))
 
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Errorf("unexpected error listening on a random port: %v", err)
-	}
-	defer listener.Close()
-
-	port := listener.Addr().(*net.TCPAddr).Port
-
-	ts.Listener = listener
+	port := ts.Listener.Addr().(*net.TCPAddr).Port
 	defer ts.Close()
 
-	err = configureDynamically(commonConfig, port)
+	err := configureDynamically(commonConfig, port)
 	if err != nil {
 		t.Errorf("unexpected error posting dynamic configuration: %v", err)
 	}
diff --git a/internal/ingress/controller/store/store_test.go b/internal/ingress/controller/store/store_test.go
index 42e8047a2..3376dfa2c 100644
--- a/internal/ingress/controller/store/store_test.go
+++ b/internal/ingress/controller/store/store_test.go
@@ -113,9 +113,6 @@ func TestStore(t *testing.T) {
 		if svc != nil {
 			t.Errorf("expected an Ingres but none returned")
 		}
-
-		updateCh.Close()
-		close(stopCh)
 	})
 
 	t.Run("should return one event for add, update and delete of ingress", func(t *testing.T) {
@@ -257,9 +254,6 @@ func TestStore(t *testing.T) {
 		if atomic.LoadUint64(&del) != 1 {
 			t.Errorf("expected 1 event of type Delete but %v occurred", del)
 		}
-
-		updateCh.Close()
-		close(stopCh)
 	})
 
 	t.Run("should not receive events from secret not referenced from ingress", func(t *testing.T) {
@@ -346,9 +340,6 @@ func TestStore(t *testing.T) {
 		if atomic.LoadUint64(&del) != 0 {
 			t.Errorf("expected 0 events of type Delete but %v occurred", del)
 		}
-
-		updateCh.Close()
-		close(stopCh)
 	})
 
 	t.Run("should receive events from secret referenced from ingress", func(t *testing.T) {
@@ -458,9 +449,6 @@ func TestStore(t *testing.T) {
 		if atomic.LoadUint64(&del) != 1 {
 			t.Errorf("expected 1 events of type Delete but %v occurred", del)
 		}
-
-		updateCh.Close()
-		close(stopCh)
 	})
 
 	t.Run("should create an ingress with a secret which does not exist", func(t *testing.T) {
@@ -604,9 +592,6 @@ func TestStore(t *testing.T) {
 				t.Errorf("SHA of secret on disk differs from local secret store (%v != %v)", pemSHA, sslCert.PemSHA)
 			}
 		})
-
-		updateCh.Close()
-		close(stopCh)
 	})
 
 	// test add ingress with secret it doesn't exists and then add secret