diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9c695e9877..2d75c6b1491 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## [`main`](https://github.com/elastic/eui/tree/main)
 
+- Updated `testenv` mock for `EuiIcon` to render `aria-label` as text ([#5709](https://github.com/elastic/eui/pull/5709))
+
 **Breaking changes**
 
 - Removed Legacy theme including compiled CSS ([#5688](https://github.com/elastic/eui/pull/5688))
diff --git a/src/components/avatar/__snapshots__/avatar.test.tsx.snap b/src/components/avatar/__snapshots__/avatar.test.tsx.snap
index 7a88bf96e53..1559166b8fa 100644
--- a/src/components/avatar/__snapshots__/avatar.test.tsx.snap
+++ b/src/components/avatar/__snapshots__/avatar.test.tsx.snap
@@ -89,10 +89,11 @@ exports[`EuiAvatar props iconType and iconColor as null is rendered 1`] = `
   title="name"
 >
   <span
-    aria-label="name"
     class="euiAvatar__icon"
     data-euiicon-type="bolt"
-  />
+  >
+    name
+  </span>
 </div>
 `;
 
@@ -105,11 +106,12 @@ exports[`EuiAvatar props iconType and iconColor is rendered 1`] = `
   title="name"
 >
   <span
-    aria-label="name"
     class="euiAvatar__icon"
     color="primary"
     data-euiicon-type="bolt"
-  />
+  >
+    name
+  </span>
 </div>
 `;
 
@@ -122,11 +124,12 @@ exports[`EuiAvatar props iconType and iconSize is rendered 1`] = `
   title="name"
 >
   <span
-    aria-label="name"
     class="euiAvatar__icon"
     color="#000000"
     data-euiicon-type="bolt"
-  />
+  >
+    name
+  </span>
 </div>
 `;
 
@@ -139,11 +142,12 @@ exports[`EuiAvatar props iconType is rendered 1`] = `
   title="name"
 >
   <span
-    aria-label="name"
     class="euiAvatar__icon"
     color="#000000"
     data-euiicon-type="bolt"
-  />
+  >
+    name
+  </span>
 </div>
 `;
 
diff --git a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
index 4d75b94442b..d41b45eb7ed 100644
--- a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
+++ b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
@@ -69,11 +69,12 @@ exports[`EuiControlBar is rendered 1`] = `
       class="euiControlBar__divider"
     />
     <span
-      aria-label="Sample Icon"
       class="euiControlBar__icon"
       color="danger"
       data-euiicon-type="alert"
-    />
+    >
+      Sample Icon
+    </span>
     <div
       class="euiControlBar__spacer"
     />
@@ -214,11 +215,12 @@ exports[`EuiControlBar props leftOffset is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -387,11 +389,12 @@ exports[`EuiControlBar props leftOffset is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
@@ -554,11 +557,12 @@ exports[`EuiControlBar props maxHeight is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -727,11 +731,12 @@ exports[`EuiControlBar props maxHeight is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
@@ -893,11 +898,12 @@ exports[`EuiControlBar props mobile is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -1066,11 +1072,12 @@ exports[`EuiControlBar props mobile is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
@@ -1310,11 +1317,12 @@ exports[`EuiControlBar props position is rendered 1`] = `
           type="alert"
         >
           <span
-            aria-label="Sample Icon"
             className="euiControlBar__icon"
             color="danger"
             data-euiicon-type="alert"
-          />
+          >
+            Sample Icon
+          </span>
         </EuiIcon>
         <div
           className="euiControlBar__spacer"
@@ -1461,11 +1469,12 @@ exports[`EuiControlBar props rightOffset is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -1634,11 +1643,12 @@ exports[`EuiControlBar props rightOffset is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
@@ -1800,11 +1810,12 @@ exports[`EuiControlBar props showContent is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -1978,11 +1989,12 @@ exports[`EuiControlBar props showContent is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
@@ -2149,11 +2161,12 @@ exports[`EuiControlBar props size is rendered 1`] = `
                 class="euiControlBar__divider"
               />
               <span
-                aria-label="Sample Icon"
                 class="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
               <div
                 class="euiControlBar__spacer"
               />
@@ -2322,11 +2335,12 @@ exports[`EuiControlBar props size is rendered 1`] = `
               type="alert"
             >
               <span
-                aria-label="Sample Icon"
                 className="euiControlBar__icon"
                 color="danger"
                 data-euiicon-type="alert"
-              />
+              >
+                Sample Icon
+              </span>
             </EuiIcon>
             <div
               className="euiControlBar__spacer"
diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
index b310ff8a31b..695129dac57 100644
--- a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
+++ b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
@@ -1079,12 +1079,13 @@ Array [
                         A
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-A"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -1121,12 +1122,13 @@ Array [
                         B
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-B"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -1522,12 +1524,13 @@ Array [
                         A
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-A"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -1564,12 +1567,13 @@ Array [
                         B
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-B"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -2268,12 +2272,13 @@ Array [
                         Column A
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-A"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -2312,12 +2317,13 @@ Array [
                         </div>
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-B"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -2691,12 +2697,13 @@ Array [
                         A
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-A"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
@@ -2733,12 +2740,13 @@ Array [
                         B
                       </div>
                       <span
-                        aria-label="Header actions"
                         class="euiDataGridHeaderCell__icon"
                         color="text"
                         data-euiicon-type="arrowDown"
                         data-test-subj="dataGridHeaderCellActionButton-B"
-                      />
+                      >
+                        Header actions
+                      </span>
                     </button>
                   </div>
                 </div>
diff --git a/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap b/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap
index 59580c7e998..4b0c6d49d8f 100644
--- a/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap
+++ b/src/components/datagrid/body/__snapshots__/data_grid_body.test.tsx.snap
@@ -45,12 +45,13 @@ exports[`EuiDataGridBody renders 1`] = `
                 columnA
               </div>
               <span
-                aria-label="Header actions"
                 class="euiDataGridHeaderCell__icon"
                 color="text"
                 data-euiicon-type="arrowDown"
                 data-test-subj="dataGridHeaderCellActionButton-columnA"
-              />
+              >
+                Header actions
+              </span>
             </button>
           </div>
         </div>
@@ -87,12 +88,13 @@ exports[`EuiDataGridBody renders 1`] = `
                 columnB
               </div>
               <span
-                aria-label="Header actions"
                 class="euiDataGridHeaderCell__icon"
                 color="text"
                 data-euiicon-type="arrowDown"
                 data-test-subj="dataGridHeaderCellActionButton-columnB"
-              />
+              >
+                Header actions
+              </span>
             </button>
           </div>
         </div>
diff --git a/src/components/header/__snapshots__/header_logo.test.tsx.snap b/src/components/header/__snapshots__/header_logo.test.tsx.snap
index 7e1c1a274f1..feed990cb01 100644
--- a/src/components/header/__snapshots__/header_logo.test.tsx.snap
+++ b/src/components/header/__snapshots__/header_logo.test.tsx.snap
@@ -8,10 +8,11 @@ exports[`EuiHeaderLogo is rendered 1`] = `
   rel="noreferrer"
 >
   <span
-    aria-label="Elastic"
     class="euiHeaderLogo__icon"
     data-euiicon-type="logoElastic"
-  />
+  >
+    Elastic
+  </span>
 </a>
 `;
 
@@ -22,10 +23,11 @@ exports[`EuiHeaderLogo renders href 1`] = `
   rel="noreferrer"
 >
   <span
-    aria-label="Elastic"
     class="euiHeaderLogo__icon"
     data-euiicon-type="logoElastic"
-  />
+  >
+    Elastic
+  </span>
 </a>
 `;
 
@@ -36,10 +38,11 @@ exports[`EuiHeaderLogo renders href with rel 1`] = `
   rel="noreferrer"
 >
   <span
-    aria-label="Elastic"
     class="euiHeaderLogo__icon"
     data-euiicon-type="logoElastic"
-  />
+  >
+    Elastic
+  </span>
 </a>
 `;
 
@@ -50,9 +53,10 @@ exports[`EuiHeaderLogo renders optional props 1`] = `
   style="color:red"
 >
   <span
-    aria-label="Moby Dick"
     class="euiHeaderLogo__icon"
     data-euiicon-type="alert"
-  />
+  >
+    Moby Dick
+  </span>
 </a>
 `;
diff --git a/src/components/icon/icon.testenv.tsx b/src/components/icon/icon.testenv.tsx
index 186988c8ed0..b2309b75677 100644
--- a/src/components/icon/icon.testenv.tsx
+++ b/src/components/icon/icon.testenv.tsx
@@ -8,13 +8,18 @@
 
 import React, { ComponentType } from 'react';
 
-export const EuiIcon = ({ type, ...rest }: any) => (
+export const EuiIcon = ({ type, 'aria-label': ariaLabel, ...rest }: any) => (
   <span
     data-euiicon-type={
       typeof type === 'string' ? type : type.displayName || type.name
     }
     {...rest}
-  />
+  >
+    {
+      // render aria-label as text, if it's passed in props
+      ariaLabel ?? ''
+    }
+  </span>
 );
 
 export const appendIconComponentCache = (_: {
diff --git a/src/components/link/__snapshots__/link.test.tsx.snap b/src/components/link/__snapshots__/link.test.tsx.snap
index 611526145ca..cf1d21b88ce 100644
--- a/src/components/link/__snapshots__/link.test.tsx.snap
+++ b/src/components/link/__snapshots__/link.test.tsx.snap
@@ -57,10 +57,11 @@ exports[`EuiLink it is an external link 1`] = `
   rel="noreferrer"
 >
   <span
-    aria-label="External link"
     class="euiLink__externalIcon"
     data-euiicon-type="popout"
-  />
+  >
+    External link
+  </span>
 </a>
 `;
 
@@ -146,10 +147,11 @@ exports[`EuiLink supports target 1`] = `
   target="_blank"
 >
   <span
-    aria-label="External link"
     class="euiLink__externalIcon"
     data-euiicon-type="popout"
-  />
+  >
+    External link
+  </span>
   <span
     class="euiScreenReaderOnly"
   >
diff --git a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
index 2d9e194420a..7402e873fbc 100644
--- a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
+++ b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
@@ -827,10 +827,11 @@ exports[`EuiMarkdownEditor custom plugins are excluded and popover is rendered 1
                                   >
                                     GitHub flavored markdown
                                     <span
-                                      aria-label="External link"
                                       class="euiLink__externalIcon"
                                       data-euiicon-type="popout"
-                                    />
+                                    >
+                                      External link
+                                    </span>
                                     <span
                                       class="euiScreenReaderOnly"
                                     >
@@ -1070,11 +1071,12 @@ exports[`EuiMarkdownEditor custom plugins are excluded and popover is rendered 1
                                                     type="popout"
                                                   >
                                                     <span
-                                                      aria-label="External link"
                                                       className="euiLink__externalIcon"
                                                       data-euiicon-type="popout"
                                                       size="s"
-                                                    />
+                                                    >
+                                                      External link
+                                                    </span>
                                                   </EuiIcon>
                                                   <EuiScreenReaderOnly>
                                                     <span
@@ -2284,10 +2286,11 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                       >
                                         GitHub flavored markdown
                                         <span
-                                          aria-label="External link"
                                           class="euiLink__externalIcon"
                                           data-euiicon-type="popout"
-                                        />
+                                        >
+                                          External link
+                                        </span>
                                         <span
                                           class="euiScreenReaderOnly"
                                         >
@@ -2520,10 +2523,11 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                               >
                                                 GitHub flavored markdown
                                                 <span
-                                                  aria-label="External link"
                                                   class="euiLink__externalIcon"
                                                   data-euiicon-type="popout"
-                                                />
+                                                >
+                                                  External link
+                                                </span>
                                                 <span
                                                   class="euiScreenReaderOnly"
                                                 >
@@ -2672,10 +2676,11 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                                 >
                                                   GitHub flavored markdown
                                                   <span
-                                                    aria-label="External link"
                                                     class="euiLink__externalIcon"
                                                     data-euiicon-type="popout"
-                                                  />
+                                                  >
+                                                    External link
+                                                  </span>
                                                   <span
                                                     class="euiScreenReaderOnly"
                                                   >
@@ -2824,10 +2829,11 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                                   >
                                                     GitHub flavored markdown
                                                     <span
-                                                      aria-label="External link"
                                                       class="euiLink__externalIcon"
                                                       data-euiicon-type="popout"
-                                                    />
+                                                    >
+                                                      External link
+                                                    </span>
                                                     <span
                                                       class="euiScreenReaderOnly"
                                                     >
@@ -2964,10 +2970,11 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                                     >
                                                       GitHub flavored markdown
                                                       <span
-                                                        aria-label="External link"
                                                         class="euiLink__externalIcon"
                                                         data-euiicon-type="popout"
-                                                      />
+                                                      >
+                                                        External link
+                                                      </span>
                                                       <span
                                                         class="euiScreenReaderOnly"
                                                       >
@@ -3178,11 +3185,12 @@ exports[`EuiMarkdownEditor modal with help syntax is rendered 1`] = `
                                                         type="popout"
                                                       >
                                                         <span
-                                                          aria-label="External link"
                                                           className="euiLink__externalIcon"
                                                           data-euiicon-type="popout"
                                                           size="s"
-                                                        />
+                                                        >
+                                                          External link
+                                                        </span>
                                                       </EuiIcon>
                                                       <EuiScreenReaderOnly>
                                                         <span
diff --git a/src/components/notification/__snapshots__/notification_event.test.tsx.snap b/src/components/notification/__snapshots__/notification_event.test.tsx.snap
index ee6fe0f56a0..7b92dd9455f 100644
--- a/src/components/notification/__snapshots__/notification_event.test.tsx.snap
+++ b/src/components/notification/__snapshots__/notification_event.test.tsx.snap
@@ -262,10 +262,11 @@ exports[`EuiNotificationEvent props iconAriaLabel is rendered 1`] = `
         class="euiNotificationEventMeta__section"
       >
         <span
-          aria-label="my icon aria label"
           class="euiNotificationEventMeta__icon"
           data-euiicon-type="logoCloud"
-        />
+        >
+          my icon aria label
+        </span>
         <span
           class="euiBadge euiBadge--hollow euiBadge--iconLeft euiNotificationEventMeta__badge"
         >
diff --git a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
index 3cbfc30c111..8e2f6a3c8db 100644
--- a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
+++ b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap
@@ -248,11 +248,12 @@ exports[`EuiPageHeader props page content props are passed down is rendered 1`]
           data-test-subj="test subject string"
         >
           <span
-            aria-label="aria-label"
             class="euiPageHeaderContent__titleIcon testClass1 testClass2"
             data-euiicon-type="logoKibana"
             data-test-subj="test subject string"
-          />
+          >
+            aria-label
+          </span>
           Page title
         </h1>
         <div
diff --git a/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap b/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
index ec4f9a2f440..971999154c4 100644
--- a/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
+++ b/src/components/page/page_header/__snapshots__/page_header_content.test.tsx.snap
@@ -441,11 +441,12 @@ exports[`EuiPageHeaderContent props pageTitle is rendered with icon and iconProp
         class="euiTitle euiTitle--large"
       >
         <span
-          aria-label="aria-label"
           class="euiPageHeaderContent__titleIcon testClass1 testClass2"
           data-euiicon-type="logoKibana"
           data-test-subj="test subject string"
-        />
+        >
+          aria-label
+        </span>
         Page title
       </h1>
     </div>
diff --git a/src/components/steps/__snapshots__/step.test.tsx.snap b/src/components/steps/__snapshots__/step.test.tsx.snap
index f55b9dc327f..e90b564540f 100644
--- a/src/components/steps/__snapshots__/step.test.tsx.snap
+++ b/src/components/steps/__snapshots__/step.test.tsx.snap
@@ -89,10 +89,11 @@ exports[`EuiStep props status complete is rendered 1`] = `
       class="euiStepNumber euiStepNumber--complete euiStep__circle"
     >
       <span
-        aria-label="Step 1 is complete"
         class="euiStepNumber__icon"
         data-euiicon-type="check"
-      />
+      >
+        Step 1 is complete
+      </span>
     </span>
     <p
       class="euiTitle euiTitle--small euiStep__title"
@@ -159,10 +160,11 @@ exports[`EuiStep props status danger is rendered 1`] = `
       class="euiStepNumber euiStepNumber--danger euiStep__circle"
     >
       <span
-        aria-label="Step 1 has errors"
         class="euiStepNumber__icon"
         data-euiicon-type="cross"
-      />
+      >
+        Step 1 has errors
+      </span>
     </span>
     <p
       class="euiTitle euiTitle--small euiStep__title"
@@ -302,10 +304,11 @@ exports[`EuiStep props status warning is rendered 1`] = `
       class="euiStepNumber euiStepNumber--warning euiStep__circle"
     >
       <span
-        aria-label="Step 1 has warnings"
         class="euiStepNumber__icon"
         data-euiicon-type="alert"
-      />
+      >
+        Step 1 has warnings
+      </span>
     </span>
     <p
       class="euiTitle euiTitle--small euiStep__title"
diff --git a/src/components/steps/__snapshots__/step_horizontal.test.tsx.snap b/src/components/steps/__snapshots__/step_horizontal.test.tsx.snap
index c605aa45700..2c64561cffd 100644
--- a/src/components/steps/__snapshots__/step_horizontal.test.tsx.snap
+++ b/src/components/steps/__snapshots__/step_horizontal.test.tsx.snap
@@ -37,10 +37,11 @@ exports[`EuiStepHorizontal props isComplete 1`] = `
     class="euiStepNumber euiStepNumber--complete euiStepHorizontal__number"
   >
     <span
-      aria-label="Step 1 is complete"
       class="euiStepNumber__icon"
       data-euiicon-type="check"
-    />
+    >
+      Step 1 is complete
+    </span>
   </span>
   <span
     class="euiStepHorizontal__title"
@@ -83,10 +84,11 @@ exports[`EuiStepHorizontal props status complete is rendered 1`] = `
     class="euiStepNumber euiStepNumber--complete euiStepHorizontal__number"
   >
     <span
-      aria-label="Step 1 is complete"
       class="euiStepNumber__icon"
       data-euiicon-type="check"
-    />
+    >
+      Step 1 is complete
+    </span>
   </span>
   <span
     class="euiStepHorizontal__title"
@@ -129,10 +131,11 @@ exports[`EuiStepHorizontal props status danger is rendered 1`] = `
     class="euiStepNumber euiStepNumber--danger euiStepHorizontal__number"
   >
     <span
-      aria-label="Step 1 has errors"
       class="euiStepNumber__icon"
       data-euiicon-type="cross"
-    />
+    >
+      Step 1 has errors
+    </span>
   </span>
   <span
     class="euiStepHorizontal__title"
@@ -224,10 +227,11 @@ exports[`EuiStepHorizontal props status warning is rendered 1`] = `
     class="euiStepNumber euiStepNumber--warning euiStepHorizontal__number"
   >
     <span
-      aria-label="Step 1 has warnings"
       class="euiStepNumber__icon"
       data-euiicon-type="alert"
-    />
+    >
+      Step 1 has warnings
+    </span>
   </span>
   <span
     class="euiStepHorizontal__title"
diff --git a/src/components/steps/__snapshots__/step_number.test.tsx.snap b/src/components/steps/__snapshots__/step_number.test.tsx.snap
index fe54c13bc67..e44295c6ac4 100644
--- a/src/components/steps/__snapshots__/step_number.test.tsx.snap
+++ b/src/components/steps/__snapshots__/step_number.test.tsx.snap
@@ -59,10 +59,11 @@ exports[`EuiStepNumber props status complete is rendered 1`] = `
   class="euiStepNumber euiStepNumber--complete"
 >
   <span
-    aria-label="Step 1 is complete"
     class="euiStepNumber__icon"
     data-euiicon-type="check"
-  />
+  >
+    Step 1 is complete
+  </span>
 </span>
 `;
 
@@ -89,10 +90,11 @@ exports[`EuiStepNumber props status danger is rendered 1`] = `
   class="euiStepNumber euiStepNumber--danger"
 >
   <span
-    aria-label="Step 1 has errors"
     class="euiStepNumber__icon"
     data-euiicon-type="cross"
-  />
+  >
+    Step 1 has errors
+  </span>
 </span>
 `;
 
@@ -152,9 +154,10 @@ exports[`EuiStepNumber props status warning is rendered 1`] = `
   class="euiStepNumber euiStepNumber--warning"
 >
   <span
-    aria-label="Step 1 has warnings"
     class="euiStepNumber__icon"
     data-euiicon-type="alert"
-  />
+  >
+    Step 1 has warnings
+  </span>
 </span>
 `;
diff --git a/src/components/steps/__snapshots__/steps_horizontal.test.tsx.snap b/src/components/steps/__snapshots__/steps_horizontal.test.tsx.snap
index 6add58288d7..264367d3c86 100644
--- a/src/components/steps/__snapshots__/steps_horizontal.test.tsx.snap
+++ b/src/components/steps/__snapshots__/steps_horizontal.test.tsx.snap
@@ -17,10 +17,11 @@ exports[`EuiStepsHorizontal is rendered 1`] = `
         class="euiStepNumber euiStepNumber--complete euiStepHorizontal__number"
       >
         <span
-          aria-label="Step 1 is complete"
           class="euiStepNumber__icon"
           data-euiicon-type="check"
-        />
+        >
+          Step 1 is complete
+        </span>
       </span>
       <span
         class="euiStepHorizontal__title"
diff --git a/src/components/token/__snapshots__/token.test.tsx.snap b/src/components/token/__snapshots__/token.test.tsx.snap
index f11948fcf8c..10401e6670c 100644
--- a/src/components/token/__snapshots__/token.test.tsx.snap
+++ b/src/components/token/__snapshots__/token.test.tsx.snap
@@ -6,9 +6,10 @@ exports[`EuiToken is rendered 1`] = `
   data-test-subj="test subject string"
 >
   <span
-    aria-label="aria-label"
     data-euiicon-type="dot"
-  />
+  >
+    aria-label
+  </span>
 </span>
 `;
 
diff --git a/src/components/tool_tip/__snapshots__/icon_tip.test.tsx.snap b/src/components/tool_tip/__snapshots__/icon_tip.test.tsx.snap
index 231a953b0a5..4e5811beeef 100644
--- a/src/components/tool_tip/__snapshots__/icon_tip.test.tsx.snap
+++ b/src/components/tool_tip/__snapshots__/icon_tip.test.tsx.snap
@@ -5,10 +5,11 @@ exports[`EuiIconTip is rendered 1`] = `
   class="euiToolTipAnchor"
 >
   <span
-    aria-label="aria-label"
     data-euiicon-type="questionInCircle"
     tabindex="0"
-  />
+  >
+    aria-label
+  </span>
 </span>
 `;
 
@@ -17,11 +18,12 @@ exports[`EuiIconTip props color is rendered as the icon color 1`] = `
   class="euiToolTipAnchor"
 >
   <span
-    aria-label="Info"
     color="warning"
     data-euiicon-type="questionInCircle"
     tabindex="0"
-  />
+  >
+    Info
+  </span>
 </span>
 `;
 
@@ -30,10 +32,11 @@ exports[`EuiIconTip props size is rendered as the icon size 1`] = `
   class="euiToolTipAnchor"
 >
   <span
-    aria-label="Info"
     data-euiicon-type="questionInCircle"
     tabindex="0"
-  />
+  >
+    Info
+  </span>
 </span>
 `;
 
@@ -42,9 +45,10 @@ exports[`EuiIconTip props type is rendered as the icon 1`] = `
   class="euiToolTipAnchor"
 >
   <span
-    aria-label="Info"
     data-euiicon-type="alert"
     tabindex="0"
-  />
+  >
+    Info
+  </span>
 </span>
 `;
diff --git a/src/components/tour/__snapshots__/tour_step_indicator.test.tsx.snap b/src/components/tour/__snapshots__/tour_step_indicator.test.tsx.snap
index b3b6e78b947..9fad8630c4e 100644
--- a/src/components/tour/__snapshots__/tour_step_indicator.test.tsx.snap
+++ b/src/components/tour/__snapshots__/tour_step_indicator.test.tsx.snap
@@ -7,11 +7,12 @@ exports[`EuiTourStepIndicator can be complete 1`] = `
   data-test-subj="test subject string"
 >
   <span
-    aria-label="complete"
     class="euiStepNumber__icon"
     color="subdued"
     data-euiicon-type="dot"
-  />
+  >
+    complete
+  </span>
 </li>
 `;
 
@@ -22,11 +23,12 @@ exports[`EuiTourStepIndicator can be incomplete 1`] = `
   data-test-subj="test subject string"
 >
   <span
-    aria-label="incomplete"
     class="euiStepNumber__icon"
     color="subdued"
     data-euiicon-type="dot"
-  />
+  >
+    incomplete
+  </span>
 </li>
 `;
 
@@ -38,10 +40,11 @@ exports[`EuiTourStepIndicator is rendered 1`] = `
 >
   <span
     aria-current="step"
-    aria-label="active"
     class="euiStepNumber__icon"
     color="success"
     data-euiicon-type="dot"
-  />
+  >
+    active
+  </span>
 </li>
 `;