diff --git a/coordinator/cloudprovider/gcp/client_test.go b/coordinator/cloudprovider/gcp/client_test.go
index 21c9660c6..27eb9df60 100644
--- a/coordinator/cloudprovider/gcp/client_test.go
+++ b/coordinator/cloudprovider/gcp/client_test.go
@@ -21,8 +21,6 @@ func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(m,
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 	)
 }
 
diff --git a/coordinator/coordinator_test.go b/coordinator/coordinator_test.go
index b0d58bfe6..e66a2b1ec 100644
--- a/coordinator/coordinator_test.go
+++ b/coordinator/coordinator_test.go
@@ -36,8 +36,6 @@ func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(m,
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 	)
 }
 
diff --git a/coordinator/core/core_test.go b/coordinator/core/core_test.go
index 5d48b68bb..4ab01d0c1 100644
--- a/coordinator/core/core_test.go
+++ b/coordinator/core/core_test.go
@@ -29,8 +29,6 @@ func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(m,
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 	)
 }
 
diff --git a/coordinator/kubernetes/k8sapi/kubeadm_config_test.go b/coordinator/kubernetes/k8sapi/kubeadm_config_test.go
index abd858b87..7946ddd48 100644
--- a/coordinator/kubernetes/k8sapi/kubeadm_config_test.go
+++ b/coordinator/kubernetes/k8sapi/kubeadm_config_test.go
@@ -9,10 +9,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m,
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
-	)
+	goleak.VerifyTestMain(m)
 }
 
 func TestInitConfiguration(t *testing.T) {
diff --git a/coordinator/kubernetes/kubernetes_test.go b/coordinator/kubernetes/kubernetes_test.go
index 689f54c7a..4ba2df396 100644
--- a/coordinator/kubernetes/kubernetes_test.go
+++ b/coordinator/kubernetes/kubernetes_test.go
@@ -15,10 +15,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m,
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
-	)
+	goleak.VerifyTestMain(m)
 }
 
 type stubClusterUtil struct {
diff --git a/coordinator/pubapi/pubapi_test.go b/coordinator/pubapi/pubapi_test.go
index 6716b8231..23ba5520d 100644
--- a/coordinator/pubapi/pubapi_test.go
+++ b/coordinator/pubapi/pubapi_test.go
@@ -14,8 +14,6 @@ func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(m,
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 	)
 }
 
diff --git a/coordinator/storewrapper/storewrapper_test.go b/coordinator/storewrapper/storewrapper_test.go
index 7f702e4a2..e68688acc 100644
--- a/coordinator/storewrapper/storewrapper_test.go
+++ b/coordinator/storewrapper/storewrapper_test.go
@@ -15,8 +15,6 @@ import (
 
 func TestMain(m *testing.M) {
 	goleak.VerifyTestMain(m,
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
 	)
diff --git a/coordinator/vpnapi/vpnapi_test.go b/coordinator/vpnapi/vpnapi_test.go
index 0e929b7a4..00dd6cdfe 100644
--- a/coordinator/vpnapi/vpnapi_test.go
+++ b/coordinator/vpnapi/vpnapi_test.go
@@ -17,10 +17,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m,
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
-	)
+	goleak.VerifyTestMain(m)
 }
 
 func TestGetUpdate(t *testing.T) {
diff --git a/test/coordinator_integration_test.go b/test/coordinator_integration_test.go
index 058a1d1ed..657185b4a 100644
--- a/test/coordinator_integration_test.go
+++ b/test/coordinator_integration_test.go
@@ -135,8 +135,6 @@ func TestMain(t *testing.T) {
 	defer goleak.VerifyNone(t,
 		// https://github.com/census-instrumentation/opencensus-go/issues/1262
 		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
-		// https://github.com/kubernetes/klog/issues/282, https://github.com/kubernetes/klog/issues/188
-		goleak.IgnoreTopFunction("k8s.io/klog/v2.(*loggingT).flushDaemon"),
 	)
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -296,7 +294,7 @@ func startCoordinator(ctx context.Context, coordinatorAddr string, ips []string)
 func createTempDir() error {
 	if err := os.RemoveAll(localLogDirectory); err != nil && !os.IsNotExist(err) {
 		return err
-	} 		
+	}
 	return os.MkdirAll(localLogDirectory, 0o755)
 }