diff --git a/pkg/apis/core/v1beta1/suite_test.go b/pkg/apis/core/v1beta1/suite_test.go
index a69651ab05..68c57705a8 100644
--- a/pkg/apis/core/v1beta1/suite_test.go
+++ b/pkg/apis/core/v1beta1/suite_test.go
@@ -24,7 +24,7 @@ func TestAPIs(t *testing.T) {
 	RunSpecs(t, "v1beta1 Suite")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
@@ -47,9 +47,7 @@ var _ = BeforeSuite(func(done Done) {
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).ToNot(HaveOccurred())
 	Expect(k8sClient).ToNot(BeNil())
-
-	close(done)
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	By("tearing down the test environment")
diff --git a/pkg/controller/kubefedcluster/controller_integration_test.go b/pkg/controller/kubefedcluster/controller_integration_test.go
index 7cc53ced1b..ea4bec6987 100644
--- a/pkg/controller/kubefedcluster/controller_integration_test.go
+++ b/pkg/controller/kubefedcluster/controller_integration_test.go
@@ -53,7 +53,7 @@ var cc *ClusterController
 var stopControllerCh chan struct{}
 var config *util.ClusterHealthCheckConfig
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	testenv = &envtest.Environment{
@@ -109,9 +109,7 @@ var _ = BeforeSuite(func(done Done) {
 	Expect(err).ToNot(HaveOccurred())
 
 	cc.Run(stopControllerCh)
-
-	close(done)
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	close(stopControllerCh)
diff --git a/pkg/kubefedctl/suite_test.go b/pkg/kubefedctl/suite_test.go
index 3dce4c3b8f..c8e061bbe3 100644
--- a/pkg/kubefedctl/suite_test.go
+++ b/pkg/kubefedctl/suite_test.go
@@ -44,7 +44,7 @@ func TestKubefedCTL(t *testing.T) {
 	RunSpecs(t, "Kubefedctl Suite")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	testEnv = &envtest.Environment{
@@ -69,9 +69,7 @@ var _ = BeforeSuite(func(done Done) {
 	k8sClient, err = client.New(cfg, client.Options{Scheme: clientScheme})
 	Expect(err).ToNot(HaveOccurred())
 	Expect(k8sClient).ToNot(BeNil())
-
-	close(done)
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	By("tearing down the test environment")