diff --git a/credentials/google/google_test.go b/credentials/google/google_test.go
index 8c08712087d..0699b9ad4e0 100644
--- a/credentials/google/google_test.go
+++ b/credentials/google/google_test.go
@@ -26,9 +26,18 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/internal"
 	icredentials "google.golang.org/grpc/internal/credentials"
+	"google.golang.org/grpc/internal/grpctest"
 	"google.golang.org/grpc/resolver"
 )
 
+type s struct {
+	grpctest.Tester
+}
+
+func Test(t *testing.T) {
+	grpctest.RunSubTests(t, s{})
+}
+
 type testCreds struct {
 	credentials.TransportCredentials
 	typ string
@@ -73,7 +82,7 @@ func overrideNewCredsFuncs() func() {
 // TestClientHandshakeBasedOnClusterName that by default (without switching
 // modes), ClientHandshake does either tls or alts base on the cluster name in
 // attributes.
-func TestClientHandshakeBasedOnClusterName(t *testing.T) {
+func (s) TestClientHandshakeBasedOnClusterName(t *testing.T) {
 	defer overrideNewCredsFuncs()()
 	for bundleTyp, tc := range map[string]credentials.Bundle{
 		"defaultCredsWithOptions": NewDefaultCredentialsWithOptions(DefaultCredentialsOptions{}),