diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
index 9a0ce6a9042a..dde86c697e3c 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.js
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -39,7 +39,14 @@ export default function ({ getService, getPageObjects }) {
   const opensearchArchiver = getService('opensearchArchiver');
   const opensearchDashboardsServer = getService('opensearchDashboardsServer');
   const browser = getService('browser');
-  const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'dashboard',
+    'header',
+    'visualize',
+    'timePicker',
+    'discover',
+  ]);
 
   describe('dashboard filter bar', () => {
     before(async () => {
@@ -185,6 +192,9 @@ export default function ({ getService, getPageObjects }) {
     describe('saved search filtering', function () {
       before(async () => {
         await filterBar.ensureFieldEditorModalIsClosed();
+        await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
+        await PageObjects.common.navigateToApp('dashboard');
         await PageObjects.dashboard.gotoDashboardLandingPage();
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultDataRange();
diff --git a/test/functional/apps/dashboard/dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js
index e934169513f6..1040b87f6168 100644
--- a/test/functional/apps/dashboard/dashboard_filtering.js
+++ b/test/functional/apps/dashboard/dashboard_filtering.js
@@ -46,7 +46,14 @@ export default function ({ getService, getPageObjects }) {
   const opensearchDashboardsServer = getService('opensearchDashboardsServer');
   const security = getService('security');
   const dashboardPanelActions = getService('dashboardPanelActions');
-  const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'dashboard',
+    'header',
+    'visualize',
+    'timePicker',
+    'discover',
+  ]);
 
   describe('dashboard filtering', function () {
     this.tags('includeFirefox');
@@ -72,6 +79,10 @@ export default function ({ getService, getPageObjects }) {
 
     describe('adding a filter that excludes all data', () => {
       before(async () => {
+        await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
+        await PageObjects.common.navigateToApp('dashboard');
+        await PageObjects.dashboard.gotoDashboardLandingPage();
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultDataRange();
         await dashboardAddPanel.addEveryVisualization('"Filter Bytes Test"');
@@ -219,7 +230,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('saved searches', async () => {
-        await dashboardExpect.savedSearchRowCount(1);
+        await testSubjects.existOrFail('docTableExpandToggleColumn');
       });
 
       it('vega', async () => {
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index edb2002624f5..11196a1b69b9 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -56,6 +56,9 @@ export default function ({ getService, getPageObjects }) {
 
   describe('dashboard state', function describeIndexTests() {
     before(async function () {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
+      await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.initTests();
       await PageObjects.dashboard.preserveCrossAppState();
       await browser.refresh();
diff --git a/test/functional/apps/dashboard/dashboard_time_picker.js b/test/functional/apps/dashboard/dashboard_time_picker.js
index b1e57fbe8e5e..e5da381ec06e 100644
--- a/test/functional/apps/dashboard/dashboard_time_picker.js
+++ b/test/functional/apps/dashboard/dashboard_time_picker.js
@@ -68,14 +68,14 @@ export default function ({ getService, getPageObjects }) {
         fields: ['bytes', 'agent'],
       });
       // Current data grid loads 100 rows per page by default with inspect button and time range
-      await dashboardExpect.dataGridTableCellCount(400);
+      await dashboardExpect.savedSearchRowCountFromLegacyTable(100);
 
       // Set to time range with no data
       await PageObjects.timePicker.setAbsoluteRange(
         'Jan 1, 2000 @ 00:00:00.000',
         'Jan 1, 2000 @ 01:00:00.000'
       );
-      await dashboardExpect.dataGridTableCellCount(0);
+      await dashboardExpect.savedSearchRowCountFromLegacyTable(0);
     });
 
     it('Timepicker start, end, interval values are set by url', async () => {