diff --git a/packages/eui/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap b/packages/eui/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap
index fadf9767ebe2..0191061de8d7 100644
--- a/packages/eui/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap
+++ b/packages/eui/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`EuiDescribedFormGroup props description is not rendered when it's not p
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow"
+      class="euiFormRow emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
@@ -58,7 +58,7 @@ exports[`EuiDescribedFormGroup props fullWidth is rendered 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow euiFormRow--fullWidth"
+      class="euiFormRow emotion-euiFormRow-fullWidth"
       id="generated-id-row"
     >
       <div
@@ -98,7 +98,7 @@ exports[`EuiDescribedFormGroup props gutterSize is rendered 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow"
+      class="euiFormRow emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
@@ -138,7 +138,7 @@ exports[`EuiDescribedFormGroup props props for the flex item containers are pass
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow"
+      class="euiFormRow emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
@@ -178,7 +178,7 @@ exports[`EuiDescribedFormGroup props third is rendered 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-2-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow euiFormRow--fullWidth"
+      class="euiFormRow emotion-euiFormRow-fullWidth"
       id="generated-id-row"
     >
       <div
@@ -218,7 +218,7 @@ exports[`EuiDescribedFormGroup props titleSize is rendered 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow"
+      class="euiFormRow emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
@@ -260,7 +260,7 @@ exports[`EuiDescribedFormGroup renders 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow"
+      class="euiFormRow emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
@@ -300,7 +300,7 @@ exports[`EuiDescribedFormGroup ties together parts for accessibility 1`] = `
     class="euiFlexItem euiDescribedFormGroup__fields emotion-euiFlexItem-grow-1-euiDescribedFormGroup__fields"
   >
     <div
-      class="euiFormRow euiFormRow--hasLabel"
+      class="euiFormRow euiFormRow--hasLabel emotion-euiFormRow"
       id="generated-id-row"
     >
       <div
diff --git a/packages/eui/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap b/packages/eui/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
index 2a4b4f41a1c1..46db6fd72d03 100644
--- a/packages/eui/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
+++ b/packages/eui/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`EuiInlineEditForm edit mode editModeProps.cancelButtonProps 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -26,7 +26,6 @@ exports[`EuiInlineEditForm edit mode editModeProps.cancelButtonProps 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"
@@ -102,7 +101,7 @@ exports[`EuiInlineEditForm edit mode editModeProps.formRowProps 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         data-test-subj="customErrorText"
         id="generated-id-row"
       >
@@ -116,7 +115,6 @@ exports[`EuiInlineEditForm edit mode editModeProps.formRowProps 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"
@@ -191,7 +189,7 @@ exports[`EuiInlineEditForm edit mode editModeProps.inputProps 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -214,7 +212,6 @@ exports[`EuiInlineEditForm edit mode editModeProps.inputProps 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper-inGroup-prependOnly"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth-inGroup"
                 data-test-subj="customInput"
@@ -289,7 +286,7 @@ exports[`EuiInlineEditForm edit mode editModeProps.saveButtonProps 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -302,7 +299,6 @@ exports[`EuiInlineEditForm edit mode editModeProps.saveButtonProps 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"
@@ -377,7 +373,7 @@ exports[`EuiInlineEditForm edit mode isInvalid 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -391,7 +387,6 @@ exports[`EuiInlineEditForm edit mode isInvalid 1`] = `
               style="--euiFormControlRightIconsCount: 1;"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-invalid="true"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
@@ -475,7 +470,7 @@ exports[`EuiInlineEditForm edit mode isLoading 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -489,7 +484,6 @@ exports[`EuiInlineEditForm edit mode isLoading 1`] = `
               style="--euiFormControlRightIconsCount: 1;"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText euiFieldText-isLoading emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"
@@ -588,7 +582,7 @@ exports[`EuiInlineEditForm edit mode placeholder 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -601,7 +595,6 @@ exports[`EuiInlineEditForm edit mode placeholder 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"
@@ -677,7 +670,7 @@ exports[`EuiInlineEditForm edit mode renders 1`] = `
       class="euiFlexItem emotion-euiFlexItem-grow-1"
     >
       <div
-        class="euiFormRow euiFormRow--fullWidth"
+        class="euiFormRow emotion-euiFormRow-fullWidth"
         id="generated-id-row"
       >
         <div
@@ -690,7 +683,6 @@ exports[`EuiInlineEditForm edit mode renders 1`] = `
               class="euiFormControlLayout__childrenWrapper emotion-euiFormControlLayout__childrenWrapper"
             >
               <input
-                aria-describedby="inlineEdit_generated-id"
                 aria-label="Edit inline"
                 class="euiFieldText emotion-euiFieldText-fullWidth"
                 data-test-subj="euiInlineEditModeInput"