diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 472d29ed29413a..07546fa54ce4f4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -222,8 +222,7 @@
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional_endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/test/functional_endpoint_ingest_failure/ @elastic/endpoint-app-team @elastic/siem
+/x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
diff --git a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx b/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
index 4fbbcfc8d948aa..8f7e0e06fb7a16 100644
--- a/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/management_page_view.tsx
@@ -35,8 +35,7 @@ export const ManagementPageView = memo<Omit<PageViewProps, 'tabs'>>((options) =>
         href: getManagementUrl({ name: 'policyList' }),
       },
     ];
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tabName]);
+  }, [options.viewType, tabName]);
   return <PageView {...options} tabs={tabs} />;
 });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/host_details.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/host_details.tsx
index 6c447df6187919..9b0ca73cf021f5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/host_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/host_details.tsx
@@ -137,15 +137,14 @@ export const HostDetails = memo(({ details }: { details: HostMetadata }) => {
         description: details.agent.version,
       },
     ];
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
-    details.agent.version,
     details.endpoint.policy.id,
-    details.host.hostname,
     details.host.ip,
-    policyResponseUri.search,
-    policyStatusClickHandler,
+    details.host.hostname,
+    details.agent.version,
     policyStatus,
+    policyResponseUri,
+    policyStatusClickHandler,
   ]);
 
   return (
diff --git a/x-pack/plugins/security_solution/public/management/store/reducer.ts b/x-pack/plugins/security_solution/public/management/store/reducer.ts
index e00b3ec9e0f5ba..2ed3dfe86d2f8c 100644
--- a/x-pack/plugins/security_solution/public/management/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/store/reducer.ts
@@ -40,6 +40,5 @@ export const mockManagementState: Immutable<ManagementState> = {
 export const managementReducer = immutableCombineReducers({
   [MANAGEMENT_STORE_POLICY_LIST_NAMESPACE]: policyListReducer,
   [MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE]: policyDetailsReducer,
-  // @ts-ignore
   [MANAGEMENT_STORE_ENDPOINTS_NAMESPACE]: hostListReducer,
 });
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index c120e1f780761f..37b22a687741ed 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -6,7 +6,7 @@
 
 const alwaysImportedTests = [
   require.resolve('../test/functional/config.js'),
-  require.resolve('../test/functional_endpoint/config.ts'),
+  require.resolve('../test/security_solution_endpoint/config.ts'),
   require.resolve('../test/functional_with_es_ssl/config.ts'),
   require.resolve('../test/functional/config_security_basic.ts'),
   require.resolve('../test/functional/config_security_trial.ts'),
diff --git a/x-pack/test/functional_endpoint/page_objects/page_utils.ts b/x-pack/test/functional_endpoint/page_objects/page_utils.ts
deleted file mode 100644
index daf66464f7e1ed..00000000000000
--- a/x-pack/test/functional_endpoint/page_objects/page_utils.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function EndpointPageUtils({ getService }: FtrProviderContext) {
-  const find = getService('find');
-
-  return {
-    /**
-     * Finds a given EuiCheckbox by test subject and clicks on it
-     *
-     * @param euiCheckBoxTestId
-     */
-    async clickOnEuiCheckbox(euiCheckBoxTestId: string) {
-      // This utility is needed because EuiCheckbox forwards the test subject on to
-      // the actual `<input>` which is not actually visible/accessible on the page.
-      // In order to actually cause the state of the checkbox to change, the `<label>`
-      // must be clicked.
-      const euiCheckboxLabelElement = await find.byXPath(
-        `//input[@data-test-subj='${euiCheckBoxTestId}']/../label`
-      );
-
-      await euiCheckboxLabelElement.click();
-    },
-  };
-}
diff --git a/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/index.ts b/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/index.ts
deleted file mode 100644
index 98a312ba1a8278..00000000000000
--- a/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('endpoint when the ingest manager fails to setup correctly', function () {
-    this.tags('ciGroup7');
-
-    loadTestFile(require.resolve('./landing_page'));
-  });
-}
diff --git a/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/landing_page.ts b/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/landing_page.ts
deleted file mode 100644
index d7e5fae41ba67e..00000000000000
--- a/x-pack/test/functional_endpoint_ingest_failure/apps/endpoint/landing_page.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  describe('home page', function () {
-    const pageObjects = getPageObjects(['common']);
-    const testSubjects = getService('testSubjects');
-
-    before(async () => {
-      await pageObjects.common.navigateToApp('endpoint');
-    });
-
-    it('displays an error toast', async () => {
-      await testSubjects.existOrFail('euiToastHeader');
-    });
-  });
-};
diff --git a/x-pack/test/functional_endpoint_ingest_failure/config.ts b/x-pack/test/functional_endpoint_ingest_failure/config.ts
deleted file mode 100644
index 4654e325e6289e..00000000000000
--- a/x-pack/test/functional_endpoint_ingest_failure/config.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { resolve } from 'path';
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
-
-export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const xpackFunctionalConfig = await readConfigFile(
-    require.resolve('../functional_endpoint/config.ts')
-  );
-
-  return {
-    ...xpackFunctionalConfig.getAll(),
-    testFiles: [resolve(__dirname, './apps/endpoint')],
-    junit: {
-      reportName: 'X-Pack Endpoint Without Ingest Functional Tests',
-    },
-    kbnTestServer: {
-      ...xpackFunctionalConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...xpackFunctionalConfig.get('kbnTestServer.serverArgs'),
-        // use a bogus port so the ingest manager setup will fail
-        '--xpack.ingestManager.epm.registryUrl=http://127.0.0.1:12345',
-      ],
-    },
-  };
-}
diff --git a/x-pack/test/functional_endpoint_ingest_failure/ftr_provider_context.d.ts b/x-pack/test/functional_endpoint_ingest_failure/ftr_provider_context.d.ts
deleted file mode 100644
index 0e4b47471d4199..00000000000000
--- a/x-pack/test/functional_endpoint_ingest_failure/ftr_provider_context.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
-
-import { pageObjects } from '../functional_endpoint/page_objects';
-import { services } from '../functional/services';
-
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/plugin_functional/config.ts b/x-pack/test/plugin_functional/config.ts
index 9a0519960f850e..d466137c40d481 100644
--- a/x-pack/test/plugin_functional/config.ts
+++ b/x-pack/test/plugin_functional/config.ts
@@ -16,7 +16,7 @@ import { pageObjects } from './page_objects';
 /* eslint-disable import/no-default-export */
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const xpackFunctionalConfig = await readConfigFile(
-    require.resolve('../functional_endpoint/config.ts')
+    require.resolve('../security_solution_endpoint/config.ts')
   );
 
   // Find all folders in ./plugins since we treat all them as plugin folder
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/alerts.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/alerts.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/apps/endpoint/alerts.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/alerts.ts
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
similarity index 97%
rename from x-pack/test/functional_endpoint/apps/endpoint/endpoint_list.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index c5338e2a357650..bbc78cf399f711 100644
--- a/x-pack/test/functional_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  const pageObjects = getPageObjects(['common', 'endpoint', 'header']);
+  const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
 
