diff --git a/src/platform/test/functional/apps/dashboard/group1/embeddable_data_grid.ts b/src/platform/test/functional/apps/dashboard/group1/embeddable_data_grid.ts
deleted file mode 100644
index d8a64334930f2..0000000000000
--- a/src/platform/test/functional/apps/dashboard/group1/embeddable_data_grid.ts
+++ /dev/null
@@ -1,83 +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
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const dashboardAddPanel = getService('dashboardAddPanel');
-  const filterBar = getService('filterBar');
-  const esArchiver = getService('esArchiver');
-  const kibanaServer = getService('kibanaServer');
-  const find = getService('find');
-  const { dashboard, header, timePicker } = getPageObjects(['dashboard', 'header', 'timePicker']);
-  const retry = getService('retry');
-  const dataGrid = getService('dataGrid');
-
-  describe('dashboard embeddable data grid', () => {
-    before(async () => {
-      await esArchiver.loadIfNeeded(
-        'src/platform/test/functional/fixtures/es_archiver/logstash_functional'
-      );
-      await esArchiver.loadIfNeeded(
-        'src/platform/test/functional/fixtures/es_archiver/dashboard/current/data'
-      );
-      await kibanaServer.savedObjects.cleanStandardList();
-      await kibanaServer.importExport.load(
-        'src/platform/test/functional/fixtures/kbn_archiver/dashboard/current/kibana'
-      );
-      await kibanaServer.uiSettings.replace({
-        defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
-        'doc_table:legacy': false,
-      });
-      await dashboard.navigateToApp();
-      await filterBar.ensureFieldEditorModalIsClosed();
-      await dashboard.gotoDashboardLandingPage();
-      await dashboard.clickNewDashboard();
-      await timePicker.setDefaultDataRange();
-      await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search');
-      await header.waitUntilLoadingHasFinished();
-    });
-
-    after(async function () {
-      await kibanaServer.savedObjects.cleanStandardList();
-    });
-
-    it('should expand the detail row when the toggle arrow is clicked', async function () {
-      await retry.try(async function () {
-        await dataGrid.clickRowToggle({ isAnchorRow: false, rowIndex: 0 });
-        const detailsEl = await dataGrid.getDetailsRows();
-        const defaultMessageEl = await detailsEl[0].findByTestSubject('docViewerRowDetailsTitle');
-        expect(defaultMessageEl).to.be.ok();
-        await dataGrid.closeFlyout();
-      });
-    });
-
-    it('are added when a cell filter is clicked', async function () {
-      const gridCell = '[role="gridcell"]:nth-child(4)';
-      const filterOutButton = '[data-test-subj="filterOutButton"]';
-      const filterForButton = '[data-test-subj="filterForButton"]';
-      await retry.try(async () => {
-        await find.clickByCssSelector(gridCell);
-        await find.clickByCssSelector(filterOutButton);
-        await header.waitUntilLoadingHasFinished();
-        const filterCount = await filterBar.getFilterCount();
-        expect(filterCount).to.equal(1);
-      });
-      await header.waitUntilLoadingHasFinished();
-      await retry.try(async () => {
-        await find.clickByCssSelector(gridCell);
-        await find.clickByCssSelector(filterForButton);
-        await header.waitUntilLoadingHasFinished();
-        const filterCount = await filterBar.getFilterCount();
-        expect(filterCount).to.equal(2);
-      });
-    });
-  });
-}
diff --git a/src/platform/test/functional/apps/dashboard/group1/index.ts b/src/platform/test/functional/apps/dashboard/group1/index.ts
index a8e5bfdac38fe..13900b1495166 100644
--- a/src/platform/test/functional/apps/dashboard/group1/index.ts
+++ b/src/platform/test/functional/apps/dashboard/group1/index.ts
@@ -37,7 +37,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     // a fresh index.
     loadTestFile(require.resolve('./url_field_formatter'));
     loadTestFile(require.resolve('./embeddable_rendering'));
-    loadTestFile(require.resolve('./embeddable_data_grid'));
     loadTestFile(require.resolve('./edit_embeddable_redirects'));
     loadTestFile(require.resolve('./dashboard_unsaved_state'));
     loadTestFile(require.resolve('./dashboard_unsaved_listing'));
diff --git a/src/platform/test/functional/apps/discover/embeddable/_saved_search_embeddable.ts b/src/platform/test/functional/apps/discover/embeddable/_saved_search_embeddable.ts
index 284aa743089c3..da81b513a1301 100644
--- a/src/platform/test/functional/apps/discover/embeddable/_saved_search_embeddable.ts
+++ b/src/platform/test/functional/apps/discover/embeddable/_saved_search_embeddable.ts
@@ -20,6 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const testSubjects = getService('testSubjects');
   const find = getService('find');
+  const retry = getService('retry');
   const { common, dashboard, header, discover } = getPageObjects([
     'common',
     'dashboard',
@@ -162,5 +163,38 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(highlights.length).to.be.greaterThan(0);
       expect(highlights.every((text) => text === 'Mozilla')).to.be(true);
     });
+
+    it('should expand the detail row when the toggle arrow is clicked', async function () {
+      await addSearchEmbeddableToDashboard();
+      await retry.try(async function () {
+        await dataGrid.clickRowToggle({ isAnchorRow: false, rowIndex: 0 });
+        const detailsEl = await dataGrid.getDetailsRows();
+        const defaultMessageEl = await detailsEl[0].findByTestSubject('docViewerRowDetailsTitle');
+        expect(defaultMessageEl).to.be.ok();
+        await dataGrid.closeFlyout();
+      });
+    });
+
+    it('filters are added when a cell filter is clicked', async function () {
+      await addSearchEmbeddableToDashboard();
+      const gridCell = '[role="gridcell"]:nth-child(4)';
+      const filterOutButton = '[data-test-subj="filterOutButton"]';
+      const filterForButton = '[data-test-subj="filterForButton"]';
+      await retry.try(async () => {
+        await find.clickByCssSelector(gridCell);
+        await find.clickByCssSelector(filterOutButton);
+        await header.waitUntilLoadingHasFinished();
+        const filterCount = await filterBar.getFilterCount();
+        expect(filterCount).to.equal(1);
+      });
+      await header.waitUntilLoadingHasFinished();
+      await retry.try(async () => {
+        await find.clickByCssSelector(gridCell);
+        await find.clickByCssSelector(filterForButton);
+        await header.waitUntilLoadingHasFinished();
+        const filterCount = await filterBar.getFilterCount();
+        expect(filterCount).to.equal(2);
+      });
+    });
   });
 }