diff --git a/public/app/features/alerting/unified/RuleList.test.tsx b/public/app/features/alerting/unified/RuleList.test.tsx
index 8b96db2db06..a02a5b6a67a 100644
--- a/public/app/features/alerting/unified/RuleList.test.tsx
+++ b/public/app/features/alerting/unified/RuleList.test.tsx
@@ -26,6 +26,7 @@ import {
 } from 'app/features/alerting/unified/mockApi';
 import { mockAlertmanagerChoiceResponse } from 'app/features/alerting/unified/mocks/alertmanagerApi';
 import * as actions from 'app/features/alerting/unified/state/actions';
+import { getMockUser } from 'app/features/users/__mocks__/userMocks';
 import { AlertmanagerChoice } from 'app/plugins/datasource/alertmanager/types';
 import { AccessControlAction } from 'app/types';
 import { PromAlertingRuleState, PromApplication } from 'app/types/unified-alerting-dto';
@@ -49,7 +50,6 @@ import {
   somePromRules,
   someRulerRules,
   mockFolder,
-  mockUser,
 } from './mocks';
 import * as config from './utils/config';
 import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from './utils/datasource';
@@ -164,7 +164,7 @@ const server = setupServer();
 
 const configureMockServer = () => {
   mockSearchApi(server).search([]);
-  mockUserApi(server).user(mockUser());
+  mockUserApi(server).user(getMockUser());
   mockFolderApi(server).folder(
     'NAMESPACE_UID',
     mockFolder({
diff --git a/public/app/features/alerting/unified/mockApi.ts b/public/app/features/alerting/unified/mockApi.ts
index 3e629fb351b..98bef2dccec 100644
--- a/public/app/features/alerting/unified/mockApi.ts
+++ b/public/app/features/alerting/unified/mockApi.ts
@@ -6,6 +6,7 @@ import { setupServer, SetupServer } from 'msw/node';
 import { DataSourceInstanceSettings, PluginMeta } from '@grafana/data';
 import { setBackendSrv } from '@grafana/runtime';
 import { AlertRuleUpdated } from 'app/features/alerting/unified/api/alertRuleApi';
+import { DashboardDTO, FolderDTO, NotifierDTO, OrgUser } from 'app/types';
 import {
   PromBuildInfoResponse,
   PromRulesResponse,
@@ -23,7 +24,6 @@ import {
   MatcherOperator,
   Route,
 } from '../../../plugins/datasource/alertmanager/types';
-import { DashboardDTO, FolderDTO, NotifierDTO, UserDTO } from '../../../types';
 import { DashboardSearchItem } from '../../search/types';
 
 import { CreateIntegrationDTO, NewOnCallIntegrationDTO, OnCallIntegrationDTO } from './api/onCallApi';
@@ -404,7 +404,7 @@ export function mockSearchApi(server: SetupServer) {
 
 export function mockUserApi(server: SetupServer) {
   return {
-    user: (user: UserDTO) => {
+    user: (user: OrgUser) => {
       server.use(http.get(`/api/user`, () => HttpResponse.json(user)));
     },
   };
diff --git a/public/app/features/alerting/unified/mocks.ts b/public/app/features/alerting/unified/mocks.ts
index 9b3a72cf103..458d97df016 100644
--- a/public/app/features/alerting/unified/mocks.ts
+++ b/public/app/features/alerting/unified/mocks.ts
@@ -31,15 +31,7 @@ import {
   SilenceState,
 } from 'app/plugins/datasource/alertmanager/types';
 import { configureStore } from 'app/store/configureStore';
-import {
-  AccessControlAction,
-  DashboardDTO,
-  FolderDTO,
-  NotifiersState,
-  ReceiversState,
-  StoreState,
-  UserDTO,
-} from 'app/types';
+import { AccessControlAction, DashboardDTO, FolderDTO, NotifiersState, ReceiversState, StoreState } from 'app/types';
 import {
   Alert,
   AlertingRule,
@@ -619,18 +611,6 @@ export const mockFolder = (partial?: Partial<FolderDTO>): FolderDTO => {
   };
 };
 
-export const mockUser = (partial?: Partial<UserDTO>): UserDTO => {
-  return {
-    id: 1,
-    login: 'admin',
-    email: 'admin@grafana.com',
-    name: 'Admin',
-    isGrafanaAdmin: true,
-    isDisabled: false,
-    ...partial,
-  };
-};
-
 export const grantUserPermissions = (permissions: AccessControlAction[]) => {
   jest
     .spyOn(contextSrv, 'hasPermission')