@@ -73,7 +73,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           'Jan 24, 2020 @ 16:06:09.541',
         ],
       ];
-      const tableData = await pageObjects.endpoint.getEndpointAppTableData('hostListTable');
+      const tableData = await pageObjects.endpointPageUtils.tableData('hostListTable');
       expect(tableData).to.eql(expectedData);
     });
 
@@ -126,7 +126,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
       it('displays no items found when empty', async () => {
         // get the endpoint list table data and verify message
-        const [, [noItemsFoundMessage]] = await pageObjects.endpoint.getEndpointAppTableData(
+        const [, [noItemsFoundMessage]] = await pageObjects.endpointPageUtils.tableData(
           'hostListTable'
         );
         expect(noItemsFoundMessage).to.equal('No items found');
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/index.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/apps/endpoint/index.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/apps/endpoint/policy_details.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
similarity index 92%
rename from x-pack/test/functional_endpoint/apps/endpoint/policy_list.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
index 9f87f884b327e3..a5efd604d63ee7 100644
--- a/x-pack/test/functional_endpoint/apps/endpoint/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
-  const pageObjects = getPageObjects(['common', 'endpoint', 'policy']);
+  const pageObjects = getPageObjects(['common', 'endpoint', 'policy', 'endpointPageUtils']);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
   const RELATIVE_DATE_FORMAT = /\d (?:seconds|minutes) ago/i;
@@ -31,7 +31,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       expect(policyTotal).to.equal('0 Policies');
     });
     it('has correct table headers', async () => {
-      const allHeaderCells = await pageObjects.endpoint.tableHeaderVisibleText('policyTable');
+      const allHeaderCells = await pageObjects.endpointPageUtils.tableHeaderVisibleText(
+        'policyTable'
+      );
       expect(allHeaderCells).to.eql([
         'Policy Name',
         'Created By',
@@ -43,7 +45,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       ]);
     });
     it('should show empty table results message', async () => {
-      const [, [noItemsFoundMessage]] = await pageObjects.endpoint.getEndpointAppTableData(
+      const [, [noItemsFoundMessage]] = await pageObjects.endpointPageUtils.tableData(
         'policyTable'
       );
       expect(noItemsFoundMessage).to.equal('No items found');
@@ -65,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it('should show policy on the list', async () => {
-        const [, policyRow] = await pageObjects.endpoint.getEndpointAppTableData('policyTable');
+        const [, policyRow] = await pageObjects.endpointPageUtils.tableData('policyTable');
         // Validate row data with the exception of the Date columns - since those are initially
         // shown as relative.
         expect([policyRow[0], policyRow[1], policyRow[3], policyRow[5], policyRow[6]]).to.eql([
diff --git a/x-pack/test/functional_endpoint/apps/endpoint/resolver.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/apps/endpoint/resolver.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts
diff --git a/x-pack/test/functional_endpoint/config.ts b/x-pack/test/security_solution_endpoint/config.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/config.ts
rename to x-pack/test/security_solution_endpoint/config.ts
diff --git a/x-pack/test/functional_endpoint/ftr_provider_context.d.ts b/x-pack/test/security_solution_endpoint/ftr_provider_context.d.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/ftr_provider_context.d.ts
rename to x-pack/test/security_solution_endpoint/ftr_provider_context.d.ts
diff --git a/x-pack/test/functional_endpoint/page_objects/endpoint_alerts_page.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_alerts_page.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/page_objects/endpoint_alerts_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/endpoint_alerts_page.ts
diff --git a/x-pack/test/functional_endpoint/page_objects/endpoint_page.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
similarity index 61%
rename from x-pack/test/functional_endpoint/page_objects/endpoint_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
index 3234169e7265ea..0f1c9527b717b0 100644
--- a/x-pack/test/functional_endpoint/page_objects/endpoint_page.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export function EndpointPageProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
-  const pageObjects = getPageObjects(['common', 'header']);
+  const pageObjects = getPageObjects(['common', 'header', 'endpointPageUtils']);
   const retry = getService('retry');
 
   return {
@@ -23,53 +23,9 @@ export function EndpointPageProvider({ getService, getPageObjects }: FtrProvider
       await pageObjects.header.waitUntilLoadingHasFinished();
     },
 
-    /**
-     * Finds the Table with the given `selector` (test subject) and returns
-     * back an array containing the table's header column text
-     *
-     * @param selector
-     * @returns Promise<string[]>
-     */
-    async tableHeaderVisibleText(selector: string) {
-      const $ = await (await testSubjects.find('policyTable')).parseDomContent();
-      return $('thead tr th')
-        .toArray()
-        .map((th) =>
-          $(th)
-            .text()
-            .replace(/&nbsp;/g, '')
-            .trim()
-        );
-    },
-
-    /**
-     * Finds a table and returns the data in a nested array with row 0 is the headers if they exist.
-     * It uses euiTableCellContent to avoid poluting the array data with the euiTableRowCell__mobileHeader data.
-     * @param dataTestSubj
-     * @returns Promise<string[][]>
-     */
-    async getEndpointAppTableData(dataTestSubj: string) {
-      await testSubjects.exists(dataTestSubj);
-      const hostTable: WebElementWrapper = await testSubjects.find(dataTestSubj);
-      const $ = await hostTable.parseDomContent();
-      return $('tr')
-        .toArray()
-        .map((row) =>
-          $(row)
-            .find('.euiTableCellContent')
-            .toArray()
-            .map((cell) =>
-              $(cell)
-                .text()
-                .replace(/&nbsp;/g, '')
-                .trim()
-            )
-        );
-    },
-
     async waitForTableToHaveData(dataTestSubj: string) {
       await retry.waitForWithTimeout('table to have data', 2000, async () => {
-        const tableData = await this.getEndpointAppTableData(dataTestSubj);
+        const tableData = await pageObjects.endpointPageUtils.tableData(dataTestSubj);
         if (tableData[1][0] === 'No items found') {
           return false;
         }
diff --git a/x-pack/test/functional_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/page_objects/index.ts
rename to x-pack/test/security_solution_endpoint/page_objects/index.ts
diff --git a/x-pack/test/security_solution_endpoint/page_objects/page_utils.ts b/x-pack/test/security_solution_endpoint/page_objects/page_utils.ts
new file mode 100644
index 00000000000000..810bddc6a48c46
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint/page_objects/page_utils.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
+
+export function EndpointPageUtils({ getService }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const find = getService('find');
+
+  return {
+    /**
+     * Finds a given EuiCheckbox by test subject and clicks on it
+     *
+     * @param euiCheckBoxTestId
+     */
+    async clickOnEuiCheckbox(euiCheckBoxTestId: string) {
+      // This utility is needed because EuiCheckbox forwards the test subject on to
+      // the actual `<input>` which is not actually visible/accessible on the page.
+      // In order to actually cause the state of the checkbox to change, the `<label>`
+      // must be clicked.
+      const euiCheckboxLabelElement = await find.byXPath(
+        `//input[@data-test-subj='${euiCheckBoxTestId}']/../label`
+      );
+
+      await euiCheckboxLabelElement.click();
+    },
+
+    /**
+     * Finds the Table with the given `selector` (test subject) and returns
+     * back an array containing the table's header column text
+     *
+     * @param selector
+     * @returns Promise<string[]>
+     */
+    async tableHeaderVisibleText(selector: string) {
+      const $ = await (await testSubjects.find(selector)).parseDomContent();
+      return $('thead tr th')
+        .toArray()
+        .map((th) =>
+          $(th)
+            .text()
+            .replace(/&nbsp;/g, '')
+            .trim()
+        );
+    },
+
+    /**
+     * Finds a table and returns the data in a nested array with row 0 is the headers if they exist.
+     * It uses euiTableCellContent to avoid poluting the array data with the euiTableRowCell__mobileHeader data.
+     * @param dataTestSubj
+     * @returns Promise<string[][]>
+     */
+    async tableData(dataTestSubj: string) {
+      await testSubjects.exists(dataTestSubj);
+      const hostTable: WebElementWrapper = await testSubjects.find(dataTestSubj);
+      const $ = await hostTable.parseDomContent();
+      return $('tr')
+        .toArray()
+        .map((row) =>
+          $(row)
+            .find('.euiTableCellContent')
+            .toArray()
+            .map((cell) =>
+              $(cell)
+                .text()
+                .replace(/&nbsp;/g, '')
+                .trim()
+            )
+        );
+    },
+  };
+}
diff --git a/x-pack/test/functional_endpoint/page_objects/policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/page_objects/policy_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
diff --git a/x-pack/test/functional_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/services/endpoint_policy.ts
rename to x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
diff --git a/x-pack/test/functional_endpoint/services/index.ts b/x-pack/test/security_solution_endpoint/services/index.ts
similarity index 100%
rename from x-pack/test/functional_endpoint/services/index.ts
rename to x-pack/test/security_solution_endpoint/services/index.ts