diff --git a/test/functional/apps/discover/group4/_data_view_edit.ts b/test/functional/apps/discover/group4/_data_view_edit.ts
index c0c5216010191..9abefdb311156 100644
--- a/test/functional/apps/discover/group4/_data_view_edit.ts
+++ b/test/functional/apps/discover/group4/_data_view_edit.ts
@@ -18,11 +18,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const dataViews = getService('dataViews');
 
-  const { common, discover, timePicker, unifiedFieldList } = getPageObjects([
+  const { common, discover, timePicker, unifiedFieldList, header } = getPageObjects([
     'common',
     'discover',
     'timePicker',
     'unifiedFieldList',
+    'header',
   ]);
 
   describe('data view flyout', function () {
@@ -40,23 +41,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.savedObjects.cleanStandardList();
       await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
       await es.transport.request({
-        path: '/my-index-000001',
+        path: '/data-view-index-000001',
         method: 'DELETE',
       });
       await es.transport.request({
-        path: '/my-index-000002',
+        path: '/data-view-index-000002',
         method: 'DELETE',
       });
       await es.transport.request({
-        path: '/my-index-000003',
+        path: '/data-view-index-000003',
         method: 'DELETE',
       });
     });
 
     it('create ad hoc data view', async function () {
-      const initialPattern = 'my-index-';
+      const initialPattern = 'data-view-index-';
       await es.transport.request({
-        path: '/my-index-000001/_doc',
+        path: '/data-view-index-000001/_doc',
         method: 'POST',
         body: {
           '@timestamp': new Date().toISOString(),
@@ -65,7 +66,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       await es.transport.request({
-        path: '/my-index-000002/_doc',
+        path: '/data-view-index-000002/_doc',
         method: 'POST',
         body: {
           '@timestamp': new Date().toISOString(),
@@ -87,12 +88,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('create saved data view', async function () {
-      const updatedPattern = 'my-index-000001';
+      const updatedPattern = 'data-view-index-000001';
       await dataViews.createFromSearchBar({
         name: updatedPattern,
         adHoc: false,
         hasTimeField: true,
       });
+      await header.waitUntilLoadingHasFinished();
       await discover.waitUntilSearchingHasFinished();
 
       await retry.try(async () => {
@@ -104,9 +106,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('update data view with a different time field', async function () {
-      const updatedPattern = 'my-index-000003';
+      const updatedPattern = 'data-view-index-000003';
       await es.transport.request({
-        path: '/my-index-000003/_doc',
+        path: '/data-view-index-000003/_doc',
         method: 'POST',
         body: {
           timestamp: new Date('1970-01-01').toISOString(),
@@ -116,7 +118,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       for (let i = 0; i < 3; i++) {
         await es.transport.request({
-          path: '/my-index-000003/_doc',
+          path: '/data-view-index-000003/_doc',
           method: 'POST',
           body: {
             timestamp: new Date().toISOString(),