diff --git a/clientconn_authority_test.go b/clientconn_authority_test.go
index 6eec582bdd03..eb7d1345f9a0 100644
--- a/clientconn_authority_test.go
+++ b/clientconn_authority_test.go
@@ -109,9 +109,9 @@ func (s) TestClientConnAuthority(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			cc, err := Dial(test.target, test.opts...)
+			cc, err := NewClient(test.target, test.opts...)
 			if err != nil {
-				t.Fatalf("Dial(%q) failed: %v", test.target, err)
+				t.Fatalf("grpc.NewClient(%q) failed: %v", test.target, err)
 			}
 			defer cc.Close()
 			if cc.authority != test.wantAuthority {
diff --git a/clientconn_parsed_target_test.go b/clientconn_parsed_target_test.go
index 499125a7c16a..db5b7f5d3f75 100644
--- a/clientconn_parsed_target_test.go
+++ b/clientconn_parsed_target_test.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/internal"
 	"google.golang.org/grpc/internal/testutils"
@@ -195,10 +196,15 @@ func (s) TestParsedTarget_Failure_WithoutCustomDialer(t *testing.T) {
 
 	for _, target := range targets {
 		t.Run(target, func(t *testing.T) {
-			if cc, err := Dial(target, WithTransportCredentials(insecure.NewCredentials())); err == nil {
-				defer cc.Close()
-				t.Fatalf("Dial(%q) succeeded cc.parsedTarget = %+v, expected to fail", target, cc.parsedTarget)
+			ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+			defer cancel()
+			cc, err := NewClient(target, WithTransportCredentials(insecure.NewCredentials()))
+			if err != nil {
+				t.Fatalf("grpc.NewClient(%q) failed: %v, expected to succeed", target, err)
 			}
+			defer cc.Close()
+			cc.Connect()
+			testutils.AwaitState(ctx, t, cc, connectivity.Idle)
 		})
 	}
 }
@@ -273,11 +279,12 @@ func (s) TestParsedTarget_WithCustomDialer(t *testing.T) {
 				return nil, errors.New("dialer error")
 			}
 
-			cc, err := Dial(test.target, WithTransportCredentials(insecure.NewCredentials()), WithContextDialer(dialer))
+			cc, err := NewClient(test.target, WithTransportCredentials(insecure.NewCredentials()), withDefaultScheme(defScheme), WithContextDialer(dialer))
 			if err != nil {
-				t.Fatalf("Dial(%q) failed: %v", test.target, err)
+				t.Fatalf("grpc.NewClient(%q) failed: %v", test.target, err)
 			}
 			defer cc.Close()
+			cc.Connect()
 
 			select {
 			case addr := <-addrCh:
diff --git a/default_dial_option_server_option_test.go b/default_dial_option_server_option_test.go
index a9544d6156c8..f9fa6a4e77c2 100644
--- a/default_dial_option_server_option_test.go
+++ b/default_dial_option_server_option_test.go
@@ -29,12 +29,12 @@ import (
 )
 
 func (s) TestAddGlobalDialOptions(t *testing.T) {
-	// Ensure the Dial fails without credentials
-	if _, err := Dial("fake"); err == nil {
-		t.Fatalf("Dialing without a credential did not fail")
+	// Ensure the NewClient fails without credentials
+	if _, err := NewClient("fake"); err == nil {
+		t.Fatalf("grpc.NewClient without a credential did not fail")
 	} else {
 		if !strings.Contains(err.Error(), "no transport security set") {
-			t.Fatalf("Dialing failed with unexpected error: %v", err)
+			t.Fatalf("grpc.NewClient failed with unexpected error: %v", err)
 		}
 	}
 
@@ -48,9 +48,9 @@ func (s) TestAddGlobalDialOptions(t *testing.T) {
 		}
 	}
 
-	// Ensure the Dial passes with the extra dial options
-	if cc, err := Dial("fake"); err != nil {
-		t.Fatalf("Dialing with insecure credential failed: %v", err)
+	// Ensure the NewClient passes with the extra dial options
+	if cc, err := NewClient("fake"); err != nil {
+		t.Fatalf("grpc.NewClient with insecure credential failed: %v", err)
 	} else {
 		cc.Close()
 	}
@@ -71,8 +71,8 @@ func (s) TestDisableGlobalOptions(t *testing.T) {
 	// due to the global dial options with credentials not being picked up due
 	// to global options being disabled.
 	noTSecStr := "no transport security set"
-	if _, err := Dial("fake", internal.DisableGlobalDialOptions.(func() DialOption)()); !strings.Contains(fmt.Sprint(err), noTSecStr) {
-		t.Fatalf("Dialing received unexpected error: %v, want error containing \"%v\"", err, noTSecStr)
+	if _, err := NewClient("fake", internal.DisableGlobalDialOptions.(func() DialOption)()); !strings.Contains(fmt.Sprint(err), noTSecStr) {
+		t.Fatalf("grpc.NewClient received unexpected error: %v, want error containing \"%v\"", err, noTSecStr)
 	}
 }
 
@@ -95,11 +95,11 @@ func (s) TestGlobalPerTargetDialOption(t *testing.T) {
 	defer internal.ClearGlobalPerTargetDialOptions()
 	noTSecStr := "no transport security set"
 	if _, err := NewClient("dns:///fake"); !strings.Contains(fmt.Sprint(err), noTSecStr) {
-		t.Fatalf("Dialing received unexpected error: %v, want error containing \"%v\"", err, noTSecStr)
+		t.Fatalf("grpc.NewClient received unexpected error: %v, want error containing \"%v\"", err, noTSecStr)
 	}
 	cc, err := NewClient("passthrough:///nice")
 	if err != nil {
-		t.Fatalf("Dialing with insecure credentials failed: %v", err)
+		t.Fatalf("grpc.NewClient with insecure credentials failed: %v", err)
 	}
 	cc.Close()
 }
@@ -135,9 +135,9 @@ func (s) TestJoinDialOption(t *testing.T) {
 	const maxRecvSize = 998765
 	const initialWindowSize = 100
 	jdo := newJoinDialOption(WithTransportCredentials(insecure.NewCredentials()), WithReadBufferSize(maxRecvSize), WithInitialWindowSize(initialWindowSize))
-	cc, err := Dial("fake", jdo)
+	cc, err := NewClient("fake", jdo)
 	if err != nil {
-		t.Fatalf("Dialing with insecure credentials failed: %v", err)
+		t.Fatalf("grpc.NewClient with insecure credentials failed: %v", err)
 	}
 	defer cc.Close()
 	if cc.dopts.copts.ReadBufferSize != maxRecvSize {
diff --git a/resolver_test.go b/resolver_test.go
index 9262f6ce7f9a..8552b8eb95c5 100644
--- a/resolver_test.go
+++ b/resolver_test.go
@@ -63,9 +63,9 @@ func (s) TestResolverCaseSensitivity(t *testing.T) {
 		return nil, fmt.Errorf("not dialing with custom dialer")
 	}
 
-	cc, err := Dial(target, WithContextDialer(customDialer), WithTransportCredentials(insecure.NewCredentials()))
+	cc, err := NewClient(target, WithContextDialer(customDialer), WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
-		t.Fatalf("Unexpected Dial(%q) error: %v", target, err)
+		t.Fatalf("Unexpected grpc.NewClient(%q) error: %v", target, err)
 	}
 	cc.Connect()
 	if got, want := <-addrCh, "localhost:1234"; got != want {
@@ -85,9 +85,9 @@ func (s) TestResolverCaseSensitivity(t *testing.T) {
 	// This results in "passthrough" being used with the address as the whole
 	// target.
 	target = "caseTest2:///localhost:1234"
-	cc, err = Dial(target, WithContextDialer(customDialer), WithResolvers(res), WithTransportCredentials(insecure.NewCredentials()))
+	cc, err = NewClient(target, WithContextDialer(customDialer), withDefaultScheme("passthrough"), WithResolvers(res), WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
-		t.Fatalf("Unexpected Dial(%q) error: %v", target, err)
+		t.Fatalf("Unexpected grpc.NewClient(%q) error: %v", target, err)
 	}
 	cc.Connect()
 	if got, want := <-addrCh, target; got != want {