diff --git a/api/client/client_test.go b/api/client/client_test.go
index 33d0c1d8f9946..3772459c47b19 100644
--- a/api/client/client_test.go
+++ b/api/client/client_test.go
@@ -46,7 +46,7 @@ func TestMain(m *testing.M) {
 }
 
 type pingService struct {
-	*proto.UnimplementedAuthServiceServer
+	proto.UnimplementedAuthServiceServer
 	userAgentFromLastCallValue atomic.Value
 }
 
@@ -192,7 +192,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 a8a8509866d67..c0068f4be47f7 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/proxy/client_test.go b/api/client/proxy/client_test.go
index 7cb788e5e76af..6a1671aaf8f37 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 70bf5dd266a70..71790bbfe1218 100644
--- a/integration/proxy/teleterm_test.go
+++ b/integration/proxy/teleterm_test.go
@@ -297,7 +297,7 @@ func testGatewayCertRenewal(ctx context.Context, t *testing.T, params gatewayCer
 }
 
 type mockTSHDEventsService struct {
-	*api.UnimplementedTshdEventsServiceServer
+	api.UnimplementedTshdEventsServiceServer
 
 	t                         *testing.T
 	tc                        *libclient.TeleportClient
diff --git a/lib/joinserver/joinserver.go b/lib/joinserver/joinserver.go
index 82aebfb65968a..7284ecc36a84a 100644
--- a/lib/joinserver/joinserver.go
+++ b/lib/joinserver/joinserver.go
@@ -62,7 +62,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 7617fc465311f..757a73467e3a2 100644
--- a/lib/teleterm/daemon/daemon_test.go
+++ b/lib/teleterm/daemon/daemon_test.go
@@ -580,7 +580,7 @@ func TestImportantModalSemaphore(t *testing.T) {
 }
 
 type mockTSHDEventsService struct {
-	*api.UnimplementedTshdEventsServiceServer
+	api.UnimplementedTshdEventsServiceServer
 	reloginErr                             error
 	reloginCount                           atomic.Uint32
 	sendNotificationCount                  atomic.Uint32
diff --git a/lib/uds/cred_test.go b/lib/uds/cred_test.go
index fa296ef847e70..d496758db3bbd 100644
--- a/lib/uds/cred_test.go
+++ b/lib/uds/cred_test.go
@@ -76,7 +76,7 @@ func TestGetCreds(t *testing.T) {
 }
 
 type service struct {
-	*machineidv1.UnimplementedBotServiceServer
+	machineidv1.UnimplementedBotServiceServer
 	lastCalledCreds *Creds
 }