diff --git a/api/client/client_test.go b/api/client/client_test.go
index 444de652bae90..48520e467dfac 100644
--- a/api/client/client_test.go
+++ b/api/client/client_test.go
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
 }
 
 type pingService struct {
-	*proto.UnimplementedAuthServiceServer
+	proto.UnimplementedAuthServiceServer
 	userAgentFromLastCallValue atomic.Value
 }
 
@@ -196,7 +196,7 @@ func TestWaitForConnectionReady(t *testing.T) {
 }
 
 type listResourcesService struct {
-	*proto.UnimplementedAuthServiceServer
+	proto.UnimplementedAuthServiceServer
 }
 
 func (s *listResourcesService) ListResources(ctx context.Context, req *proto.ListResourcesRequest) (*proto.ListResourcesResponse, error) {
diff --git a/api/client/joinservice_test.go b/api/client/joinservice_test.go
index 04966142d79c3..f060844550956 100644
--- a/api/client/joinservice_test.go
+++ b/api/client/joinservice_test.go
@@ -34,7 +34,7 @@ import (
 )
 
 type mockJoinServiceServer struct {
-	*proto.UnimplementedJoinServiceServer
+	proto.UnimplementedJoinServiceServer
 	registerUsingTPMMethod func(srv proto.JoinService_RegisterUsingTPMMethodServer) error
 }
 
diff --git a/api/client/mfa_test.go b/api/client/mfa_test.go
index d97b2d6f2da98..63deccb786841 100644
--- a/api/client/mfa_test.go
+++ b/api/client/mfa_test.go
@@ -32,7 +32,7 @@ const (
 )
 
 type mfaService struct {
-	*proto.UnimplementedAuthServiceServer
+	proto.UnimplementedAuthServiceServer
 }
 
 func (s *mfaService) Ping(ctx context.Context, req *proto.PingRequest) (*proto.PingResponse, error) {
diff --git a/api/client/proxy/client_test.go b/api/client/proxy/client_test.go
index b1e569b07f869..2897fed37cdab 100644
--- a/api/client/proxy/client_test.go
+++ b/api/client/proxy/client_test.go
@@ -114,16 +114,15 @@ type fakeGRPCServer struct {
 }
 
 type fakeAuthServer struct {
-	*proto.UnimplementedAuthServiceServer
+	proto.UnimplementedAuthServiceServer
 	listener net.Listener
 	srv      *grpc.Server
 }
 
 func newFakeAuthServer(t *testing.T, conn net.Conn) *fakeAuthServer {
 	f := &fakeAuthServer{
-		listener:                       newOneShotListener(conn),
-		UnimplementedAuthServiceServer: &proto.UnimplementedAuthServiceServer{},
-		srv:                            grpc.NewServer(),
+		listener: newOneShotListener(conn),
+		srv:      grpc.NewServer(),
 	}
 
 	t.Cleanup(f.Stop)
diff --git a/integration/proxy/teleterm_test.go b/integration/proxy/teleterm_test.go
index ea357ff3db7fd..7d1f447217e11 100644
--- a/integration/proxy/teleterm_test.go
+++ b/integration/proxy/teleterm_test.go
@@ -176,7 +176,7 @@ func testGatewayCertRenewal(t *testing.T, inst *helpers.TeleInstance, username,
 }
 
 type mockTSHDEventsService struct {
-	*api.UnimplementedTshdEventsServiceServer
+	api.UnimplementedTshdEventsServiceServer
 
 	tc         *libclient.TeleportClient
 	inst       *helpers.TeleInstance
diff --git a/integration/teleterm_test.go b/integration/teleterm_test.go
index 08197834b8b46..61a67ed25a49e 100644
--- a/integration/teleterm_test.go
+++ b/integration/teleterm_test.go
@@ -1071,7 +1071,7 @@ func mustLogin(t *testing.T, userName string, pack *dbhelpers.DatabasePack, cred
 }
 
 type mockTSHDEventsService struct {
-	*api.UnimplementedTshdEventsServiceServer
+	api.UnimplementedTshdEventsServiceServer
 	sendPendingHeadlessAuthenticationCount atomic.Uint32
 }
 
diff --git a/lib/joinserver/joinserver.go b/lib/joinserver/joinserver.go
index ca88606972e5c..45475676d1ca1 100644
--- a/lib/joinserver/joinserver.go
+++ b/lib/joinserver/joinserver.go
@@ -60,7 +60,7 @@ type joinServiceClient interface {
 // server. On the Auth Server, this is passed to auth.ServerWithRoles and
 // through to auth.Server to be handled.
 type JoinServiceGRPCServer struct {
-	*proto.UnimplementedJoinServiceServer
+	proto.UnimplementedJoinServiceServer
 
 	joinServiceClient joinServiceClient
 	clock             clockwork.Clock
diff --git a/lib/teleterm/daemon/daemon_test.go b/lib/teleterm/daemon/daemon_test.go
index a72ae38435593..89c309333e2e6 100644
--- a/lib/teleterm/daemon/daemon_test.go
+++ b/lib/teleterm/daemon/daemon_test.go
@@ -568,7 +568,7 @@ func TestImportantModalSemaphore(t *testing.T) {
 }
 
 type mockTSHDEventsService struct {
-	*api.UnimplementedTshdEventsServiceServer
+	api.UnimplementedTshdEventsServiceServer
 	reloginErr                             error
 	reloginCount                           atomic.Uint32
 	sendNotificationCount                  atomic.Uint32