diff --git a/package.json b/package.json
index ce8e92868880581..fa03604178e270e 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
     "@elastic/ems-client": "7.15.0",
-    "@elastic/eui": "38.0.1",
+    "@elastic/eui": "39.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
diff --git a/src/core/public/core_app/status/components/__snapshots__/status_table.test.tsx.snap b/src/core/public/core_app/status/components/__snapshots__/status_table.test.tsx.snap
index 16b67bfa0584f50..5b0e831286aad33 100644
--- a/src/core/public/core_app/status/components/__snapshots__/status_table.test.tsx.snap
+++ b/src/core/public/core_app/status/components/__snapshots__/status_table.test.tsx.snap
@@ -35,7 +35,12 @@ exports[`StatusTable renders when statuses is provided 1`] = `
       },
     ]
   }
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   responsive={true}
   rowProps={[Function]}
   tableLayout="fixed"
diff --git a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
index 54e223cdc5d4127..d714f2159d1a239 100644
--- a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
+++ b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap
@@ -7,6 +7,7 @@ exports[`#start() returns \`Context\` component 1`] = `
       Object {
         "mapping": Object {
           "euiAccordion.isLoading": "Loading",
+          "euiBasicTable.noItemsMessage": "No items found",
           "euiBasicTable.selectAllRows": "Select all rows",
           "euiBasicTable.selectThisRow": "Select this row",
           "euiBasicTable.tableAutoCaptionWithPagination": [Function],
@@ -120,13 +121,15 @@ exports[`#start() returns \`Context\` component 1`] = `
           "euiLink.external.ariaLabel": "External link",
           "euiLink.newTarget.screenReaderOnlyText": "(opens in a new tab or window)",
           "euiMarkdownEditorFooter.closeButton": "Close",
-          "euiMarkdownEditorFooter.descriptionPrefix": "This editor uses",
-          "euiMarkdownEditorFooter.descriptionSuffix": "You can also utilize these additional syntax plugins to add rich content to your text.",
           "euiMarkdownEditorFooter.errorsTitle": "Errors",
+          "euiMarkdownEditorFooter.mdSyntaxLink": "GitHub flavored markdown",
           "euiMarkdownEditorFooter.openUploadModal": "Open upload files modal",
           "euiMarkdownEditorFooter.showMarkdownHelp": "Show markdown help",
           "euiMarkdownEditorFooter.showSyntaxErrors": "Show errors",
           "euiMarkdownEditorFooter.supportedFileTypes": [Function],
+          "euiMarkdownEditorFooter.syntaxModalDescriptionPrefix": "This editor uses",
+          "euiMarkdownEditorFooter.syntaxModalDescriptionSuffix": "You can also utilize these additional syntax plugins to add rich content to your text.",
+          "euiMarkdownEditorFooter.syntaxPopoverDescription": "This editor uses",
           "euiMarkdownEditorFooter.syntaxTitle": "Syntax help",
           "euiMarkdownEditorFooter.unsupportedFileType": "File type not supported",
           "euiMarkdownEditorFooter.uploadingFiles": "Click to upload files",
diff --git a/src/core/public/i18n/i18n_eui_mapping.tsx b/src/core/public/i18n/i18n_eui_mapping.tsx
index 2fe9657bce8c9a4..7585ada886c0592 100644
--- a/src/core/public/i18n/i18n_eui_mapping.tsx
+++ b/src/core/public/i18n/i18n_eui_mapping.tsx
@@ -68,6 +68,9 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         values: { tableCaption },
         description: 'Screen reader text to describe the pagination controls',
       }),
+    'euiBasicTable.noItemsMessage': i18n.translate('core.euiBasicTable.noItemsMessage', {
+      defaultMessage: 'No items found',
+    }),
     'euiBottomBar.customScreenReaderAnnouncement': ({ landmarkHeading }: EuiValues) =>
       i18n.translate('core.euiBottomBar.customScreenReaderAnnouncement', {
         defaultMessage:
@@ -634,19 +637,31 @@ export const getEuiContextMapping = (): EuiTokensObject => {
         defaultMessage: 'Syntax help',
       }
     ),
-    'euiMarkdownEditorFooter.descriptionPrefix': i18n.translate(
-      'core.euiMarkdownEditorFooter.descriptionPrefix',
+    'euiMarkdownEditorFooter.mdSyntaxLink': i18n.translate(
+      'core.euiMarkdownEditorFooter.mdSyntaxLink',
+      {
+        defaultMessage: 'GitHub flavored markdown',
+      }
+    ),
+    'euiMarkdownEditorFooter.syntaxModalDescriptionPrefix': i18n.translate(
+      'core.euiMarkdownEditorFooter.syntaxModalDescriptionPrefix',
       {
         defaultMessage: 'This editor uses',
       }
     ),
-    'euiMarkdownEditorFooter.descriptionSuffix': i18n.translate(
-      'core.euiMarkdownEditorFooter.descriptionSuffix',
+    'euiMarkdownEditorFooter.syntaxModalDescriptionSuffix': i18n.translate(
+      'core.euiMarkdownEditorFooter.syntaxModalDescriptionSuffix',
       {
         defaultMessage:
           'You can also utilize these additional syntax plugins to add rich content to your text.',
       }
     ),
+    'euiMarkdownEditorFooter.syntaxPopoverDescription': i18n.translate(
+      'core.euiMarkdownEditorFooter.syntaxPopoverDescription',
+      {
+        defaultMessage: 'This editor uses',
+      }
+    ),
     'euiMarkdownEditorToolbar.editor': i18n.translate('core.euiMarkdownEditorToolbar.editor', {
       defaultMessage: 'Editor',
     }),
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index e4f1c6a2d2e014e..818ea3675194eda 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -75,6 +75,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@7.15.0': ['Elastic License 2.0'],
-  '@elastic/eui@38.0.1': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@39.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index 9cd0687a1074d21..eae203274839678 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -884,7 +884,12 @@ exports[`Inspector Data View component should render single table without select
               },
             ]
           }
