diff --git a/agent/grpc/client_test.go b/agent/grpc/client_test.go
index 1bec1f580f..284daae9e3 100644
--- a/agent/grpc/client_test.go
+++ b/agent/grpc/client_test.go
@@ -126,7 +126,7 @@ func TestClientConnPool_ForwardToLeader_Failover(t *testing.T) {
 	var servers []testServer
 	for i := 0; i < count; i++ {
 		name := fmt.Sprintf("server-%d", i)
-		srv := newTestServer(t, name, "dc1")
+		srv := newSimpleTestServer(t, name, "dc1")
 		res.AddServer(srv.Metadata())
 		servers = append(servers, srv)
 		t.Cleanup(srv.shutdown)
diff --git a/agent/xds/server.go b/agent/xds/server.go
index c3ddbda426..c0be9c560d 100644
--- a/agent/xds/server.go
+++ b/agent/xds/server.go
@@ -563,7 +563,7 @@ func newPanicHandler(logger hclog.Logger) recovery.RecoveryHandlerFuncContext {
 // NewGRPCServer creates a grpc.Server, registers the Server, and then returns
 // the grpc.Server.
 func NewGRPCServer(s *Server, tlsConfigurator *tlsutil.Configurator) *grpc.Server {
-  recoveryOpts := []recovery.Option{
+	recoveryOpts := []recovery.Option{
 		recovery.WithRecoveryHandlerContext(newPanicHandler(s.Logger)),
 	}