diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 2db5056a73f51..6cb67851ba240 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -75,6 +75,8 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
       .manage()
       .window()
       .setRect({ width, height });
+    await driver.executeScript('window.sessionStorage.clear();');
+    await driver.executeScript('window.localStorage.clear();');
   });
 
   lifecycle.on('cleanup', async () => await driver.quit());
diff --git a/x-pack/test/functional/apps/logstash/pipeline_list.js b/x-pack/test/functional/apps/logstash/pipeline_list.js
index d04f50690368d..ce0c9d881f51b 100644
--- a/x-pack/test/functional/apps/logstash/pipeline_list.js
+++ b/x-pack/test/functional/apps/logstash/pipeline_list.js
@@ -22,6 +22,9 @@ export default function ({ getService, getPageObjects }) {
       originalWindowSize = await browser.getWindowSize();
       await browser.setWindowSize(1600, 1000);
       await esArchiver.load('logstash/example_pipelines');
+    });
+
+    beforeEach(async () => {
       await PageObjects.logstash.gotoPipelineList();
     });
 
@@ -86,10 +89,6 @@ export default function ({ getService, getPageObjects }) {
         await pipelineEditor.assertExists();
         await pipelineEditor.assertDefaultInputs();
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
 
     describe('delete button', () => {
@@ -122,15 +121,12 @@ export default function ({ getService, getPageObjects }) {
 
     describe('row links', () => {
       it('opens the selected row in the editor', async () => {
+        await PageObjects.logstash.gotoPipelineList();
         await pipelineList.setFilter('tweets_and_beats');
         await pipelineList.clickFirstRowId();
         await pipelineEditor.assertExists();
         await pipelineEditor.assertEditorId('tweets_and_beats');
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
 
     describe('next page button', () => {
@@ -225,10 +221,6 @@ export default function ({ getService, getPageObjects }) {
           queueCheckpointWrites,
         });
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
   });
 }
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
index 06dd0df9e470c..6163e99b5eaa4 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
@@ -74,7 +74,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('multi metric', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
index cd88a9bba1769..7ccd9214591f2 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
@@ -88,7 +88,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('population', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.load('ml/ecommerce');
     });
 
     after(async () => {
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
index 2cca37a944563..5645bc7277d19 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
@@ -274,7 +274,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('saved search', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
index 6e640f7d173d5..06ec840b36aae 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
@@ -73,7 +73,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('single metric', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {