diff --git a/grpcurl.go b/grpcurl.go
index 1112e1c..eb0cf00 100644
--- a/grpcurl.go
+++ b/grpcurl.go
@@ -871,7 +871,7 @@ func BlockingDial(ctx context.Context, address string, creds credentials.Transpo
 		once.Do(func() { wg.Done() })
 		ctx, cancel := context.WithTimeout(ctx, timeout)
 		defer cancel()
-		conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", address)
+		conn, err := (&net.Dialer{Cancel: ctx.Done()}).Dial("tcp", address)
 		if err != nil {
 			writeResult(err)
 			return nil, err
diff --git a/tls_settings_test.go b/tls_settings_test.go
index f396f8f..7c24efc 100644
--- a/tls_settings_test.go
+++ b/tls_settings_test.go
@@ -126,7 +126,8 @@ func TestBrokenTLS_ClientPlainText(t *testing.T) {
 	if !strings.Contains(err.Error(), "transport is closing") &&
 		!strings.Contains(err.Error(), "connection is unavailable") &&
 		!strings.Contains(err.Error(), "use of closed network connection") &&
-		!strings.Contains(err.Error(), "all SubConns are in TransientFailure") {
+		!strings.Contains(err.Error(), "all SubConns are in TransientFailure") &&
+		!strings.Contains(err.Error(), "deadline exceeded") {
 
 		t.Fatalf("expecting transport failure, got: %v", err)
 	}