diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 024dd9cbc..d67e478a4 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -83,4 +83,4 @@ jobs:
           git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
           cd opensearch-dashboards-functional-test
           npm install cypress --save-dev
-          yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js"
+          yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security/inaccessible_tenancy_features.js"
diff --git a/public/apps/configuration/app-router.tsx b/public/apps/configuration/app-router.tsx
index 8fba2f24f..782d833a7 100644
--- a/public/apps/configuration/app-router.tsx
+++ b/public/apps/configuration/app-router.tsx
@@ -70,10 +70,6 @@ const ROUTE_MAP: { [key: string]: RouteItem } = {
     name: 'Tenants',
     href: buildUrl(ResourceType.tenants),
   },
-  [ResourceType.tenantsManageTab]: {
-    name: 'TenantsManageTab',
-    href: buildUrl(ResourceType.tenantsManageTab),
-  },
   [ResourceType.tenantsConfigureTab]: {
     name: '',
     href: buildUrl(ResourceType.tenantsConfigureTab),
@@ -88,22 +84,27 @@ const ROUTE_MAP: { [key: string]: RouteItem } = {
   },
 };
 
-const ROUTE_LIST = [
-  ROUTE_MAP.getStarted,
-  ROUTE_MAP[ResourceType.auth],
-  ROUTE_MAP[ResourceType.roles],
-  ROUTE_MAP[ResourceType.users],
-  ROUTE_MAP[ResourceType.serviceAccounts],
-  ROUTE_MAP[ResourceType.permissions],
-  ROUTE_MAP[ResourceType.tenants],
-  ROUTE_MAP[ResourceType.auditLogging],
-  ROUTE_MAP[ResourceType.tenantsConfigureTab],
-];
+const getRouteList = (multitenancyEnabled: boolean) => {
+  return [
+    ROUTE_MAP.getStarted,
+    ROUTE_MAP[ResourceType.auth],
+    ROUTE_MAP[ResourceType.roles],
+    ROUTE_MAP[ResourceType.users],
+    ROUTE_MAP[ResourceType.serviceAccounts],
+    ROUTE_MAP[ResourceType.permissions],
+    ...(multitenancyEnabled ? [ROUTE_MAP[ResourceType.tenants]] : []),
+    ROUTE_MAP[ResourceType.auditLogging],
+  ];
+};
 
