diff --git a/test/functional/apps/discover/group2/_huge_fields.ts b/test/functional/apps/discover/group2/_huge_fields.ts
index 085788f1139d0..7ffcc891506e3 100644
--- a/test/functional/apps/discover/group2/_huge_fields.ts
+++ b/test/functional/apps/discover/group2/_huge_fields.ts
@@ -42,6 +42,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await security.testUser.restoreDefaults();
       await esArchiver.unload('test/functional/fixtures/es_archiver/huge_fields');
       await kibanaServer.uiSettings.unset('timepicker:timeDefaults');
+      await kibanaServer.savedObjects.cleanStandardList();
     });
   });
 }
diff --git a/test/functional/apps/discover/group2/_search_on_page_load.ts b/test/functional/apps/discover/group2/_search_on_page_load.ts
index 2adeb9606d5f6..cb2b21e3849db 100644
--- a/test/functional/apps/discover/group2/_search_on_page_load.ts
+++ b/test/functional/apps/discover/group2/_search_on_page_load.ts
@@ -144,7 +144,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await testSubjects.click('discoverNewButton');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
-        await retry.waitFor('number of fetches to be 0', waitForFetches(1));
+        await retry.waitFor('number of fetches to be 1', waitForFetches(1));
         expect(await PageObjects.discover.doesSidebarShowFields()).to.be(false);
       });
     });
diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
index 59513bf350040..6e50f69a7474a 100644
--- a/test/functional/page_objects/time_picker.ts
+++ b/test/functional/page_objects/time_picker.ts
@@ -285,7 +285,14 @@ export class TimePickerPageObject extends FtrService {
       await this.testSubjects.click('superDatePickerToggleRefreshButton');
     }
 
-    await this.inputValue('superDatePickerRefreshIntervalInput', intervalS.toString());
+    await this.retry.waitFor('auto refresh to be set correctly', async () => {
+      await this.inputValue('superDatePickerRefreshIntervalInput', intervalS.toString());
+      return (
+        (await this.testSubjects.getAttribute('superDatePickerRefreshIntervalInput', 'value')) ===
+        intervalS.toString()
+      );
+    });
+
     await this.quickSelectTimeMenuToggle.close();
   }