diff --git a/plugins/auth-backend/src/identity/StaticTokenIssuer.test.ts b/plugins/auth-backend/src/identity/StaticTokenIssuer.test.ts
index b2aa9fa148..81d9e072f9 100644
--- a/plugins/auth-backend/src/identity/StaticTokenIssuer.test.ts
+++ b/plugins/auth-backend/src/identity/StaticTokenIssuer.test.ts
@@ -18,7 +18,7 @@ import { createLocalJWKSet, jwtVerify } from 'jose';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import { StaticKeyStore } from './StaticKeyStore';
 import { mockServices } from '@backstage/backend-test-utils';
-import { UserInfo } from '../database/UserInfoDatabase';
+import { UserInfoDatabase } from '../database/UserInfoDatabase';
 import { omit } from 'lodash';
 
 const logger = mockServices.logger.mock();
@@ -31,7 +31,7 @@ const entityRef = stringifyEntityRef({
 describe('StaticTokenIssuer', () => {
   const mockUserInfo = {
     addUserInfo: jest.fn().mockResolvedValue(undefined),
-  } as unknown as UserInfo;
+  } as unknown as UserInfoDatabase;
 
   const staticKeyStore = {
     listKeys: () => {
@@ -85,7 +85,7 @@ describe('StaticTokenIssuer', () => {
         logger,
         issuer: 'my-issuer',
         sessionExpirationSeconds: keyDurationSeconds,
-        UserInfo: mockUserInfo,
+        userInfo: mockUserInfo,
       },
       staticKeyStore as unknown as StaticKeyStore,
     );
@@ -131,7 +131,7 @@ describe('StaticTokenIssuer', () => {
         logger,
         issuer: 'my-issuer',
         sessionExpirationSeconds: keyDurationSeconds,
-        UserInfo: mockUserInfo,
+        userInfo: mockUserInfo,
         omitClaimsFromToken: ['ent'],
       },
       staticKeyStore as unknown as StaticKeyStore,
diff --git a/plugins/auth-backend/src/identity/TokenFactory.test.ts b/plugins/auth-backend/src/identity/TokenFactory.test.ts
index 0a03dc4df5..c6f87885ac 100644
--- a/plugins/auth-backend/src/identity/TokenFactory.test.ts
+++ b/plugins/auth-backend/src/identity/TokenFactory.test.ts
@@ -24,7 +24,7 @@ import {
 import { omit } from 'lodash';
 import { MemoryKeyStore } from './MemoryKeyStore';
 import { TokenFactory } from './TokenFactory';
-import { UserInfoDatabaseHandler } from '../database/UserInfoDatabase';
+import { UserInfoDatabase } from '../database/UserInfoDatabase';
 import { tokenTypes } from '@backstage/plugin-auth-node';
 import { mockServices } from '@backstage/backend-test-utils';
 
@@ -47,7 +47,7 @@ const entityRef = stringifyEntityRef({
 describe('TokenFactory', () => {
   const mockUserInfoDatabaseHandler = {
     addUserInfo: jest.fn().mockResolvedValue(undefined),
-  } as unknown as UserInfoDatabaseHandler;
+  } as unknown as UserInfoDatabase;
 
   it('should issue valid tokens signed by a listed key', async () => {
     const keyDurationSeconds = 5;
@@ -56,7 +56,7 @@ describe('TokenFactory', () => {
       keyStore: new MemoryKeyStore(),
       keyDurationSeconds,
       logger,
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     await expect(factory.listPublicKeys()).resolves.toEqual({ keys: [] });
@@ -139,7 +139,7 @@ describe('TokenFactory', () => {
       keyStore: new MemoryKeyStore(),
       keyDurationSeconds: 5,
       logger,
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     const { token: token1 } = await factory.issueToken({
@@ -185,7 +185,7 @@ describe('TokenFactory', () => {
       keyStore: new MemoryKeyStore(),
       keyDurationSeconds,
       logger,
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     await expect(() => {
@@ -203,7 +203,7 @@ describe('TokenFactory', () => {
       keyDurationSeconds,
       logger,
       algorithm: '',
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     await expect(() => {
@@ -219,7 +219,7 @@ describe('TokenFactory', () => {
       keyStore: new MemoryKeyStore(),
       keyDurationSeconds: 5,
       logger,
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     await expect(() => {
@@ -238,7 +238,7 @@ describe('TokenFactory', () => {
       keyStore: new MemoryKeyStore(),
       keyDurationSeconds,
       logger,
-      userInfoDatabaseHandler: mockUserInfoDatabaseHandler,
+      userInfo: mockUserInfoDatabaseHandler,
     });
 
     const { token } = await factory.issueToken({