-const allNavPanelUrls = ROUTE_LIST.map((route) => route.href).concat([
-  buildUrl(ResourceType.auditLogging) + SUB_URL_FOR_GENERAL_SETTINGS_EDIT,
-  buildUrl(ResourceType.auditLogging) + SUB_URL_FOR_COMPLIANCE_SETTINGS_EDIT,
-]);
+export const allNavPanelUrls = (multitenancyEnabled: boolean) =>
+  getRouteList(multitenancyEnabled)
+    .map((route) => route.href)
+    .concat([
+      buildUrl(ResourceType.auditLogging) + SUB_URL_FOR_GENERAL_SETTINGS_EDIT,
+      buildUrl(ResourceType.auditLogging) + SUB_URL_FOR_COMPLIANCE_SETTINGS_EDIT,
+      ...(multitenancyEnabled ? [buildUrl(ResourceType.tenantsConfigureTab)] : []),
+    ]);
 
 export function getBreadcrumbs(
   resourceType?: ResourceType,
@@ -155,21 +156,46 @@ export const LocalCluster = { label: 'Local cluster', id: '' };
 export const DataSourceContext = createContext<DataSourceContextType | null>(null);
 
 export function AppRouter(props: AppDependencies) {
+  const multitenancyEnabled = props.config.multitenancy.enabled;
   const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const setGlobalBreadcrumbs = flow(getBreadcrumbs, props.coreStart.chrome.setBreadcrumbs);
   const dataSourceFromUrl = dataSourceEnabled ? getDataSourceFromUrl() : LocalCluster;
 
   const [dataSource, setDataSource] = useState<DataSourceOption>(dataSourceFromUrl);
 
+  function getTenancyRoutes() {
+    if (multitenancyEnabled) {
+      return (
+        <>
+          <Route
+            path={ROUTE_MAP.tenants.href}
+            render={() => {
+              setGlobalBreadcrumbs(ResourceType.tenants);
+              return <TenantList tabID={'Manage'} {...props} />;
+            }}
+          />
+          <Route
+            path={ROUTE_MAP.tenantsConfigureTab.href}
+            render={() => {
+              setGlobalBreadcrumbs(ResourceType.tenants);
+              return <TenantList tabID={'Configure'} {...props} />;
+            }}
+          />
+        </>
+      );
+    }
+    return null;
+  }
+
   return (
     <DataSourceContext.Provider value={{ dataSource, setDataSource }}>
       <Router basename={props.params.appBasePath}>
         <EuiPage>
-          {allNavPanelUrls.map((route) => (
+          {allNavPanelUrls(multitenancyEnabled).map((route) => (
             // Create different routes to update the 'selected' nav item .
             <Route key={route} path={route} exact>
               <EuiPageSideBar>
-                <NavPanel items={ROUTE_LIST} />
+                <NavPanel items={getRouteList(multitenancyEnabled)} />
               </EuiPageSideBar>
             </Route>
           ))}
@@ -267,20 +293,6 @@ export function AppRouter(props: AppDependencies) {
                   return <PermissionList {...props} />;
                 }}
               />
-              <Route
-                path={ROUTE_MAP.tenants.href}
-                render={() => {
-                  setGlobalBreadcrumbs(ResourceType.tenants);
-                  return <TenantList tabID={'Manage'} {...props} />;
-                }}
-              />
-              <Route
-                path={ROUTE_MAP.tenantsConfigureTab.href}
-                render={() => {
-                  setGlobalBreadcrumbs(ResourceType.tenants);
-                  return <TenantList tabID={'Configure'} {...props} />;
-                }}
-              />
               <Route
                 path={ROUTE_MAP.getStarted.href}
                 render={() => {
@@ -288,6 +300,7 @@ export function AppRouter(props: AppDependencies) {
                   return <GetStarted {...props} />;
                 }}
               />
+              {getTenancyRoutes()}
               <Redirect exact from="/" to={LANDING_PAGE_URL} />
             </Switch>
           </EuiPageBody>
diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
index ced4503c2..dceea1691 100644
--- a/public/apps/configuration/panels/get-started.tsx
+++ b/public/apps/configuration/panels/get-started.tsx
@@ -280,39 +280,41 @@ export function GetStarted(props: AppDependencies) {
 
         <EuiSpacer size="l" />
 
-        <EuiPanel paddingSize="l">
-          <EuiTitle size="s">
-            <h3>Optional: Multi-tenancy</h3>
-          </EuiTitle>
-          <EuiText size="s" color="subdued">
-            <p>
-              By default tenancy is activated in Dashboards. Tenants in OpenSearch Dashboards are
-              spaces for saving index patterns, visualizations, dashboards, and other OpenSearch
-              Dashboards objects.
-            </p>
-            <EuiFlexGroup gutterSize="s">
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  fill
-                  onClick={() => {
-                    window.location.href = buildHashUrl(ResourceType.tenants);
-                  }}
-                >
-                  Manage Multi-tenancy
-                </EuiButton>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  onClick={() => {
-                    window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab);
-                  }}
-                >
-                  Configure Multi-tenancy
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiText>
-        </EuiPanel>
+        {props.config.multitenancy.enabled ? (
+          <EuiPanel paddingSize="l">
+            <EuiTitle size="s">
+              <h3>Optional: Multi-tenancy</h3>
+            </EuiTitle>
+            <EuiText size="s" color="subdued">
+              <p>
+                By default tenancy is activated in Dashboards. Tenants in OpenSearch Dashboards are
+                spaces for saving index patterns, visualizations, dashboards, and other OpenSearch
+                Dashboards objects.
+              </p>
+              <EuiFlexGroup gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    fill
+                    onClick={() => {
+                      window.location.href = buildHashUrl(ResourceType.tenants);
+                    }}
+                  >
+                    Manage Multi-tenancy
+                  </EuiButton>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    onClick={() => {
+                      window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab);
+                    }}
+                  >
+                    Configure Multi-tenancy
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiText>
+          </EuiPanel>
+        ) : null}
       </div>
       <EuiGlobalToastList toasts={toasts} toastLifeTimeMs={10000} dismissToast={removeToast} />
     </>
diff --git a/public/apps/configuration/panels/tenant-list/tenant-instruction-view.tsx b/public/apps/configuration/panels/tenant-list/tenant-instruction-view.tsx
deleted file mode 100644
index d5e5ffe83..000000000
--- a/public/apps/configuration/panels/tenant-list/tenant-instruction-view.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *   Copyright OpenSearch Contributors
- *
- *   Licensed under the Apache License, Version 2.0 (the "License").
- *   You may not use this file except in compliance with the License.
- *   A copy of the License is located at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   or in the "license" file accompanying this file. This file is distributed
- *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- *   express or implied. See the License for the specific language governing
- *   permissions and limitations under the License.
- */
-
-import React from 'react';
-import { EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
-
-export function TenantInstructionView() {
-  return (
-    <>
-      <EuiTitle size="l">
-        <h1>Tenants</h1>
-      </EuiTitle>
-
-      <EuiSpacer size="xxl" />
-
-      <EuiText textAlign="center">
-        <h2>You have not enabled multi tenancy</h2>
-      </EuiText>
-
-      <EuiText textAlign="center" size="xs" color="subdued" className="instruction-text">
-        Contact your administrator to enable multi tenancy.
-      </EuiText>
-    </>
-  );
-}
diff --git a/public/apps/configuration/panels/tenant-list/tenant-list.tsx b/public/apps/configuration/panels/tenant-list/tenant-list.tsx
index 0b97c6ae1..bc6aa71b8 100644
--- a/public/apps/configuration/panels/tenant-list/tenant-list.tsx
+++ b/public/apps/configuration/panels/tenant-list/tenant-list.tsx
@@ -30,7 +30,6 @@ import { AppDependencies } from '../../../types';
 import { ExternalLink } from '../../utils/display-utils';
 import { DocLinks } from '../../constants';
 import { getDashboardsInfo } from '../../../../utils/dashboards-info-utils';
-import { TenantInstructionView } from './tenant-instruction-view';
 import { LocalCluster } from '../../app-router';
 import { SecurityPluginTopNavMenu } from '../../top-nav-menu';
 
@@ -59,8 +58,8 @@ export function TenantList(props: TenantListProps) {
     <>
       <EuiCallOut title="Tenancy is disabled" color="warning" iconType="iInCircle">
         <p>
-          Tenancy is currently disabled and users don&apos;t have access to this feature. To create,
-          edit tenants you must enabled tenanc throught he configure tenancy page.
+          Tenancy is currently disabled and users don&apos;t have access to this feature. Enable
+          tenancy through the configure tenancy page.
         </p>
         <EuiButton
           id="switchToConfigure"
@@ -129,10 +128,6 @@ export function TenantList(props: TenantListProps) {
     ));
   };
 
-  if (!props.config.multitenancy.enabled) {
-    return <TenantInstructionView />;
-  }
-
   return (
     <>
       <SecurityPluginTopNavMenu
diff --git a/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-instruction-view.test.tsx.snap b/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-instruction-view.test.tsx.snap
deleted file mode 100644
index 77b068439..000000000
--- a/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-instruction-view.test.tsx.snap
+++ /dev/null
@@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Tenant instruction view renders 1`] = `
-<Fragment>
-  <EuiTitle
-    size="l"
-  >
-    <h1>
-      Tenants
-    </h1>
-  </EuiTitle>
-  <EuiSpacer
-    size="xxl"
-  />
-  <EuiText
-    textAlign="center"
-  >
-    <h2>
-      You have not enabled multi tenancy
-    </h2>
-  </EuiText>
-  <EuiText
-    className="instruction-text"
-    color="subdued"
-    size="xs"
-    textAlign="center"
-  >
-    Contact your administrator to enable multi tenancy.
-  </EuiText>
-</Fragment>
-`;
diff --git a/public/apps/configuration/panels/tenant-list/test/tenant-instruction-view.test.tsx b/public/apps/configuration/panels/tenant-list/test/tenant-instruction-view.test.tsx
deleted file mode 100644
index 929ab0629..000000000
--- a/public/apps/configuration/panels/tenant-list/test/tenant-instruction-view.test.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *   Copyright OpenSearch Contributors
- *
- *   Licensed under the Apache License, Version 2.0 (the "License").
- *   You may not use this file except in compliance with the License.
- *   A copy of the License is located at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   or in the "license" file accompanying this file. This file is distributed
- *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- *   express or implied. See the License for the specific language governing
- *   permissions and limitations under the License.
- */
-
-import { shallow } from 'enzyme';
-import React from 'react';
-import { TenantInstructionView } from '../tenant-instruction-view';
-
-describe('Tenant instruction view', () => {
-  it('renders', () => {
-    const component = shallow(<TenantInstructionView />);
-    expect(component).toMatchSnapshot();
-  });
-});
diff --git a/public/apps/configuration/panels/tenant-list/test/tenant-list.test.tsx b/public/apps/configuration/panels/tenant-list/test/tenant-list.test.tsx
index a00a417d8..e6f5bfbf3 100644
--- a/public/apps/configuration/panels/tenant-list/test/tenant-list.test.tsx
+++ b/public/apps/configuration/panels/tenant-list/test/tenant-list.test.tsx
@@ -20,7 +20,6 @@ import { EuiInMemoryTable } from '@elastic/eui';
 import { useDeleteConfirmState } from '../../../utils/delete-confirm-modal-utils';
 import { Tenant } from '../../../types';
 import { TenantEditModal } from '../edit-modal';
-import { TenantInstructionView } from '../tenant-instruction-view';
 import { getDashboardsInfo } from '../../../../../utils/dashboards-info-utils';
 
 jest.mock('../../../utils/tenant-utils');
@@ -107,33 +106,6 @@ describe('Tenant list', () => {
     expect(component.find(EuiInMemoryTable).prop('items').length).toBe(0);
   });
 
-  it('renders when multitenancy is disabled in the opensearch_dashboards.yml', () => {
-    (getDashboardsInfo as jest.Mock).mockImplementation(() => {
-      return {
-        multitenancy_enabled: false,
-        private_tenant_enabled: true,
-        default_tenant: '',
-      };
-    });
-    const config1 = {
-      multitenancy: {
-        enabled: false,
-        tenants: {
-          enable_private: true,
-        },
-      },
-    };
-    const component = shallow(
-      <ManageTab
-        coreStart={mockCoreStart as any}
-        depsStart={{} as any}
-        params={{} as any}
-        config={config1 as any}
-      />
-    );
-    expect(component.find(TenantInstructionView).length).toBe(0);
-  });
-
   it('fetch data error', (done) => {
     jest.spyOn(React, 'useEffect').mockImplementationOnce((f) => f());
     // Hide the error message
diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
index bbecedbc5..9c4bdb223 100644
--- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
+++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
@@ -33,6 +33,9 @@ exports[`Get started (landing page) renders when backend configuration is disabl
     <Memo()
       config={
         Object {
+          "multitenancy": Object {
+            "enabled": true,
+          },
           "ui": Object {
             "backend_configurable": false,
           },
@@ -309,6 +312,9 @@ exports[`Get started (landing page) renders when backend configuration is enable
     <Memo()
       config={
         Object {
+          "multitenancy": Object {
+            "enabled": true,
+          },
           "ui": Object {
             "backend_configurable": true,
           },
diff --git a/public/apps/configuration/panels/test/get-started.test.tsx b/public/apps/configuration/panels/test/get-started.test.tsx
index 834b9cdea..578702c96 100644
--- a/public/apps/configuration/panels/test/get-started.test.tsx
+++ b/public/apps/configuration/panels/test/get-started.test.tsx
@@ -43,6 +43,9 @@ describe('Get started (landing page)', () => {
     ui: {
       backend_configurable: true,
     },
+    multitenancy: {
+      enabled: true,
+    },
   };
   afterEach(() => {
     React.useContext.mockRestore();
@@ -69,6 +72,9 @@ describe('Get started (landing page)', () => {
       ui: {
         backend_configurable: false,
       },
+      multitenancy: {
+        enabled: true,
+      },
     };
     const component = shallow(
       <GetStarted
diff --git a/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap b/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap
index 4696ecc12..ce8a72df0 100644
--- a/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap
+++ b/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap
@@ -57,10 +57,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -107,10 +103,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -157,10 +149,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -207,10 +195,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -257,10 +241,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -307,10 +287,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -357,10 +333,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -407,10 +379,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -418,8 +386,8 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
       </Route>
       <Route
         exact={true}
-        key="/tenantsConfigureTab"
-        path="/tenantsConfigureTab"
+        key="/auditLogging/edit/generalSettings"
+        path="/auditLogging/edit/generalSettings"
       >
         <EuiPageSideBar>
           <NavPanel
@@ -457,10 +425,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -468,8 +432,8 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
       </Route>
       <Route
         exact={true}
-        key="/auditLogging/edit/generalSettings"
-        path="/auditLogging/edit/generalSettings"
+        key="/auditLogging/edit/complianceSettings"
+        path="/auditLogging/edit/complianceSettings"
       >
         <EuiPageSideBar>
           <NavPanel
@@ -507,10 +471,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -518,8 +478,8 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
       </Route>
       <Route
         exact={true}
-        key="/auditLogging/edit/complianceSettings"
-        path="/auditLogging/edit/complianceSettings"
+        key="/tenantsConfigureTab"
+        path="/tenantsConfigureTab"
       >
         <EuiPageSideBar>
           <NavPanel
@@ -557,10 +517,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
-                Object {
-                  "href": "/tenantsConfigureTab",
-                  "name": "",
-                },
               ]
             }
           />
@@ -617,15 +573,15 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
             render={[Function]}
           />
           <Route
-            path="/tenants"
+            path="/getstarted"
             render={[Function]}
           />
           <Route
-            path="/tenantsConfigureTab"
+            path="/tenants"
             render={[Function]}
           />
           <Route
-            path="/getstarted"
+            path="/tenantsConfigureTab"
             render={[Function]}
           />
           <Redirect
diff --git a/public/apps/configuration/test/app-router.test.tsx b/public/apps/configuration/test/app-router.test.tsx
index bf75a24ac..540f44614 100644
--- a/public/apps/configuration/test/app-router.test.tsx
+++ b/public/apps/configuration/test/app-router.test.tsx
@@ -15,7 +15,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { AppRouter } from '../app-router';
+import { AppRouter, allNavPanelUrls } from '../app-router';
 import { getDataSourceFromUrl } from '../../../utils/datasource-utils';
 
 jest.mock('../../../utils/datasource-utils', () => ({
@@ -33,23 +33,28 @@ describe('SecurityPluginTopNavMenu', () => {
     },
   };
 
-  const dataSourceMenuMock = jest.fn(() => <div>Mock DataSourceMenu</div>);
+  const securityPluginConfigMock = {
+    multitenancy: {
+      enabled: true,
+    },
+    ui: {},
+  };
 
-  const dataSourceManagementMock = {
-    ui: {
-      DataSourceMenu: dataSourceMenuMock,
+  const securityPluginConfigMockMultitenancyDisabled = {
+    multitenancy: {
+      enabled: false,
     },
+    ui: {},
   };
 
   it('renders DataSourceMenu when dataSource is enabled', () => {
-    const securityPluginStartDepsMock = {
-      dataSource: {
-        dataSourceEnabled: true,
-      },
-    };
-
     const wrapper = shallow(
-      <AppRouter coreStart={coreStartMock} depsStart={{}} params={{ appBasePath: '' }} />
+      <AppRouter
+        coreStart={coreStartMock}
+        depsStart={{}}
+        params={{ appBasePath: '' }}
+        config={securityPluginConfigMock}
+      />
     );
 
     expect(wrapper).toMatchSnapshot();
@@ -67,6 +72,7 @@ describe('SecurityPluginTopNavMenu', () => {
         coreStart={coreStartMock}
         depsStart={securityPluginStartDepsMock}
         params={{ appBasePath: '' }}
+        config={securityPluginConfigMock}
       />
     );
 
@@ -85,9 +91,15 @@ describe('SecurityPluginTopNavMenu', () => {
         coreStart={coreStartMock}
         depsStart={securityPluginStartDepsMock}
         params={{ appBasePath: '' }}
+        config={securityPluginConfigMock}
       />
     );
 
     expect(getDataSourceFromUrl).toHaveBeenCalled();
   });
+
+  it('checks paths returned with multitenancy off vs on', () => {
+    expect(allNavPanelUrls(true)).toContain('/tenants');
+    expect(allNavPanelUrls(false)).not.toContain('/tenants');
+  });
 });
diff --git a/public/apps/configuration/test/top-nav-menu.test.tsx b/public/apps/configuration/test/top-nav-menu.test.tsx
index 867474aa8..62d495877 100644
--- a/public/apps/configuration/test/top-nav-menu.test.tsx
+++ b/public/apps/configuration/test/top-nav-menu.test.tsx
@@ -39,11 +39,17 @@ describe('SecurityPluginTopNavMenu', () => {
         dataSourceEnabled: true,
       },
     };
+    const securityPluginConfigMock = {
+      multitenancy: {
+        enabled: false,
+      },
+    };
 
     const wrapper = render(
       <SecurityPluginTopNavMenu
         coreStart={coreStartMock}
         depsStart={securityPluginStartDepsMock}
+        config={securityPluginConfigMock}
         dataSourcePickerReadOnly={false}
         dataSourceManagement={dataSourceManagementMock}
         selectedDataSource={{}}