diff --git a/pkg/generic/grpcjson_test/generic_test.go b/pkg/generic/grpcjson_test/generic_test.go
index b2ce5053a6..68ce6732b1 100644
--- a/pkg/generic/grpcjson_test/generic_test.go
+++ b/pkg/generic/grpcjson_test/generic_test.go
@@ -174,7 +174,9 @@ func getJsonThriftGeneric(idl string, enableDynamicgo bool) (generic.Generic, er
 
 func initMockTestServer(handler kt.TestService, address string) server.Server {
 	addr, _ := net.ResolveTCPAddr("tcp", address)
-	return newMockServer(handler, addr)
+	svr := newMockServer(handler, addr)
+	test.WaitServerStart(addr.String())
+	return svr
 }
 
 func testClientStreaming(t *testing.T, ctx context.Context, cli genericclient.Client) {
diff --git a/pkg/generic/grpcjsonpb_test/generic_test.go b/pkg/generic/grpcjsonpb_test/generic_test.go
index 2f10b545af..bed8c479d8 100644
--- a/pkg/generic/grpcjsonpb_test/generic_test.go
+++ b/pkg/generic/grpcjsonpb_test/generic_test.go
@@ -158,7 +158,9 @@ func initStreamingClient(t *testing.T, ctx context.Context, addr, idl string, cl
 
 func initMockTestServer(handler mock.Mock, address string) server.Server {
 	addr, _ := net.ResolveTCPAddr("tcp", address)
-	return newMockTestServer(handler, addr)
+	svr := newMockTestServer(handler, addr)
+	test.WaitServerStart(addr.String())
+	return svr
 }
 
 func Test_invocationContainsPackage(t *testing.T) {