From 59d58721d854c7d114444b5bbd9ebe7579ec8d53 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 10 Jul 2024 11:58:29 +0200
Subject: [PATCH] Get rid of the infamous `10s` delay in Core's integration
 tests (#187858)

## Summary

Fix https://github.com/elastic/kibana/issues/130240
---
 .../migrations/group1/7_13_0_failed_action_tasks.test.ts      | 2 --
 .../migrations/group1/7_13_0_unknown_types.test.ts            | 2 --
 .../saved_objects/migrations/group2/batch_size_bytes.test.ts  | 2 --
 .../group2/batch_size_bytes_exceeds_es_content_length.test.ts | 2 --
 .../migrations/group2/check_target_mappings.test.ts           | 3 ---
 .../saved_objects/migrations/group2/cleanup.test.ts           | 3 +--
 .../migrations/group2/collects_corrupt_docs.test.ts           | 2 --
 .../migrations/group2/corrupt_outdated_docs.test.ts           | 2 --
 .../migrations/group2/multiple_kibana_nodes.test.ts           | 1 -
 .../saved_objects/migrations/group2/outdated_docs.test.ts     | 2 --
 .../migrations/group3/deferred_migrations.test.ts             | 2 --
 .../migrations/group3/migration_from_older_v1.test.ts         | 2 --
 .../saved_objects/migrations/group3/multiple_es_nodes.test.ts | 4 ----
 .../saved_objects/migrations/group3/read_batch_size.test.ts   | 2 --
 .../saved_objects/migrations/group3/rewriting_id.test.ts      | 2 --
 .../saved_objects/migrations/group3/skip_migration.test.ts    | 2 --
 .../migrations/group3/wait_for_migration_completion.test.ts   | 2 --
 .../saved_objects/migrations/group4/v2_md5_to_mv.test.ts      | 3 +--
 .../migrations/group4/v2_with_mv_same_stack_version.test.ts   | 3 +--
 .../migrations/group4/v2_with_mv_stack_version_bump.test.ts   | 3 +--
 .../saved_objects/migrations/group5/active_delete.test.ts     | 2 --
 .../group5/active_delete_multiple_instances.test.ts           | 2 --
 .../saved_objects/migrations/group5/skip_reindex.test.ts      | 2 --
 .../migrations/shared_suites/zdt/basic_document_migration.ts  | 3 +--
 .../migrations/shared_suites/zdt/standard_workflow.ts         | 3 +--
 .../saved_objects/migrations/zdt_1/basic_downgrade.test.ts    | 3 +--
 .../migrations/zdt_1/conversion_failures.test.ts              | 3 +--
 .../saved_objects/migrations/zdt_1/create_index.test.ts       | 3 +--
 .../saved_objects/migrations/zdt_1/document_cleanup.test.ts   | 2 --
 .../migrations/zdt_1/mapping_version_conflict.test.ts         | 3 +--
 .../saved_objects/migrations/zdt_1/rerun_same_version.test.ts | 3 +--
 .../saved_objects/migrations/zdt_1/update_mappings.test.ts    | 3 +--
 .../saved_objects/migrations/zdt_2/outdated_doc_query.test.ts | 3 +--
 .../migrations/zdt_2/root_field_addition.test.ts              | 3 +--
 .../saved_objects/migrations/zdt_2/type_addition.test.ts      | 3 +--
 .../migrations/zdt_2/v2_to_zdt_partial_failure.test.ts        | 3 +--
 .../saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts   | 3 +--
 .../migrations/zdt_v2_compat/basic_document_migration.test.ts | 3 +--
 .../migrations/zdt_v2_compat/create_index.test.ts             | 3 +--
 .../migrations/zdt_v2_compat/switch_to_model_version.test.ts  | 3 +--
 .../migrations/zdt_v2_compat/update_mappings.test.ts          | 3 +--
 .../saved_objects/service/lib/bulk_update.test.ts             | 2 --
 .../saved_objects/service/lib/update.test.ts                  | 2 --
 .../saved_objects/validation/validator.test.ts                | 2 --
 44 files changed, 21 insertions(+), 90 deletions(-)

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
index 89478ea377f6c..16e0043062a63 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
@@ -57,8 +57,6 @@ describe('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
       if (esServer) {
         await esServer.stop();
       }
-
-      await new Promise((resolve) => setTimeout(resolve, 10000));
     });
 
     const getCounts = async (
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
index 6b06337a367db..d9c4f0d7f33ae 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
@@ -58,8 +58,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   describe('when `discardUnknownObjects` does not match current kibana version', () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
index bea50cf32ce35..e6c3ad412e746 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
@@ -89,8 +89,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('completes the migration even when a full batch would exceed ES http.max_content_length', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
index 95baed313bd8c..4cdc89006c983 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
@@ -58,8 +58,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('fails with a descriptive message when maxBatchSizeBytes exceeds ES http.max_content_length', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
index e79084ebdc34a..600a00e24e9fd 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
@@ -17,7 +17,6 @@ import {
   createTestServers,
   type TestElasticsearchUtils,
 } from '@kbn/core-test-helpers-kbn-server';
-import { delay } from '../test_utils';
 
 const logFilePath = Path.join(__dirname, 'check_target_mappings.log');
 
@@ -33,7 +32,6 @@ describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
   afterEach(async () => {
     await root?.shutdown();
     await esServer?.stop();
-    await delay(10);
   });
 
   it('is not run for new installations', async () => {
@@ -80,7 +78,6 @@ describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
 
       // stop Kibana and remove logs
       await root.shutdown();
-      await delay(10);
       await fs.unlink(logFilePath).catch(() => {});
 
       root = createRoot();
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
index 7f04f37589f69..7c93c1477cf4a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
@@ -13,7 +13,7 @@ import JSON5 from 'json5';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { getMigrationDocLink, delay } from '../test_utils';
+import { getMigrationDocLink } from '../test_utils';
 import {
   clearLog,
   currentVersion,
@@ -71,7 +71,6 @@ describe('migration v2', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
index 45b28e8ac3082..dbc5ea193ad56 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
@@ -42,8 +42,6 @@ describe('migration v2 with corrupt saved object documents', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('collects corrupt saved object documents across batches', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
index 384cdcbfa8abd..728625003637e 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
@@ -40,8 +40,6 @@ describe('migration v2 with corrupt saved object documents', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it.skip('collects corrupt saved object documents across batches', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
index 80d75d757ca4d..d82863f01928c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
@@ -171,7 +171,6 @@ describe.skip('migration v2', () => {
 
     if (esServer) {
       await esServer.stop();
-      await delay(10000);
     }
   });
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
index 79a76c72adefc..e7579a7ce4a91 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
@@ -41,8 +41,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('migrates the documents to the highest version', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
index 8a40466ee2588..41c9501d7e6b2 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
@@ -12,7 +12,6 @@ import type {
   SavedObjectsType,
   SavedObjectUnsanitizedDoc,
 } from '@kbn/core-saved-objects-server';
-import { delay } from '../test_utils';
 
 import '../jest_matchers';
 import {
@@ -36,7 +35,6 @@ describe('deferred migrations', () => {
 
   afterAll(async () => {
     await server?.stop();
-    await delay(10);
   });
 
   beforeEach(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
index d32c2f0902b4e..45ffbb709854c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
@@ -170,8 +170,6 @@ describe('migrating from 7.3.0-xpack which used v1 migrations', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   };
 
   beforeAll(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
index e4350c431977b..73e31881b0a91 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
@@ -103,10 +103,6 @@ describe('migration v2', () => {
     await removeLogFile();
   });
 
-  afterAll(async () => {
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-  });
-
   afterEach(async () => {
     if (root) {
       await root.shutdown();
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
index 0fce643975c53..3a91a8477d4e5 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
@@ -13,7 +13,6 @@ import {
   createRootWithCorePlugins,
   type TestElasticsearchUtils,
 } from '@kbn/core-test-helpers-kbn-server';
-import { delay } from '../test_utils';
 import { startElasticsearch } from '../kibana_migrator_test_kit';
 
 const logFilePath = Path.join(__dirname, 'read_batch_size.log');
@@ -33,7 +32,6 @@ describe('migration v2 - read batch size', () => {
   afterEach(async () => {
     await root?.shutdown();
     await esServer?.stop();
-    await delay(10);
   });
 
   it('reduces the read batchSize in half if a batch exceeds maxReadBatchSizeBytes', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
index 6079469cf4982..70768bd3f7009 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
@@ -108,8 +108,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('rewrites id deterministically for SO with namespaceType: "multiple" and "multiple-isolated"', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
index e24c50d2cb4c9..54ac46754acc4 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
@@ -71,8 +71,6 @@ describe('starting with `migration.skip: true` when indices are up to date', ()
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('starts and display the correct service status', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
index 459cfc921badf..266e821abf7e3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
@@ -40,8 +40,6 @@ describe('migration with waitForCompletion=true', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('waits for another instance to complete the migration', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
index 4e1cb4d06e38f..1277370f45835 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
@@ -19,7 +19,7 @@ import {
   readLog,
   startElasticsearch,
 } from '../kibana_migrator_test_kit';
-import { delay, createType } from '../test_utils';
+import { createType } from '../test_utils';
 import '../jest_matchers';
 
 const logFilePath = Path.join(__dirname, 'v2_md5_to_mv.test.log');
@@ -270,6 +270,5 @@ describe('V2 algorithm', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
index bfc105ee7d160..ba4a19de81741 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
@@ -14,7 +14,7 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import { modelVersionToVirtualVersion } from '@kbn/core-saved-objects-base-server-internal';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType, parseLogFile } from '../test_utils';
+import { createType, parseLogFile } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_with_mv_same_stack_version.test.log');
@@ -31,7 +31,6 @@ describe('V2 algorithm - using model versions - upgrade without stack version in
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getTestModelVersionType = ({ beforeUpgrade }: { beforeUpgrade: boolean }) => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
index 7a5d8a686f084..f24dc6fd427fe 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
@@ -14,7 +14,7 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import { modelVersionToVirtualVersion } from '@kbn/core-saved-objects-base-server-internal';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType, parseLogFile } from '../test_utils';
+import { createType, parseLogFile } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_with_mv_stack_version_bump.test.log');
@@ -31,7 +31,6 @@ describe('V2 algorithm - using model versions - stack version bump scenario', ()
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getTestSwitchType = ({ beforeUpgrade }: { beforeUpgrade: boolean }) => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
index d950129dac69a..cd1a98fa3ee57 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
@@ -22,7 +22,6 @@ import {
   getIncompatibleMappingsMigrator,
   getNonDeprecatedMappingsMigrator,
 } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 
 describe('when upgrading to a new stack version', () => {
   let esServer: TestElasticsearchUtils['es'];
@@ -34,7 +33,6 @@ describe('when upgrading to a new stack version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   describe('if the mappings match (diffMappings() === false)', () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
index e297b39847f10..e0233cccb3fb7 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
@@ -23,7 +23,6 @@ import {
   startElasticsearch,
 } from '../kibana_migrator_test_kit';
 import { baselineTypes } from './active_delete.fixtures';
-import { delay } from '../test_utils';
 import { createBaselineArchive } from '../kibana_migrator_archive_utils';
 
 const PARALLEL_MIGRATORS = 6;
@@ -146,7 +145,6 @@ describe('multiple migrator instances running in parallel', () => {
     afterAll(async () => {
       // await esClient?.indices.delete({ index: `${kibanaIndex}_${currentVersion}_001` });
       await esServer?.stop();
-      await delay(10);
     });
 
     const getAggregatedTypesCount = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
index 4d244314d3acb..b93f96671d96f 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
@@ -20,7 +20,6 @@ import {
   startElasticsearch,
   KibanaMigratorTestKit,
 } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 
 describe('when migrating to a new version', () => {
   let esServer: TestElasticsearchUtils['es'];
@@ -144,6 +143,5 @@ describe('when migrating to a new version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
index 0c43a40478d03..9e3d01dd0ecec 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
@@ -11,7 +11,7 @@ import { range, sortBy } from 'lodash';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../../jest_matchers';
 import { getKibanaMigratorTestKit } from '../../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../../test_utils';
+import { parseLogFile } from '../../test_utils';
 import { EsRunner, EsServer } from '../../test_types';
 import {
   getBaseMigratorParams,
@@ -35,7 +35,6 @@ export function createBasicDocumentsMigrationTest({
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
index b22e522d1d2c1..f0709e8720ce7 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
@@ -11,7 +11,7 @@ import { range } from 'lodash';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../../jest_matchers';
 import { getKibanaMigratorTestKit } from '../../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../../test_utils';
+import { parseLogFile } from '../../test_utils';
 import { EsRunner, EsServer } from '../../test_types';
 import {
   getBaseMigratorParams,
@@ -36,7 +36,6 @@ export function createStandardWorkflowTest({
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
index 8968fe7bac408..c541f57a6111a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'basic_downgrade.test.log');
@@ -28,7 +28,6 @@ describe('ZDT upgrades - basic downgrade', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeV1 = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
index 05f8f30edacc6..b9821dc62442b 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getSampleAType,
@@ -31,7 +31,6 @@ describe('ZDT upgrades - encountering conversion failures', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   beforeEach(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
index f0b049b8307db..6f12311009e21 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import '../jest_matchers';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'create_index.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - running on a fresh cluster', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('create the index with the correct mappings and meta', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
index ab707f792fbe9..e0341915c7dd3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
@@ -13,7 +13,6 @@ import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 import {
   getBaseMigratorParams,
   getDeletedType,
@@ -35,7 +34,6 @@ describe('ZDT upgrades - document cleanup', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
index 7b0658fbd977e..a19db9811462c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -33,7 +33,6 @@ describe('ZDT upgrades - mapping model version conflict', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
index 398a133bf990a..6c4d8688450bf 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'rerun_same_version.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - rerun migration on same version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
index c51c712f34452..82ff0a1c0d5ec 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -31,7 +31,6 @@ describe('ZDT upgrades - basic mapping update', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
index cc901b56f3818..f403fe6c3579a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
@@ -12,7 +12,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { SavedObjectsModelVersionMap, SavedObject } from '@kbn/core-saved-objects-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType } from '../test_utils';
+import { createType } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 import {
   SavedObjectsSerializer,
@@ -114,7 +114,6 @@ describe('getOutdatedDocumentsQuery', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('creates a query returning the expected documents', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
index 47f853187b18f..1ce530a9c46c1 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
@@ -27,7 +27,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'root_field_addition.test.log');
@@ -42,7 +42,6 @@ describe('ZDT upgrades - introducing new root fields', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const baseMappings = {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
index 61697df6ecef6..770fade1d436c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'type_addition.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - introducing a new SO type', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
index 0cfebd3d8514b..fb3c11e68299f 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams, noopMigration } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_to_zdt_partial_failure.test.log');
@@ -28,7 +28,6 @@ describe('ZDT with v2 compat - recovering from partially migrated state', () =>
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeBefore = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
index 4a92a9d14eef4..dfbe0aeba8866 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
@@ -18,7 +18,7 @@ import {
   startElasticsearch,
   currentVersion,
 } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getSampleAType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'v2_to_zdt_switch.test.log');
@@ -35,7 +35,6 @@ describe('ZDT upgrades - switching from v2 algorithm', () => {
 
   afterEach(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async ({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
index c71ca527f1270..5bd16f0110c63 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getSampleAType,
@@ -32,7 +32,6 @@ describe('ZDT with v2 compat - basic document migration', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
index 6f1b8257ddb26..d9f76907087be 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import '../jest_matchers';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getLegacyType } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'create_index.test.log');
@@ -26,7 +26,6 @@ describe('ZDT with v2 compat - running on a fresh cluster', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('create the index with the correct mappings and meta', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
index 1aa65bc1cdd02..fa72c8f1edae8 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams, noopMigration } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'switch_to_model_version.test.log');
@@ -28,7 +28,6 @@ describe('ZDT with v2 compat - type switching from migration to model version',
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeBefore = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
index 0c4956105fc78..9f3e58d6812fa 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -32,7 +32,6 @@ describe('ZDT with v2 compat - basic mapping update', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
index 98af19ec5c9d0..4cd661add5053 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
@@ -17,7 +17,6 @@ import {
   getKibanaMigratorTestKit,
   startElasticsearch,
 } from '../../migrations/kibana_migrator_test_kit';
-import { delay } from '../../migrations/test_utils';
 import { getBaseMigratorParams } from '../../migrations/fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'bulk_update.test.log');
@@ -32,7 +31,6 @@ describe('SOR - bulk_update API', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getCrossVersionType = (version: 'v1' | 'v2'): SavedObjectsType => {
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
index f9205086ceb2e..b4c9c912f7331 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
@@ -17,7 +17,6 @@ import {
   getKibanaMigratorTestKit,
   startElasticsearch,
 } from '../../migrations/kibana_migrator_test_kit';
-import { delay } from '../../migrations/test_utils';
 import { getBaseMigratorParams } from '../../migrations/fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'update.test.log');
@@ -93,7 +92,6 @@ describe('SOR - update API', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const setup = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/validation/validator.test.ts b/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
index a0dc22440f1df..4f79a8618df02 100644
--- a/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
+++ b/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
@@ -164,8 +164,6 @@ describe.skip('validates saved object types when a schema is provided', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('does nothing when no schema is provided', async () => {