diff --git a/pkg/tools/cli/loadtest/service/insert_test.go b/pkg/tools/cli/loadtest/service/insert_test.go
index afe9fc55929..da078388ce3 100644
--- a/pkg/tools/cli/loadtest/service/insert_test.go
+++ b/pkg/tools/cli/loadtest/service/insert_test.go
@@ -22,12 +22,10 @@ import (
 
 	"github.com/vdaas/vald/internal/errgroup"
 	"github.com/vdaas/vald/internal/errors"
-	igrpc "github.com/vdaas/vald/internal/net/grpc"
+	"github.com/vdaas/vald/internal/net/grpc"
 	"github.com/vdaas/vald/pkg/tools/cli/loadtest/assets"
 	"github.com/vdaas/vald/pkg/tools/cli/loadtest/config"
 	"go.uber.org/goleak"
-
-	"google.golang.org/grpc" // TODO: related to #557
 )
 
 func Test_insertRequestProvider(t *testing.T) {
@@ -552,7 +550,7 @@ func Test_bulkInsert(t *testing.T) {
 func Test_loader_newInsert(t *testing.T) {
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
@@ -674,7 +672,7 @@ func Test_loader_newInsert(t *testing.T) {
 func Test_loader_newStreamInsert(t *testing.T) {
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
diff --git a/pkg/tools/cli/loadtest/service/loader_test.go b/pkg/tools/cli/loadtest/service/loader_test.go
index 8f543bbc76f..8bd8bd0511d 100644
--- a/pkg/tools/cli/loadtest/service/loader_test.go
+++ b/pkg/tools/cli/loadtest/service/loader_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/vdaas/vald/internal/errgroup"
 	"github.com/vdaas/vald/internal/errors"
-	igrpc "github.com/vdaas/vald/internal/net/grpc"
+	"github.com/vdaas/vald/internal/net/grpc"
 	"github.com/vdaas/vald/pkg/tools/cli/loadtest/config"
 	"go.uber.org/goleak"
 )
@@ -109,7 +109,7 @@ func Test_loader_Prepare(t *testing.T) {
 	}
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
@@ -237,7 +237,7 @@ func Test_loader_Do(t *testing.T) {
 	}
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
@@ -367,7 +367,7 @@ func Test_loader_do(t *testing.T) {
 	}
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
diff --git a/pkg/tools/cli/loadtest/service/search_test.go b/pkg/tools/cli/loadtest/service/search_test.go
index 8452381a995..57b2ddaa9c4 100644
--- a/pkg/tools/cli/loadtest/service/search_test.go
+++ b/pkg/tools/cli/loadtest/service/search_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/vdaas/vald/internal/errgroup"
 	"github.com/vdaas/vald/internal/errors"
-	igrpc "github.com/vdaas/vald/internal/net/grpc"
+	"github.com/vdaas/vald/internal/net/grpc"
 	"github.com/vdaas/vald/pkg/tools/cli/loadtest/assets"
 	"github.com/vdaas/vald/pkg/tools/cli/loadtest/config"
 	"go.uber.org/goleak"
@@ -110,7 +110,7 @@ func Test_searchRequestProvider(t *testing.T) {
 func Test_loader_newSearch(t *testing.T) {
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int
@@ -232,7 +232,7 @@ func Test_loader_newSearch(t *testing.T) {
 func Test_loader_newStreamSearch(t *testing.T) {
 	type fields struct {
 		eg               errgroup.Group
-		client           igrpc.Client
+		client           grpc.Client
 		addr             string
 		concurrency      int
 		batchSize        int