diff --git a/go.mod b/go.mod
index edf68b36f..d19e927e5 100644
--- a/go.mod
+++ b/go.mod
@@ -26,9 +26,10 @@ require (
 	github.com/uber/jaeger-client-go v2.21.1+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
 	go.uber.org/atomic v1.6.0 // indirect
-	go.uber.org/goleak v1.0.0
-	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
+	go.uber.org/goleak v1.0.1-0.20200717213025-100c34bdc9d6
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
 	golang.org/x/sys v0.0.0-20200610111108-226ff32320da
+	golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6 // indirect
 	gonum.org/v1/gonum v0.6.2
 	google.golang.org/genproto v0.0.0-20200615140333-fd031eab31e7 // indirect
 	google.golang.org/grpc v1.29.1
diff --git a/go.sum b/go.sum
index db873daff..69e99550c 100644
--- a/go.sum
+++ b/go.sum
@@ -325,6 +325,7 @@ github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPy
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b h1:vVRagRXf67ESqAb72hG2C/ZwI8NtJF2u2V76EsuOHGY=
 github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b/go.mod h1:HptNXiXVDcJjXe9SqMd0v2FsL9f8dz4GnXgltU6q/co=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zeebo/errs v1.2.2 h1:5NFypMTuSdoySVTqlNs1dEoU21QVamMQJxW/Fii5O7g=
 github.com/zeebo/errs v1.2.2/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -335,8 +336,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
-go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
+go.uber.org/goleak v1.0.1-0.20200717213025-100c34bdc9d6 h1:+os4Rcinl2P8NEQXzKVaoDAkLtTbWHOCKLvGMR0nnWs=
+go.uber.org/goleak v1.0.1-0.20200717213025-100c34bdc9d6/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -345,8 +346,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200206161412-a0c6ece9d31a h1:aczoJ0HPNE92XKa7DrIzkNN6esOKO2TBwiiYoKcINhA=
 golang.org/x/crypto v0.0.0-20200206161412-a0c6ece9d31a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -369,10 +373,15 @@ golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -388,8 +397,8 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -399,6 +408,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -451,7 +461,12 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11 h1:Yq9t9jnGoR+dBuitxdo9l6Q
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc h1:NCy3Ohtk6Iny5V/reW2Ktypo4zIpWBdRJ1uFMjBxdg8=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6 h1:nULzSsKgihxFGLnQFv2T7lE5vIhOtg8ZPpJHapEt7o0=
+golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
diff --git a/pkg/networkservice/common/authorize/server_test.go b/pkg/networkservice/common/authorize/server_test.go
index 6f1a1e525..a672a8e5e 100644
--- a/pkg/networkservice/common/authorize/server_test.go
+++ b/pkg/networkservice/common/authorize/server_test.go
@@ -59,7 +59,7 @@ func requestWithToken(token string) *networkservice.NetworkServiceRequest {
 }
 
 func TestAuthzEndpoint(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	suits := []struct {
 		name     string
 		policy   opa.AuthorizationPolicy
diff --git a/pkg/networkservice/common/clientinfo/client_test.go b/pkg/networkservice/common/clientinfo/client_test.go
index f606fd2c2..b2556b04f 100644
--- a/pkg/networkservice/common/clientinfo/client_test.go
+++ b/pkg/networkservice/common/clientinfo/client_test.go
@@ -50,7 +50,7 @@ func unsetEnvs(envs map[string]string) error {
 }
 
 func TestLabelsMapNotPresent(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	envs := map[string]string{
 		"NODE_NAME":    "AAA",
 		"POD_NAME":     "BBB",
@@ -79,7 +79,7 @@ func TestLabelsMapNotPresent(t *testing.T) {
 }
 
 func TestLabelsOverwritten(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	envs := map[string]string{
 		"NODE_NAME":    "AAA",
 		"POD_NAME":     "BBB",
@@ -116,7 +116,7 @@ func TestLabelsOverwritten(t *testing.T) {
 }
 
 func TestSomeEnvsNotPresent(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	envs := map[string]string{
 		"CLUSTER_NAME": "CCC",
 	}
diff --git a/pkg/networkservice/common/clienturl/server_test.go b/pkg/networkservice/common/clienturl/server_test.go
index 741ef1e82..8d31e8a2b 100644
--- a/pkg/networkservice/common/clienturl/server_test.go
+++ b/pkg/networkservice/common/clienturl/server_test.go
@@ -32,7 +32,7 @@ import (
 )
 
 func TestAddURLInEmptyContext(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	clientURL := &url.URL{
 		Scheme: "ipv4",
 		Path:   "192.168.0.1",
@@ -48,7 +48,7 @@ func TestAddURLInEmptyContext(t *testing.T) {
 }
 
 func TestOverwriteURL(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	clientURL := &url.URL{
 		Scheme: "ipv4",
 		Path:   "192.168.0.1",
@@ -71,7 +71,7 @@ func TestOverwriteURL(t *testing.T) {
 }
 
 func TestOverwriteURLByNil(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	var clientURL *url.URL = nil
 	previousURL := &url.URL{
 		Scheme: "unix",
diff --git a/pkg/networkservice/common/connect/server_test.go b/pkg/networkservice/common/connect/server_test.go
index 8ce208a12..5868fc20e 100644
--- a/pkg/networkservice/common/connect/server_test.go
+++ b/pkg/networkservice/common/connect/server_test.go
@@ -93,7 +93,7 @@ func (nseT *nseTest) newNSEContext(ctx context.Context) context.Context {
 }
 
 func TestConnectServerShouldNotPanicOnRequest(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 
 	nseT := &nseTest{
 		t: t,
@@ -208,7 +208,7 @@ func TestConnectServerShouldNotPanicOnRequest(t *testing.T) {
 
 func TestParallelDial(t *testing.T) {
 	t.Skip("https://github.com/networkservicemesh/sdk/issues/377")
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 
 	nseT := &nseTest{}
 	nseT.Setup()
diff --git a/pkg/networkservice/common/discover/server_test.go b/pkg/networkservice/common/discover/server_test.go
index 72222ecd4..16d0432e8 100644
--- a/pkg/networkservice/common/discover/server_test.go
+++ b/pkg/networkservice/common/discover/server_test.go
@@ -124,7 +124,7 @@ func fromSomeMiddleAppMatch() *registry.Match {
 }
 
 func TestMatchEmptySourceSelector(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	nsName := networkServiceName()
 	nsServer := memory.NewNetworkServiceRegistryServer()
 	_, err := nsServer.Register(context.Background(), &registry.NetworkService{
@@ -161,7 +161,7 @@ func TestMatchEmptySourceSelector(t *testing.T) {
 }
 
 func TestMatchNonEmptySourceSelector(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	nsName := networkServiceName()
 	nsServer := memory.NewNetworkServiceRegistryServer()
 	_, err := nsServer.Register(context.Background(), &registry.NetworkService{
@@ -200,7 +200,7 @@ func TestMatchNonEmptySourceSelector(t *testing.T) {
 }
 
 func TestMatchEmptySourceSelectorGoingFirst(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	nsName := networkServiceName()
 	nsServer := memory.NewNetworkServiceRegistryServer()
 	_, err := nsServer.Register(context.Background(), &registry.NetworkService{
@@ -238,7 +238,7 @@ func TestMatchEmptySourceSelectorGoingFirst(t *testing.T) {
 }
 
 func TestMatchNothing(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	nsName := networkServiceName()
 	nsServer := memory.NewNetworkServiceRegistryServer()
 	_, err := nsServer.Register(context.Background(), &registry.NetworkService{
@@ -273,7 +273,7 @@ func TestMatchNothing(t *testing.T) {
 }
 
 func TestMatchSelectedNSE(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	nsName := networkServiceName()
 	nsServer := memory.NewNetworkServiceRegistryServer()
 	_, err := nsServer.Register(context.Background(), &registry.NetworkService{
diff --git a/pkg/networkservice/common/filtermechanisms/client_test.go b/pkg/networkservice/common/filtermechanisms/client_test.go
index f66938c70..c71d890a6 100644
--- a/pkg/networkservice/common/filtermechanisms/client_test.go
+++ b/pkg/networkservice/common/filtermechanisms/client_test.go
@@ -67,7 +67,7 @@ func request() *networkservice.NetworkServiceRequest {
 }
 
 func TestNewClient_FilterUnixType(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	ctx := clienturl.WithClientURL(context.Background(), &url.URL{
 		Scheme: "unix",
 		Path:   "/var/run/nse-1.sock",
@@ -93,7 +93,7 @@ func TestNewClient_FilterUnixType(t *testing.T) {
 }
 
 func TestNewClient_FilterNonUnixType(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	ctx := clienturl.WithClientURL(context.Background(), &url.URL{
 		Scheme: "ipv4",
 		Path:   "192.168.0.1",
diff --git a/pkg/networkservice/common/filtermechanisms/server_test.go b/pkg/networkservice/common/filtermechanisms/server_test.go
index 2a3605f48..13ecbde63 100644
--- a/pkg/networkservice/common/filtermechanisms/server_test.go
+++ b/pkg/networkservice/common/filtermechanisms/server_test.go
@@ -37,7 +37,7 @@ import (
 )
 
 func TestNewServer_FilterUnixType(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	ctx := peer.NewContext(context.Background(), &peer.Peer{
 		Addr: &net.UnixAddr{
 			Name: "/var/run/nse-1.sock",
@@ -65,7 +65,7 @@ func TestNewServer_FilterUnixType(t *testing.T) {
 }
 
 func TestNewServer_FilterNonUnixType(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	ctx := peer.NewContext(context.Background(), &peer.Peer{
 		Addr: &net.IPAddr{
 			IP: net.IP{192, 168, 0, 1},
diff --git a/pkg/networkservice/common/heal/client_test.go b/pkg/networkservice/common/heal/client_test.go
index 935d4a252..0dd73e3a0 100644
--- a/pkg/networkservice/common/heal/client_test.go
+++ b/pkg/networkservice/common/heal/client_test.go
@@ -56,7 +56,7 @@ func (t *testOnHeal) Close(ctx context.Context, in *networkservice.Connection, o
 }
 
 func TestHealClient_Request(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	eventCh := make(chan *networkservice.ConnectionEvent, 1)
 	defer close(eventCh)
@@ -120,7 +120,7 @@ func TestHealClient_Request(t *testing.T) {
 }
 
 func TestHealClient_EmptyInit(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	eventCh := make(chan *networkservice.ConnectionEvent, 1)
 	defer close(eventCh)
@@ -158,7 +158,7 @@ func TestHealClient_EmptyInit(t *testing.T) {
 
 func TestNewClient_MissingConnectionsInInit(t *testing.T) {
 	t.Skip("https://github.com/networkservicemesh/sdk/issues/375")
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	eventCh := make(chan *networkservice.ConnectionEvent, 1)
 
diff --git a/pkg/networkservice/common/localbypass/server_test.go b/pkg/networkservice/common/localbypass/server_test.go
index 386ea8a58..9d75e47d3 100644
--- a/pkg/networkservice/common/localbypass/server_test.go
+++ b/pkg/networkservice/common/localbypass/server_test.go
@@ -77,7 +77,7 @@ func (s testNetworkServiceServer) Close(ctx context.Context, _ *networkservice.C
 }
 
 func TestNewServer_NSENotPresented(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	var localBypassRegistryServer registry.NetworkServiceEndpointRegistryServer
 	localBypassNetworkServiceServer := localbypass.NewServer(&localBypassRegistryServer)
 	server := next.NewNetworkServiceServer(localBypassNetworkServiceServer, &testNetworkServiceServer{})
@@ -99,7 +99,7 @@ func TestNewServer_NSENotPresented(t *testing.T) {
 }
 
 func TestNewServer_UnixAddressRegistered(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	var localBypassRegistryServer registry.NetworkServiceEndpointRegistryServer
 	localBypassNetworkServiceServer := localbypass.NewServer(&localBypassRegistryServer)
 	server := next.NewNetworkServiceServer(localBypassNetworkServiceServer, &testNetworkServiceServer{})
@@ -131,7 +131,7 @@ func TestNewServer_UnixAddressRegistered(t *testing.T) {
 }
 
 func TestNewServer_NonUnixAddressRegistered(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	var localBypassRegistryServer registry.NetworkServiceEndpointRegistryServer
 	localBypassNetworkServiceServer := localbypass.NewServer(&localBypassRegistryServer)
 	server := next.NewNetworkServiceServer(localBypassNetworkServiceServer, &testNetworkServiceServer{})
@@ -164,7 +164,7 @@ func TestNewServer_NonUnixAddressRegistered(t *testing.T) {
 }
 
 func TestNewServer_AddsNothingAfterNSERemoval(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	var localBypassRegistryServer registry.NetworkServiceEndpointRegistryServer
 	localBypassNetworkServiceServer := localbypass.NewServer(&localBypassRegistryServer)
 	server := next.NewNetworkServiceServer(localBypassNetworkServiceServer, &testNetworkServiceServer{})
diff --git a/pkg/networkservice/common/mechanisms/server_test.go b/pkg/networkservice/common/mechanisms/server_test.go
index bce8619d9..89cda79b2 100644
--- a/pkg/networkservice/common/mechanisms/server_test.go
+++ b/pkg/networkservice/common/mechanisms/server_test.go
@@ -90,7 +90,7 @@ func permuteOverMechanismPreferenceOrder(request *networkservice.NetworkServiceR
 }
 
 func TestSelectMechanism(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	server := server()
 	for _, request := range permuteOverMechanismPreferenceOrder(request()) {
@@ -108,7 +108,7 @@ func TestSelectMechanism(t *testing.T) {
 }
 
 func TestDontSelectMechanismIfSet(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	server := server()
 	for _, request := range permuteOverMechanismPreferenceOrder(request()) {
@@ -123,7 +123,7 @@ func TestDontSelectMechanismIfSet(t *testing.T) {
 }
 
 func TestUnsupportedMechanismPreference(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	request := request()
 	request.MechanismPreferences = []*networkservice.Mechanism{
@@ -137,7 +137,7 @@ func TestUnsupportedMechanismPreference(t *testing.T) {
 }
 
 func TestUnsupportedMechanism(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	request := request()
 	request.GetConnection().Mechanism = &networkservice.Mechanism{
@@ -152,7 +152,7 @@ func TestUnsupportedMechanism(t *testing.T) {
 }
 
 func TestDownstreamError(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	logrus.SetOutput(ioutil.Discard)
 	request := request()
 	request.GetConnection().Mechanism = &networkservice.Mechanism{
diff --git a/pkg/networkservice/common/monitor/server_test.go b/pkg/networkservice/common/monitor/server_test.go
index a61e7942f..c966453c3 100644
--- a/pkg/networkservice/common/monitor/server_test.go
+++ b/pkg/networkservice/common/monitor/server_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestMonitor(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	// Specify pathSegments to test
 	segmentNames := []string{"local-nsm", "remote-nsm"}
 
diff --git a/pkg/networkservice/common/refresh/client_test.go b/pkg/networkservice/common/refresh/client_test.go
index 7a1bcdc84..8f9cdf38b 100644
--- a/pkg/networkservice/common/refresh/client_test.go
+++ b/pkg/networkservice/common/refresh/client_test.go
@@ -108,7 +108,7 @@ func firstGetsValueEarlier(c1, c2 <-chan struct{}) bool {
 
 func TestNewClient_StopRefreshAtClose(t *testing.T) {
 	t.Skip("https://github.com/networkservicemesh/sdk/issues/237")
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	requestCh := make(chan struct{}, 1)
 	testRefresh := &testRefresh{
 		RequestFunc: func(ctx context.Context, in *networkservice.NetworkServiceRequest, opts ...grpc.CallOption) (connection *networkservice.Connection, err error) {
@@ -145,7 +145,7 @@ func TestNewClient_StopRefreshAtClose(t *testing.T) {
 
 func TestNewClient_StopRefreshAtAnotherRequest(t *testing.T) {
 	t.Skip("https://github.com/networkservicemesh/sdk/issues/260")
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	requestCh := make(chan struct{}, 1)
 	testRefresh := &testRefresh{
 		RequestFunc: func(ctx context.Context, in *networkservice.NetworkServiceRequest, opts ...grpc.CallOption) (connection *networkservice.Connection, err error) {
diff --git a/pkg/networkservice/common/roundrobin/round_robin_selector_test.go b/pkg/networkservice/common/roundrobin/round_robin_selector_test.go
index 918d54f05..cc5a4751b 100644
--- a/pkg/networkservice/common/roundrobin/round_robin_selector_test.go
+++ b/pkg/networkservice/common/roundrobin/round_robin_selector_test.go
@@ -225,7 +225,7 @@ var tests = []rrtests{
 }
 
 func Test_roundRobinSelector_SelectEndpoint(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	rr := newRoundRobinSelector()
 	for _, tt := range tests {
 		if got := rr.selectEndpoint(tt.args.ns, tt.args.networkServiceEndpoints); !reflect.DeepEqual(got, tt.want) {
diff --git a/pkg/networkservice/common/setid/client_test.go b/pkg/networkservice/common/setid/client_test.go
index 96eb952e5..8a0c27bdd 100644
--- a/pkg/networkservice/common/setid/client_test.go
+++ b/pkg/networkservice/common/setid/client_test.go
@@ -56,7 +56,7 @@ func request(connectionID string, pathIndex uint32) *networkservice.NetworkServi
 }
 
 func TestNewClient_SetNewConnectionId(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-3")
 	conn, err := client.Request(context.Background(), request(connectionID, 1))
 	assert.NotNil(t, conn)
@@ -65,7 +65,7 @@ func TestNewClient_SetNewConnectionId(t *testing.T) {
 }
 
 func TestNewClient_PathSegmentNameEqualClientName(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-2")
 	conn, err := client.Request(context.Background(), request(connectionID, 1))
 	assert.NotNil(t, conn)
@@ -74,7 +74,7 @@ func TestNewClient_PathSegmentNameEqualClientName(t *testing.T) {
 }
 
 func TestNewClient_PathSegmentIdEqualConnectionId(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-3")
 	conn, err := client.Request(context.Background(), request(pathSegmentID2, 1))
 	assert.NotNil(t, conn)
@@ -83,7 +83,7 @@ func TestNewClient_PathSegmentIdEqualConnectionId(t *testing.T) {
 }
 
 func TestNewClient_PathSegmentNameAndIDEqualClientNameAndID(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-2")
 	conn, err := client.Request(context.Background(), request(pathSegmentID2, 1))
 	assert.NotNil(t, conn)
@@ -92,7 +92,7 @@ func TestNewClient_PathSegmentNameAndIDEqualClientNameAndID(t *testing.T) {
 }
 
 func TestNewClient_InvalidIndex(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-3")
 	conn, err := client.Request(context.Background(), request(connectionID, 2))
 	assert.NotNil(t, conn)
@@ -101,7 +101,7 @@ func TestNewClient_InvalidIndex(t *testing.T) {
 }
 
 func TestNewClient_NoConnection(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := setid.NewClient("nse-3")
 	conn, err := client.Request(context.Background(), &networkservice.NetworkServiceRequest{})
 	assert.NotNil(t, conn)
diff --git a/pkg/networkservice/common/setid/server_test.go b/pkg/networkservice/common/setid/server_test.go
index 3176378b3..c7330e4e2 100644
--- a/pkg/networkservice/common/setid/server_test.go
+++ b/pkg/networkservice/common/setid/server_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 func TestNewServer_SetNewConnectionId(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := setid.NewServer("nse-3")
 	conn, err := server.Request(context.Background(), request(connectionID, 1))
 	assert.NotNil(t, conn)
@@ -36,7 +36,7 @@ func TestNewServer_SetNewConnectionId(t *testing.T) {
 }
 
 func TestNewServer_PathSegmentNameEqualClientName(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := setid.NewServer("nse-2")
 	conn, err := server.Request(context.Background(), request(connectionID, 1))
 	assert.NotNil(t, conn)
@@ -45,7 +45,7 @@ func TestNewServer_PathSegmentNameEqualClientName(t *testing.T) {
 }
 
 func TestNewServer_PathSegmentIdEqualConnectionId(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := setid.NewServer("nse-3")
 	conn, err := server.Request(context.Background(), request(pathSegmentID2, 1))
 	assert.NotNil(t, conn)
@@ -54,7 +54,7 @@ func TestNewServer_PathSegmentIdEqualConnectionId(t *testing.T) {
 }
 
 func TestNewServer_PathSegmentNameIDEqualClientNameID(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := setid.NewServer("nse-2")
 	conn, err := server.Request(context.Background(), request(pathSegmentID2, 1))
 	assert.NotNil(t, conn)
@@ -63,7 +63,7 @@ func TestNewServer_PathSegmentNameIDEqualClientNameID(t *testing.T) {
 }
 
 func TestNewServer_InvalidIndex(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := setid.NewServer("nse-3")
 	conn, err := server.Request(context.Background(), request(connectionID, 2))
 	assert.NotNil(t, conn)
diff --git a/pkg/networkservice/common/updatepath/client_test.go b/pkg/networkservice/common/updatepath/client_test.go
index ca040fcda..42f5f6e69 100644
--- a/pkg/networkservice/common/updatepath/client_test.go
+++ b/pkg/networkservice/common/updatepath/client_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 func TestNewClient_EmptyPathInRequest(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := updatepath.NewClient("nsc-1", TokenGenerator)
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
@@ -56,7 +56,7 @@ func TestNewClient_EmptyPathInRequest(t *testing.T) {
 }
 
 func TestNewClient_ZeroIndexAddNewSegment(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := updatepath.NewClient("nsc-1", TokenGenerator)
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
@@ -87,7 +87,7 @@ func TestNewClient_ZeroIndexAddNewSegment(t *testing.T) {
 }
 
 func TestNewClient_ValidIndexOverwriteValues(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := updatepath.NewClient("nsc-1", TokenGenerator)
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
@@ -135,7 +135,7 @@ func TestNewClient_ValidIndexOverwriteValues(t *testing.T) {
 }
 
 func TestNewClient_IndexGreaterThanArrayLength(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	client := updatepath.NewClient("nsc-1", TokenGenerator)
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
diff --git a/pkg/networkservice/common/updatepath/server_test.go b/pkg/networkservice/common/updatepath/server_test.go
index 29888275e..eff6d5d22 100644
--- a/pkg/networkservice/common/updatepath/server_test.go
+++ b/pkg/networkservice/common/updatepath/server_test.go
@@ -46,7 +46,7 @@ func init() {
 }
 
 func TestNewServer_EmptyPathInRequest(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	server := updatepath.NewServer("nsc-1", TokenGenerator)
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
@@ -60,7 +60,7 @@ func TestNewServer_EmptyPathInRequest(t *testing.T) {
 }
 
 func TestNewServer_IndexInLastPositionAddNewSegment(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
 			Id: "conn-2",
@@ -105,7 +105,7 @@ func TestNewServer_IndexInLastPositionAddNewSegment(t *testing.T) {
 }
 
 func TestNewServer_ValidIndexOverwriteValues(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
 			Id: "conn-2",
@@ -153,7 +153,7 @@ func TestNewServer_ValidIndexOverwriteValues(t *testing.T) {
 }
 
 func TestNewServer_IndexGreaterThanArrayLength(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	request := &networkservice.NetworkServiceRequest{
 		Connection: &networkservice.Connection{
 			Id: "conn-1",
diff --git a/pkg/registry/common/refresh/nse_registry_client_test.go b/pkg/registry/common/refresh/nse_registry_client_test.go
index eb8b05239..e7f402c4e 100644
--- a/pkg/registry/common/refresh/nse_registry_client_test.go
+++ b/pkg/registry/common/refresh/nse_registry_client_test.go
@@ -71,7 +71,7 @@ func (c *checkExpirationTimeClient) Unregister(ctx context.Context, in *registry
 }
 
 func TestNewNetworkServiceEndpointRegistryClient(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	testClient := testNSEClient{}
 	refreshClient := refresh.NewNetworkServiceEndpointRegistryClient(&testClient,
 		refresh.WithRetryPeriod(time.Millisecond*100),
@@ -91,7 +91,7 @@ func TestNewNetworkServiceEndpointRegistryClient(t *testing.T) {
 }
 
 func TestRefreshNSEClient_ShouldSetExpirationTime_BeforeCallNext(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	c := next.NewNetworkServiceEndpointRegistryClient(
 		refresh.NewNetworkServiceEndpointRegistryClient(&testNSEClient{}, refresh.WithDefaultExpiryDuration(time.Hour)),
 		&checkExpirationTimeClient{T: t},
@@ -105,8 +105,7 @@ func TestRefreshNSEClient_ShouldSetExpirationTime_BeforeCallNext(t *testing.T) {
 }
 
 func TestNewNetworkServiceEndpointRegistryClient_CalledRegisterTwice(t *testing.T) {
-	defer goleak.VerifyNone(t)
-
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	testClient := testNSEClient{}
 	refreshClient := refresh.NewNetworkServiceEndpointRegistryClient(&testClient,
 		refresh.WithRetryPeriod(time.Millisecond*100),
diff --git a/pkg/registry/memory/ns_server_test.go b/pkg/registry/memory/ns_server_test.go
index 8ba758dc1..558ad452b 100644
--- a/pkg/registry/memory/ns_server_test.go
+++ b/pkg/registry/memory/ns_server_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestNetworkServiceRegistryServer_RegisterAndFind(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	s := next.NewNetworkServiceRegistryServer(memory.NewNetworkServiceRegistryServer())
 
 	_, err := s.Register(context.Background(), &registry.NetworkService{
@@ -63,7 +63,7 @@ func TestNetworkServiceRegistryServer_RegisterAndFind(t *testing.T) {
 }
 
 func TestNetworkServiceRegistryServer_RegisterAndFindWatch(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	s := next.NewNetworkServiceRegistryServer(memory.NewNetworkServiceRegistryServer())
 
 	_, err := s.Register(context.Background(), &registry.NetworkService{
diff --git a/pkg/registry/memory/nse_server_test.go b/pkg/registry/memory/nse_server_test.go
index c2fbe3a87..08b36966d 100644
--- a/pkg/registry/memory/nse_server_test.go
+++ b/pkg/registry/memory/nse_server_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestNetworkServiceEndpointRegistryServer_RegisterAndFind(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	s := next.NewNetworkServiceEndpointRegistryServer(memory.NewNetworkServiceEndpointRegistryServer())
 
 	_, err := s.Register(context.Background(), &registry.NetworkServiceEndpoint{
@@ -63,7 +63,7 @@ func TestNetworkServiceEndpointRegistryServer_RegisterAndFind(t *testing.T) {
 }
 
 func TestNetworkServiceEndpointRegistryServer_RegisterAndFindWatch(t *testing.T) {
-	defer goleak.VerifyNone(t)
+	defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
 	s := next.NewNetworkServiceEndpointRegistryServer(memory.NewNetworkServiceEndpointRegistryServer())
 
 	_, err := s.Register(context.Background(), &registry.NetworkServiceEndpoint{