-          noItemsMessage="No items found"
+          noItemsMessage={
+            <EuiI18n
+              default="No items found"
+              token="euiBasicTable.noItemsMessage"
+            />
+          }
           onChange={[Function]}
           pagination={
             Object {
@@ -2449,7 +2454,12 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
               },
             ]
           }
-          noItemsMessage="No items found"
+          noItemsMessage={
+            <EuiI18n
+              default="No items found"
+              token="euiBasicTable.noItemsMessage"
+            />
+          }
           onChange={[Function]}
           pagination={
             Object {
diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
index 26ef7483bbbbd99..0ae82872124a433 100644
--- a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
+++ b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.test.tsx
@@ -14,12 +14,6 @@ import { mountWithI18nProvider } from '@kbn/test/jest';
 import { Frequency } from './types';
 import { CronEditor } from './cron_editor';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('CronEditor', () => {
   ['MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'YEAR'].forEach((unit) => {
     test(`is rendered with a ${unit} frequency`, () => {
diff --git a/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx b/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
index e291ec7b4ca0831..d33a0d2a87fb5de 100644
--- a/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
+++ b/src/plugins/index_pattern_field_editor/__jest__/client_integration/helpers/jest.mocks.tsx
@@ -9,12 +9,6 @@ import React from 'react';
 
 const EDITOR_ID = 'testEditor';
 
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
 
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/__snapshots__/color.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/__snapshots__/color.test.tsx.snap
index 7406e5ae9bb2daf..1cff82729e6f995 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/__snapshots__/color.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/color/__snapshots__/color.test.tsx.snap
@@ -76,7 +76,12 @@ exports[`ColorFormatEditor should render multiple colors 1`] = `
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     tableLayout="fixed"
   />
@@ -170,7 +175,12 @@ exports[`ColorFormatEditor should render other type normally (range field) 1`] =
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     tableLayout="fixed"
   />
@@ -264,7 +274,12 @@ exports[`ColorFormatEditor should render string type normally (regex field) 1`]
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     tableLayout="fixed"
   />
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
index 664912789b0e35c..3b476a6037aed6d 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/static_lookup/__snapshots__/static_lookup.test.tsx.snap
@@ -55,7 +55,12 @@ exports[`StaticLookupFormatEditor should render multiple lookup entries and unkn
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     style={
       Object {
@@ -159,7 +164,12 @@ exports[`StaticLookupFormatEditor should render normally 1`] = `
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     style={
       Object {
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index 79c1a11cfef84a6..3890d6c2b9ddbe8 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -292,7 +292,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
           </div>
           <table
             class="euiTable euiTable--compressed euiTable--responsive"
-            id="generated-id"
+            id="__table_generated-id"
             tabindex="-1"
           >
             <caption
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
index 48d3a5dfea7c65a..6394d42b691f1fe 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/url.test.tsx
@@ -15,12 +15,6 @@ import { createKibanaReactContext } from '../../../../../../kibana_react/public'
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 const fieldType = 'string';
 const format = {
   getConverterFor: jest
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
index 1a0b96c14fe3594..71693a1e5cb8c8e 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/samples/__snapshots__/samples.test.tsx.snap
@@ -52,7 +52,12 @@ exports[`FormatEditorSamples should render normally 1`] = `
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     tableLayout="fixed"
   />
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
index 8325e7dc886e805..bca54ff67591ce0 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
@@ -188,7 +188,12 @@ exports[`Table prevents saved objects from being deleted 1`] = `
         ]
       }
       loading={false}
-      noItemsMessage="No items found"
+      noItemsMessage={
+        <EuiI18n
+          default="No items found"
+          token="euiBasicTable.noItemsMessage"
+        />
+      }
       onChange={[Function]}
       pagination={
         Object {
@@ -403,7 +408,12 @@ exports[`Table should render normally 1`] = `
         ]
       }
       loading={false}
-      noItemsMessage="No items found"
+      noItemsMessage={
+        <EuiI18n
+          default="No items found"
+          token="euiBasicTable.noItemsMessage"
+        />
+      }
       onChange={[Function]}
       pagination={
         Object {
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
index a2a92b7e16f8eac..12fa1c955ccc8fb 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx
@@ -15,12 +15,6 @@ import props from './__fixtures__/props.json';
 import { MemoryRouter } from 'react-router-dom';
 import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('ErrorGroupOverview -> List', () => {
   beforeAll(() => {
     mockMoment();
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
index 890c692096a6640..c8c7bf82dff0479 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
     </div>
     <table
       className="euiTable euiTable--responsive"
-      id="generated-id"
+      id="__table_generated-id"
       tabIndex={-1}
     >
       <caption
@@ -352,7 +352,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
     </div>
     <table
       className="euiTable euiTable--responsive"
-      id="generated-id"
+      id="__table_generated-id"
       tabIndex={-1}
     >
       <caption
@@ -1290,7 +1290,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               className="euiPagination__item"
             >
               <button
-                aria-controls="generated-id"
+                aria-controls="__table_generated-id"
                 aria-current={true}
                 aria-label="Page 1 of 1"
                 className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
index c73d312e0cf1890..6bab77dbe49701b 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.test.tsx
@@ -12,12 +12,6 @@ import { mountWithTheme } from '../../../utils/testHelpers';
 import { Stackframe as StackframeComponent } from './Stackframe';
 import stacktracesMock from './__fixtures__/stacktraces.json';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('Stackframe', () => {
   describe('when stackframe has source lines', () => {
     let wrapper: ReactWrapper;
diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
index e4674b3add8806b..15613af4daf98a8 100644
--- a/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
@@ -35,7 +35,12 @@ exports[`ManagedTable should render a page-full of items, with defaults 1`] = `
     ]
   }
   loading={false}
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   onChange={[Function]}
   pagination={
     Object {
@@ -85,7 +90,12 @@ exports[`ManagedTable should render when specifying initial values 1`] = `
     ]
   }
   loading={false}
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   onChange={[Function]}
   pagination={
     Object {
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 6ef6d19e446dbc2..45b9d896db5f270 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -54,7 +54,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
               >
                 <input
                   accept="image/*"
-                  aria-describedby="generated-id"
+                  aria-describedby="generated-id-filePicker__prompt"
                   className="euiFilePicker__input"
                   multiple={true}
                   onChange={[Function]}
@@ -65,7 +65,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
                 />
                 <div
                   className="euiFilePicker__prompt"
-                  id="generated-id"
+                  id="generated-id-filePicker__prompt"
                 >
                   <span
                     aria-hidden="true"
@@ -238,7 +238,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
               >
                 <input
                   accept="image/*"
-                  aria-describedby="generated-id"
+                  aria-describedby="generated-id-filePicker__prompt"
                   className="euiFilePicker__input"
                   multiple={true}
                   onChange={[Function]}
@@ -249,7 +249,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                 />
                 <div
                   className="euiFilePicker__prompt"
-                  id="generated-id"
+                  id="generated-id-filePicker__prompt"
                 >
                   <span
                     aria-hidden="true"
diff --git a/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot b/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
index 9c9ed566e948252..bfd08e4ab823ed8 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/expression_input/__stories__/__snapshots__/expression_input.stories.storyshot
@@ -29,7 +29,7 @@ exports[`Storyshots components/ExpressionInput default 1`] = `
               aria-label="Code Editor"
               className="kibanaCodeEditor__keyboardHint"
               data-test-subj="codeEditorHint"
-              id="generated-id"
+              id="codeEditor_generated-id"
               onBlur={[Function]}
               onClick={[Function]}
               onFocus={[Function]}
diff --git a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
index 5fe43c95d271db0..ab76e9a66a2b537 100644
--- a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
@@ -8,7 +8,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     className="euiFilePicker__wrap"
   >
     <input
-      aria-describedby="generated-id"
+      aria-describedby="generated-id-filePicker__prompt"
       className="euiFilePicker__input"
       id=""
       onChange={[Function]}
@@ -19,7 +19,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     />
     <div
       className="euiFilePicker__prompt"
-      id="generated-id"
+      id="generated-id-filePicker__prompt"
     >
       <span
         aria-hidden="true"
diff --git a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
index 7d05176b8147cb3..f955a6e2322a9cf 100644
--- a/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/home/my_workpads/__snapshots__/workpad_table.stories.storyshot
@@ -54,7 +54,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
           >
             <input
               accept="application/json"
-              aria-describedby="generated-id"
+              aria-describedby="generated-id-filePicker__prompt"
               aria-label="Import workpad JSON file"
               className="euiFilePicker__input"
               disabled={false}
@@ -66,7 +66,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
             />
             <div
               className="euiFilePicker__prompt"
-              id="generated-id"
+              id="generated-id-filePicker__prompt"
             >
               <span
                 aria-hidden="true"
@@ -109,7 +109,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
                   checked={false}
                   className="euiCheckbox__input"
                   disabled={false}
-                  id="_selection_column-checkbox_generated-id"
+                  id="_selection_column-checkbox_generated-id_mobile"
                   onChange={[Function]}
                   type="checkbox"
                 />
@@ -118,7 +118,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
                 />
                 <label
                   className="euiCheckbox__label"
-                  htmlFor="_selection_column-checkbox_generated-id"
+                  htmlFor="_selection_column-checkbox_generated-id_mobile"
                 >
                   Select all rows
                 </label>
@@ -166,7 +166,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
         </div>
         <table
           className="euiTable euiTable--responsive"
-          id="generated-id"
+          id="__table_generated-id"
           tabIndex={-1}
         >
           <caption
@@ -195,7 +195,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
                       className="euiCheckbox__input"
                       data-test-subj="checkboxSelectAll"
                       disabled={false}
-                      id="_selection_column-checkbox_generated-id"
+                      id="_selection_column-checkbox_generated-id_desktop"
                       onChange={[Function]}
                       type="checkbox"
                     />
@@ -921,7 +921,7 @@ exports[`Storyshots Home/Components/Workpad Table Workpad Table 1`] = `
                   className="euiPagination__item"
                 >
                   <button
-                    aria-controls="generated-id"
+                    aria-controls="__table_generated-id"
                     aria-current={true}
                     aria-label="Page 1 of 1"
                     className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
index 23d4dbbe62a8f9f..8be457b956be660 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.test.tsx
@@ -21,11 +21,7 @@ import { Settings } from './settings';
 
 jest.mock('../../../supported_renderers');
 jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
-jest.mock('@elastic/eui/lib/services/accessibility', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
+
 jest.mock('@elastic/eui/lib/components/portal/portal', () => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
   const React = jest.requireActual('react');
diff --git a/x-pack/plugins/canvas/storybook/storyshots.test.tsx b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
index f99a1ed5d4335a3..8a55c6f12bf5191 100644
--- a/x-pack/plugins/canvas/storybook/storyshots.test.tsx
+++ b/x-pack/plugins/canvas/storybook/storyshots.test.tsx
@@ -51,13 +51,6 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
 // @ts-expect-error Portal mocks are notoriously difficult to type
 ReactDOM.createPortal = jest.fn((element) => element);
 
-// Mock the EUI HTML ID Generator so elements have a predictable ID in snapshots
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 // To be resolved by EUI team.
 // https://github.com/elastic/eui/issues/3712
 jest.mock('@elastic/eui/lib/components/overlay_mask/overlay_mask', () => {
diff --git a/x-pack/plugins/license_management/__jest__/add_license.test.js b/x-pack/plugins/license_management/__jest__/add_license.test.js
index 1e36226f9174a68..186601bb8d097c6 100644
--- a/x-pack/plugins/license_management/__jest__/add_license.test.js
+++ b/x-pack/plugins/license_management/__jest__/add_license.test.js
@@ -7,11 +7,6 @@
 
 import { AddLicense } from '../public/application/sections/license_dashboard/add_license';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('AddLicense component when license is active', () => {
   test('should display correct verbiage', () => {
diff --git a/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js b/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
index 5e14986ec53e175..bd6dfcc3c576fa3 100644
--- a/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
+++ b/x-pack/plugins/license_management/__jest__/request_trial_extension.test.js
@@ -7,11 +7,6 @@
 
 import { RequestTrialExtension } from '../public/application/sections/license_dashboard/request_trial_extension';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('RequestTrialExtension component', () => {
   test('should not display when license is active and trial has not been used', () => {
diff --git a/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js b/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
index ff5642f2a18dbb1..417f3484a2d78cc 100644
--- a/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
+++ b/x-pack/plugins/license_management/__jest__/revert_to_basic.test.js
@@ -7,11 +7,6 @@
 
 import { RevertToBasic } from '../public/application/sections/license_dashboard/revert_to_basic';
 import { createMockLicense, getComponent } from './util';
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
 
 describe('RevertToBasic component', () => {
   test('should display when trial is active', () => {
diff --git a/x-pack/plugins/license_management/__jest__/start_trial.test.js b/x-pack/plugins/license_management/__jest__/start_trial.test.js
index e80b6019522465e..6dc6c95521f55b7 100644
--- a/x-pack/plugins/license_management/__jest__/start_trial.test.js
+++ b/x-pack/plugins/license_management/__jest__/start_trial.test.js
@@ -8,12 +8,6 @@
 import { StartTrial } from '../public/application/sections/license_dashboard/start_trial';
 import { createMockLicense, getComponent } from './util';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('StartTrial component when trial is allowed', () => {
   test('display for basic license', () => {
     const rendered = getComponent(
diff --git a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_active.test.js.snap b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_active.test.js.snap
index b7d57b9bb5d9d01..c4ce91823ce03a0 100644
--- a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_active.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_active.test.js.snap
@@ -39,7 +39,12 @@ exports[`Latest Active that latest active component renders normally 1`] = `
       },
     ]
   }
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   responsive={true}
   tableLayout="fixed"
 />
diff --git a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_types.test.js.snap b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_types.test.js.snap
index 0021bfae57d6ebc..4b4f5ca65497159 100644
--- a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_types.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_types.test.js.snap
@@ -31,7 +31,12 @@ exports[`Latest Types that latest active component renders normally 1`] = `
       },
     ]
   }
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   responsive={true}
   tableLayout="fixed"
 />
diff --git a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_versions.test.js.snap b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_versions.test.js.snap
index 93ff1299323a04b..88e673eb8dcea6a 100644
--- a/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_versions.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/beats/overview/__snapshots__/latest_versions.test.js.snap
@@ -27,7 +27,12 @@ exports[`Latest Versions that latest active component renders normally 1`] = `
       },
     ]
   }
-  noItemsMessage="No items found"
+  noItemsMessage={
+    <EuiI18n
+      default="No items found"
+      token="euiBasicTable.noItemsMessage"
+    />
+  }
   responsive={true}
   tableLayout="fixed"
 />
diff --git a/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap b/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
index 28389ef3c3211ee..3e439f263a61386 100644
--- a/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
@@ -268,7 +268,12 @@ exports[`Logs should render normally 1`] = `
         },
       ]
     }
-    noItemsMessage="No items found"
+    noItemsMessage={
+      <EuiI18n
+        default="No items found"
+        token="euiBasicTable.noItemsMessage"
+      />
+    }
     responsive={true}
     tableLayout="fixed"
   />
diff --git a/x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap b/x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap
index 70cd9e414e85d77..f025a4b7dac55b2 100644
--- a/x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/management/__snapshots__/report_listing.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                     checked={false}
                     compressed={false}
                     disabled={false}
-                    id="_selection_column-checkbox_generated-id"
+                    id="_selection_column-checkbox_generated-id_mobile"
                     indeterminate={false}
                     label="Select all rows"
                     onChange={[Function]}
@@ -46,7 +46,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                         checked={false}
                         className="euiCheckbox__input"
                         disabled={false}
-                        id="_selection_column-checkbox_generated-id"
+                        id="_selection_column-checkbox_generated-id_mobile"
                         onChange={[Function]}
                         type="checkbox"
                       />
@@ -55,7 +55,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                       />
                       <label
                         className="euiCheckbox__label"
-                        htmlFor="_selection_column-checkbox_generated-id"
+                        htmlFor="_selection_column-checkbox_generated-id_mobile"
                       >
                         Select all rows
                       </label>
@@ -76,13 +76,13 @@ exports[`ReportListing Report job listing with some items 1`] = `
       </div>
     </EuiTableHeaderMobile>
     <EuiTable
-      id="generated-id"
+      id="__table_generated-id"
       responsive={true}
       tableLayout="fixed"
     >
       <table
         className="euiTable euiTable--responsive"
-        id="generated-id"
+        id="__table_generated-id"
         tabIndex={-1}
       >
         <EuiScreenReaderOnly>
@@ -122,7 +122,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                         compressed={false}
                         data-test-subj="checkboxSelectAll"
                         disabled={false}
-                        id="_selection_column-checkbox_generated-id"
+                        id="_selection_column-checkbox_generated-id_desktop"
                         indeterminate={false}
                         label={null}
                         onChange={[Function]}
@@ -137,7 +137,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                             className="euiCheckbox__input"
                             data-test-subj="checkboxSelectAll"
                             disabled={false}
-                            id="_selection_column-checkbox_generated-id"
+                            id="_selection_column-checkbox_generated-id_desktop"
                             onChange={[Function]}
                             type="checkbox"
                           />
@@ -10370,7 +10370,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
     </EuiTable>
   </div>
   <PaginationBar
-    aria-controls="generated-id"
+    aria-controls="__table_generated-id"
     aria-label={
       <EuiI18n
         default="Pagination for preceding table: {tableCaption}"
@@ -10403,7 +10403,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
       </EuiSpacer>
       <EuiTablePagination
         activePage={0}
-        aria-controls="generated-id"
+        aria-controls="__table_generated-id"
         hidePerPageOptions={true}
         itemsPerPage={10}
         itemsPerPageOptions={
@@ -10440,7 +10440,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
               >
                 <EuiPagination
                   activePage={0}
-                  aria-controls="generated-id"
+                  aria-controls="__table_generated-id"
                   onPageClick={[Function]}
                   pageCount={2}
                 >
@@ -10500,7 +10500,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                     >
                       <PaginationButtonWrapper
                         activePage={0}
-                        ariaControls="generated-id"
+                        ariaControls="__table_generated-id"
                         key="0"
                         pageCount={2}
                         pageIndex={0}
@@ -10510,7 +10510,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                           className="euiPagination__item"
                         >
                           <EuiPaginationButton
-                            aria-controls="generated-id"
+                            aria-controls="__table_generated-id"
                             hideOnMobile={true}
                             isActive={true}
                             onClick={[Function]}
@@ -10537,19 +10537,19 @@ exports[`ReportListing Report job listing with some items 1`] = `
                                 }
                               >
                                 <EuiButtonEmpty
-                                  aria-controls="generated-id"
+                                  aria-controls="__table_generated-id"
                                   aria-current={true}
                                   aria-label="Page 1 of 2"
                                   className="euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                   color="text"
                                   data-test-subj="pagination-button-0"
-                                  href="#generated-id"
+                                  href="#__table_generated-id"
                                   isDisabled={true}
                                   onClick={[Function]}
                                   size="s"
                                 >
                                   <button
-                                    aria-controls="generated-id"
+                                    aria-controls="__table_generated-id"
                                     aria-current={true}
                                     aria-label="Page 1 of 2"
                                     className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
@@ -10587,7 +10587,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                       </PaginationButtonWrapper>
                       <PaginationButtonWrapper
                         activePage={0}
-                        ariaControls="generated-id"
+                        ariaControls="__table_generated-id"
                         key="1"
                         pageCount={2}
                         pageIndex={1}
@@ -10597,7 +10597,7 @@ exports[`ReportListing Report job listing with some items 1`] = `
                           className="euiPagination__item"
                         >
                           <EuiPaginationButton
-                            aria-controls="generated-id"
+                            aria-controls="__table_generated-id"
                             hideOnMobile={true}
                             isActive={false}
                             onClick={[Function]}
@@ -10624,22 +10624,22 @@ exports[`ReportListing Report job listing with some items 1`] = `
                                 }
                               >
                                 <EuiButtonEmpty
-                                  aria-controls="generated-id"
+                                  aria-controls="__table_generated-id"
                                   aria-label="Page 2 of 2"
                                   className="euiPaginationButton euiPaginationButton--hideOnMobile"
                                   color="text"
                                   data-test-subj="pagination-button-1"
-                                  href="#generated-id"
+                                  href="#__table_generated-id"
                                   isDisabled={false}
                                   onClick={[Function]}
                                   size="s"
                                 >
                                   <a
-                                    aria-controls="generated-id"
+                                    aria-controls="__table_generated-id"
                                     aria-label="Page 2 of 2"
                                     className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
                                     data-test-subj="pagination-button-1"
-                                    href="#generated-id"
+                                    href="#__table_generated-id"
                                     onClick={[Function]}
                                     rel="noreferrer"
                                   >
@@ -10685,20 +10685,20 @@ exports[`ReportListing Report job listing with some items 1`] = `
                         token="euiPagination.disabledNextPage"
                       >
                         <EuiButtonIcon
-                          aria-controls="generated-id"
+                          aria-controls="__table_generated-id"
                           aria-label="Next page, 2"
                           color="text"
                           data-test-subj="pagination-button-next"
-                          href="#generated-id"
+                          href="#__table_generated-id"
                           iconType="arrowRight"
                           onClick={[Function]}
                         >
                           <a
-                            aria-controls="generated-id"
+                            aria-controls="__table_generated-id"
                             aria-label="Next page, 2"
                             className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                             data-test-subj="pagination-button-next"
-                            href="#generated-id"
+                            href="#__table_generated-id"
                             onClick={[Function]}
                             rel="noreferrer"
                           >
diff --git a/x-pack/plugins/reporting/public/management/report_listing.test.tsx b/x-pack/plugins/reporting/public/management/report_listing.test.tsx
index bdb8bdbbe5d5e6b..5e80c2d666c23bb 100644
--- a/x-pack/plugins/reporting/public/management/report_listing.test.tsx
+++ b/x-pack/plugins/reporting/public/management/report_listing.test.tsx
@@ -26,12 +26,6 @@ import { Job } from '../lib/job';
 import { InternalApiClientProvider, ReportingAPIClient } from '../lib/reporting_api_client';
 import { KibanaContextProvider } from '../shared_imports';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 interface PayloadMock {
   payload: Omit<ReportApiJSON['payload'], 'browserTimezone' | 'version' | 'layout'>;
 }
diff --git a/x-pack/plugins/security_solution/public/common/components/conditions_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/conditions_table/__snapshots__/index.test.tsx.snap
index 3d37aea431df3b7..c14e0bb283de0d6 100644
--- a/x-pack/plugins/security_solution/public/common/components/conditions_table/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/conditions_table/__snapshots__/index.test.tsx.snap
@@ -58,7 +58,12 @@ exports[`conditions_table ConditionsTable should render multi item table with an
           },
         ]
       }
-      noItemsMessage="No items found"
+      noItemsMessage={
+        <EuiI18n
+          default="No items found"
+          token="euiBasicTable.noItemsMessage"
+        />
+      }
       responsive={true}
       tableLayout="fixed"
     />
@@ -124,7 +129,12 @@ exports[`conditions_table ConditionsTable should render multi item table with or
           },
         ]
       }
-      noItemsMessage="No items found"
+      noItemsMessage={
+        <EuiI18n
+          default="No items found"
+          token="euiBasicTable.noItemsMessage"
+        />
+      }
       responsive={true}
       tableLayout="fixed"
     />
@@ -165,7 +175,12 @@ exports[`conditions_table ConditionsTable should render single item table correc
           },
         ]
       }
-      noItemsMessage="No items found"
+      noItemsMessage={
+        <EuiI18n
+          default="No items found"
+          token="euiBasicTable.noItemsMessage"
+        />
+      }
       responsive={true}
       tableLayout="fixed"
     />
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
index 7ced93abc7fe15f..f39fd47c787718f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/trusted_apps_page.test.tsx
@@ -36,10 +36,6 @@ import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_ex
 import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 import { licenseService } from '../../../../common/hooks/use_license';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
-  htmlIdGenerator: () => () => 'mockId',
-}));
-
 // TODO: remove this mock when feature flag is removed
 jest.mock('../../../../common/hooks/use_experimental_features');
 const useIsExperimentalFeatureEnabledMock = useIsExperimentalFeatureEnabled as jest.Mock;
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6c3e9c12f4ce42f..06f5e133f33b6c6 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1162,8 +1162,6 @@
     "core.euiLink.external.ariaLabel": "外部リンク",
     "core.euiLink.newTarget.screenReaderOnlyText": "（新しいタブまたはウィンドウで開く）",
     "core.euiMarkdownEditorFooter.closeButton": "閉じる",
-    "core.euiMarkdownEditorFooter.descriptionPrefix": "このエディターは使用します",
-    "core.euiMarkdownEditorFooter.descriptionSuffix": "これらの追加の構文プラグインを利用して、リッチコンテンツをテキストに追加することもできます。",
     "core.euiMarkdownEditorFooter.errorsTitle": "エラー",
     "core.euiMarkdownEditorFooter.openUploadModal": "ファイルのアップロードモーダルを開く",
     "core.euiMarkdownEditorFooter.showMarkdownHelp": "マークダウンヘルプを表示",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 8989bca26d8850d..d8c35485f2dbc1d 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1180,8 +1180,6 @@
     "core.euiLink.external.ariaLabel": "外部链接",
     "core.euiLink.newTarget.screenReaderOnlyText": "（在新选项卡或窗口中打开）",
     "core.euiMarkdownEditorFooter.closeButton": "关闭",
-    "core.euiMarkdownEditorFooter.descriptionPrefix": "此编辑器使用",
-    "core.euiMarkdownEditorFooter.descriptionSuffix": "还可以利用这些附加的语法插件向文本添加富文本内容。",
     "core.euiMarkdownEditorFooter.errorsTitle": "错误",
     "core.euiMarkdownEditorFooter.openUploadModal": "打开上传文件模式窗口",
     "core.euiMarkdownEditorFooter.showMarkdownHelp": "显示 Markdown 帮助",
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
index 95c5a9dbc418b5b..45b162e13fb9b54 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
@@ -347,10 +347,18 @@ exports[`DonutChart component passes correct props without errors for valid prop
           },
           "barSeriesStyle": Object {
             "displayValue": Object {
-              "fill": "rgba(106, 113, 125, 1)",
+              "alignment": Object {
+                "horizontal": "center",
+                "vertical": "middle",
+              },
+              "fill": Object {
+                "textBorder": 0,
+                "textContrast": true,
+                "textInvertible": true,
+              },
               "fontFamily": "'Inter', 'Inter UI', -apple-system, BlinkMacSystemFont,
   'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-              "fontSize": 8,
+              "fontSize": 10,
             },
           },
           "chartMargins": Object {
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
index 3db2efd0980823c..c6309debdde1f19 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/location_status_tags.test.tsx
@@ -13,12 +13,6 @@ import { render } from '../../../../lib/helper/rtl_helpers';
 
 mockMoment();
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 describe('LocationStatusTags component', () => {
   let monitorLocations: MonitorLocation[];
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
index 703e2653ff0aa42..80b1463ac2f4350 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.test.tsx
@@ -23,12 +23,6 @@ import { mockMoment } from '../../../lib/helper/test_helpers';
 import { render } from '../../../lib/helper/rtl_helpers';
 import { NO_DATA_MESSAGE } from './translations';
 
-jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
-  return {
-    htmlIdGenerator: () => () => `generated-id`,
-  };
-});
-
 const testFooPings: Ping[] = [
   makePing({
     docId: 'foo1',
diff --git a/yarn.lock b/yarn.lock
index 31b69268e6e7b35..f0fbb4f6addaad5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2412,10 +2412,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@38.0.1":
-  version "38.0.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-38.0.1.tgz#de03c4436cd1b58327f54f57e4248183d681c0f8"
-  integrity sha512-yzV56rGVwhALnLVXsw2LGsFksh7c27BwIQOl2memDfm15VprzX5Fd+u6TpX8TkpFbTTgnYfyhI11W3eKVUYt1g==
+"@elastic/eui@39.0.0":
+  version "39.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-39.0.0.tgz#abac19edd466eee13612d5668e5456961dc813b8"
+  integrity sha512-8sf8sbxjpRxV23dFTwbkaWH6LhWrOlMpdUUMVUC9zd0g5iQLj1IxkxQCeyYM/p++SQFl+1hshAuaH//DCz5Xrw==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"