diff --git a/internal/tests/suite_healthcheck_test.go b/internal/tests/suite_healthcheck_test.go
index 16522d44..ceccf744 100644
--- a/internal/tests/suite_healthcheck_test.go
+++ b/internal/tests/suite_healthcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2023 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -23,6 +23,7 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger"
 
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
@@ -37,6 +38,7 @@ func (f *ForwarderTestSuite) TestHealthCheck() {
 		&grpc_health_v1.HealthCheckRequest{
 			Service: "networkservice.NetworkService",
 		},
+		grpc.WaitForReady(true),
 	)
 	f.NoError(err)
 	f.Require().NotNil(healthResponse)
diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go
index 7dfee6dd..6645c932 100644
--- a/internal/tests/suite_setup_test.go
+++ b/internal/tests/suite_setup_test.go
@@ -173,6 +173,7 @@ func (f *ForwarderTestSuite) SetupSuite() {
 	f.sutCC, err = grpc.DialContext(f.ctx,
 		regEndpoint.NetworkServiceEndpoint.GetUrl(),
 		grpc.WithTransportCredentials(clientCreds),
+		grpc.WithBlock(),
 		grpc.WithDefaultCallOptions(
 			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, f.config.MaxTokenLifetime))),
 		),
diff --git a/main.go b/main.go
index db5f4568..a8bcb99e 100644
--- a/main.go
+++ b/main.go
@@ -228,7 +228,9 @@ func main() {
 
 	dialOptions := append(
 		tracing.WithTracingDial(),
+		grpc.WithBlock(),
 		grpc.WithDefaultCallOptions(
+			grpc.WaitForReady(true),
 			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, cfg.MaxTokenLifetime)))),
 		grpc.WithTransportCredentials(
 			grpcfd.TransportCredentials(