diff --git a/test/channelz_test.go b/test/channelz_test.go
index 86e851e5..44e12d94 100644
--- a/test/channelz_test.go
+++ b/test/channelz_test.go
@@ -1526,6 +1526,7 @@ func TestCZSubChannelConnectivityState(t *testing.T) {
 	defer cleanup()
 	r.InitialAddrs([]resolver.Address{{Addr: te.srvAddr}})
 	te.resolverScheme = r.Scheme()
+	te.customDialOptions = []grpc.DialOption{grpc.WithWaitForHandshake()}
 	cc := te.clientConn()
 	defer te.tearDown()
 	tc := testpb.NewTestServiceClient(cc)
@@ -1621,6 +1622,7 @@ func TestCZChannelConnectivityState(t *testing.T) {
 	defer cleanup()
 	r.InitialAddrs([]resolver.Address{{Addr: te.srvAddr}})
 	te.resolverScheme = r.Scheme()
+	te.customDialOptions = []grpc.DialOption{grpc.WithWaitForHandshake()}
 	cc := te.clientConn()
 	defer te.tearDown()
 	tc := testpb.NewTestServiceClient(cc)