diff --git a/src/components/comment_list/__snapshots__/comment.test.tsx.snap b/src/components/comment_list/__snapshots__/comment.test.tsx.snap
index 184d25ed2e1..835f9596416 100644
--- a/src/components/comment_list/__snapshots__/comment.test.tsx.snap
+++ b/src/components/comment_list/__snapshots__/comment.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`EuiComment is rendered 1`] = `
   >
     <div
       class="euiCommentEvent emotion-euiCommentEvent-custom"
+      data-type="custom"
     />
   </div>
 </li>
@@ -63,26 +64,27 @@ exports[`EuiComment props event is rendered 1`] = `
   >
     <div
       class="euiCommentEvent emotion-euiCommentEvent-update"
+      data-type="update"
     >
       <div
-        class="emotion-euiCommentEvent__header"
+        class="euiCommentEvent__header emotion-euiCommentEvent__header"
       >
         <div
-          class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent-euiCommentEvent__headerPanel"
+          class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent"
         >
           <div
-            class="emotion-euiCommentEvent__headerMain"
+            class="euiCommentEvent__headerMain emotion-euiCommentEvent__headerMain"
           >
             <div
-              class="emotion-euiCommentEvent__headerData"
+              class="euiCommentEvent__headerData emotion-euiCommentEvent__headerData"
             >
               <div
-                class="emotion-euiCommentEvent__headerUsername"
+                class="euiCommentEvent__headerUsername emotion-euiCommentEvent__headerUsername"
               >
                 someuser
               </div>
               <div
-                class="emotion-euiCommentEvent__headerEvent"
+                class="euiCommentEvent__headerEvent emotion-euiCommentEvent__headerEvent"
               >
                 commented
               </div>
@@ -123,26 +125,27 @@ exports[`EuiComment props timestamp is rendered 1`] = `
   >
     <div
       class="euiCommentEvent emotion-euiCommentEvent-update"
+      data-type="update"
     >
       <div
-        class="emotion-euiCommentEvent__header"
+        class="euiCommentEvent__header emotion-euiCommentEvent__header"
       >
         <div
-          class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent-euiCommentEvent__headerPanel"
+          class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent"
         >
           <div
-            class="emotion-euiCommentEvent__headerMain"
+            class="euiCommentEvent__headerMain emotion-euiCommentEvent__headerMain"
           >
             <div
-              class="emotion-euiCommentEvent__headerData"
+              class="euiCommentEvent__headerData emotion-euiCommentEvent__headerData"
             >
               <div
-                class="emotion-euiCommentEvent__headerUsername"
+                class="euiCommentEvent__headerUsername emotion-euiCommentEvent__headerUsername"
               >
                 someuser
               </div>
               <div
-                class="emotion-euiCommentEvent__headerTimestamp"
+                class="euiCommentEvent__headerTimestamp"
               >
                 <time>
                   21 days ago
@@ -185,9 +188,10 @@ exports[`EuiComment renders a body 1`] = `
   >
     <div
       class="euiCommentEvent emotion-euiCommentEvent-custom"
+      data-type="custom"
     >
       <div
-        class="emotion-euiCommentEvent__body-custom"
+        class="euiCommentEvent__body emotion-euiCommentEvent__body-custom"
       >
         <p>
           This is the body.
@@ -226,9 +230,10 @@ exports[`EuiComment renders a timeline icon 1`] = `
   >
     <div
       class="euiCommentEvent emotion-euiCommentEvent-custom"
+      data-type="custom"
     >
       <div
-        class="emotion-euiCommentEvent__body-custom"
+        class="euiCommentEvent__body emotion-euiCommentEvent__body-custom"
       >
         <p>
           This is the body.
diff --git a/src/components/comment_list/__snapshots__/comment_event.test.tsx.snap b/src/components/comment_list/__snapshots__/comment_event.test.tsx.snap
index a5c577bbd9a..b8d492f9ba9 100644
--- a/src/components/comment_list/__snapshots__/comment_event.test.tsx.snap
+++ b/src/components/comment_list/__snapshots__/comment_event.test.tsx.snap
@@ -3,9 +3,10 @@
 exports[`EuiCommentEvent is rendered with custom content 1`] = `
 <div
   class="euiCommentEvent testClass1 testClass2 emotion-euiCommentEvent-custom"
+  data-type="custom"
 >
   <div
-    class="emotion-euiCommentEvent__body-custom"
+    class="euiCommentEvent__body emotion-euiCommentEvent__body-custom"
   >
     <p>
       Some custom content
@@ -17,26 +18,27 @@ exports[`EuiCommentEvent is rendered with custom content 1`] = `
 exports[`EuiCommentEvent props event is rendered 1`] = `
 <div
   class="euiCommentEvent emotion-euiCommentEvent-update"
+  data-type="update"
 >
   <div
-    class="emotion-euiCommentEvent__header"
+    class="euiCommentEvent__header emotion-euiCommentEvent__header"
   >
     <div
-      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent-euiCommentEvent__headerPanel"
+      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent"
     >
       <div
-        class="emotion-euiCommentEvent__headerMain"
+        class="euiCommentEvent__headerMain emotion-euiCommentEvent__headerMain"
       >
         <div
-          class="emotion-euiCommentEvent__headerData"
+          class="euiCommentEvent__headerData emotion-euiCommentEvent__headerData"
         >
           <div
-            class="emotion-euiCommentEvent__headerUsername"
+            class="euiCommentEvent__headerUsername emotion-euiCommentEvent__headerUsername"
           >
             someuser
           </div>
           <div
-            class="emotion-euiCommentEvent__headerEvent"
+            class="euiCommentEvent__headerEvent emotion-euiCommentEvent__headerEvent"
           >
             commented
           </div>
@@ -50,29 +52,31 @@ exports[`EuiCommentEvent props event is rendered 1`] = `
 exports[`EuiCommentEvent props eventColor is rendered 1`] = `
 <div
   class="euiCommentEvent emotion-euiCommentEvent-custom"
+  data-type="custom"
 />
 `;
 
 exports[`EuiCommentEvent props eventIcon and eventIconAriaLabel are rendered 1`] = `
 <div
   class="euiCommentEvent emotion-euiCommentEvent-update"
+  data-type="update"
 >
   <div
-    class="emotion-euiCommentEvent__header"
+    class="euiCommentEvent__header emotion-euiCommentEvent__header"
   >
     <div
-      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent-euiCommentEvent__headerPanel"
+      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent"
     >
       <div
-        class="emotion-euiCommentEvent__headerMain"
+        class="euiCommentEvent__headerMain emotion-euiCommentEvent__headerMain"
       >
         <div
-          class="emotion-euiCommentEvent__headerData"
+          class="euiCommentEvent__headerData emotion-euiCommentEvent__headerData"
         >
           <div
             aria-hidden="false"
             aria-label="edit"
-            class="euiAvatar euiAvatar--s euiAvatar--user emotion-euiAvatar-s-user-subdued-euiCommentEvent__headerEventIcon"
+            class="euiAvatar euiAvatar--s euiAvatar--user euiCommentEvent__headerEventIcon emotion-euiAvatar-s-user-subdued-euiCommentEvent__headerEventIcon"
             role="img"
             title="edit"
           >
@@ -82,7 +86,7 @@ exports[`EuiCommentEvent props eventIcon and eventIconAriaLabel are rendered 1`]
             />
           </div>
           <div
-            class="emotion-euiCommentEvent__headerUsername"
+            class="euiCommentEvent__headerUsername emotion-euiCommentEvent__headerUsername"
           >
             someuser
           </div>
@@ -96,26 +100,27 @@ exports[`EuiCommentEvent props eventIcon and eventIconAriaLabel are rendered 1`]
 exports[`EuiCommentEvent props timestamp is rendered 1`] = `
 <div
   class="euiCommentEvent emotion-euiCommentEvent-update"
+  data-type="update"
 >
   <div
-    class="emotion-euiCommentEvent__header"
+    class="euiCommentEvent__header emotion-euiCommentEvent__header"
   >
     <div
-      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent-euiCommentEvent__headerPanel"
+      class="euiPanel euiPanel--transparent emotion-euiPanel-grow-m-transparent"
     >
       <div
-        class="emotion-euiCommentEvent__headerMain"
+        class="euiCommentEvent__headerMain emotion-euiCommentEvent__headerMain"
       >
         <div
-          class="emotion-euiCommentEvent__headerData"
+          class="euiCommentEvent__headerData emotion-euiCommentEvent__headerData"
         >
           <div
-            class="emotion-euiCommentEvent__headerUsername"
+            class="euiCommentEvent__headerUsername emotion-euiCommentEvent__headerUsername"
           >
             someuser
           </div>
           <div
-            class="emotion-euiCommentEvent__headerTimestamp"
+            class="euiCommentEvent__headerTimestamp"
           >
             <time>
               21 days ago
diff --git a/src/components/comment_list/__snapshots__/comment_list.test.tsx.snap b/src/components/comment_list/__snapshots__/comment_list.test.tsx.snap
index 587114a44a2..458ac0849d4 100644
--- a/src/components/comment_list/__snapshots__/comment_list.test.tsx.snap
+++ b/src/components/comment_list/__snapshots__/comment_list.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`EuiCommentList is rendered 1`] = `
     >
       <div
         class="euiCommentEvent emotion-euiCommentEvent-custom"
+        data-type="custom"
       />
     </div>
   </li>
@@ -72,6 +73,7 @@ exports[`EuiCommentList props gutterSize l is rendered 1`] = `
     >
       <div
         class="euiCommentEvent emotion-euiCommentEvent-custom"
+        data-type="custom"
       />
     </div>
   </li>
@@ -110,6 +112,7 @@ exports[`EuiCommentList props gutterSize m is rendered 1`] = `
     >
       <div
         class="euiCommentEvent emotion-euiCommentEvent-custom"
+        data-type="custom"
       />
     </div>
   </li>
@@ -148,6 +151,7 @@ exports[`EuiCommentList props gutterSize xl is rendered 1`] = `
     >
       <div
         class="euiCommentEvent emotion-euiCommentEvent-custom"
+        data-type="custom"
       />
     </div>
   </li>
diff --git a/src/components/comment_list/comment_event.styles.ts b/src/components/comment_list/comment_event.styles.ts
index caa7c2e1f7e..a029193ffb3 100644
--- a/src/components/comment_list/comment_event.styles.ts
+++ b/src/components/comment_list/comment_event.styles.ts
@@ -25,7 +25,17 @@ export const euiCommentEventStyles = ({ euiTheme }: UseEuiTheme) => ({
 
 export const euiCommentEventHeaderStyles = ({ euiTheme }: UseEuiTheme) => ({
   euiCommentEvent__header: css``,
-  euiCommentEvent__headerPanel: css``,
+  // types
+  regular: css`
+    background: ${euiTheme.colors.lightestShade};
+    border-bottom: ${euiTheme.border.thin};
+    padding: ${euiTheme.size.s};
+  `,
+  // variants
+  hasEventColor: css`
+    padding: 0;
+  `,
+  // Children
   euiCommentEvent__headerMain: css`
     display: flex;
     flex: 1;
@@ -51,22 +61,11 @@ export const euiCommentEventHeaderStyles = ({ euiTheme }: UseEuiTheme) => ({
     white-space: pre-wrap;
     flex-wrap: wrap;
   `,
-  euiCommentEvent__headerTimestamp: css``,
   euiCommentEvent__headerActions: css`
     display: flex;
     flex-wrap: wrap;
     gap: ${euiTheme.size.xs};
   `,
-  // types
-  regular: css`
-    background: ${euiTheme.colors.lightestShade};
-    border-bottom: ${euiTheme.border.thin};
-    padding: ${euiTheme.size.s};
-  `,
-  // variants
-  hasEventColor: css`
-    padding: 0;
-  `,
 });
 
 export const euiCommentEventBodyStyles = ({ euiTheme }: UseEuiTheme) => ({
diff --git a/src/components/comment_list/comment_event.tsx b/src/components/comment_list/comment_event.tsx
index 6c7d8b496c4..177a5534c22 100644
--- a/src/components/comment_list/comment_event.tsx
+++ b/src/components/comment_list/comment_event.tsx
@@ -98,19 +98,8 @@ export const EuiCommentEvent: FunctionComponent<EuiCommentEventProps> = ({
     eventColor && headerStyles.hasEventColor,
     isTypeRegular && headerStyles.regular,
   ];
-  const cssHeaderPanelStyles = headerStyles.euiCommentEvent__headerPanel;
-  const cssHeaderEventIconStyles =
-    headerStyles.euiCommentEvent__headerEventIcon;
-  const cssHeaderUsernameStyles = headerStyles.euiCommentEvent__headerUsername;
-  const cssHeaderEventStyles = headerStyles.euiCommentEvent__headerEvent;
-  const cssHeaderTimestampStyles =
-    headerStyles.euiCommentEvent__headerTimestamp;
-  const cssHeaderMainStyles = headerStyles.euiCommentEvent__headerMain;
-  const cssHeaderDataStyles = headerStyles.euiCommentEvent__headerData;
-  const cssHeaderActionsStyles = headerStyles.euiCommentEvent__headerActions;
 
   const bodyStyles = euiCommentEventBodyStyles(euiTheme);
-
   const cssBodyStyles = [bodyStyles.euiCommentEvent__body, bodyStyles[type]];
 
   const isFigure = isTypeRegular;
@@ -126,44 +115,73 @@ export const EuiCommentEvent: FunctionComponent<EuiCommentEventProps> = ({
     ? { color: finalEventColor, paddingSize: 's' }
     : { color: 'transparent', paddingSize: 'none' };
 
-  const eventHeader = (
-    <HeaderElement css={cssHeaderStyles}>
-      <EuiPanel {...(panelProps as EuiPanelProps)} css={cssHeaderPanelStyles}>
-        <div css={cssHeaderMainStyles}>
-          <div css={cssHeaderDataStyles}>
-            {eventIcon && (
-              <EuiAvatar
-                css={cssHeaderEventIconStyles}
-                size="s"
-                iconType={eventIcon}
-                name={eventIconAriaLabel ? eventIconAriaLabel : ''}
-                color="subdued"
-                aria-hidden={!eventIconAriaLabel}
-              />
-            )}
-
-            {username && <div css={cssHeaderUsernameStyles}>{username}</div>}
-
-            {event && <div css={cssHeaderEventStyles}>{event}</div>}
-
-            {timestamp && (
-              <div css={cssHeaderTimestampStyles}>
-                <time>{timestamp}</time>
+  return (
+    <Element className={classes} css={cssStyles} data-type={type}>
+      {hasEventElements && (
+        <HeaderElement
+          className="euiCommentEvent__header"
+          css={cssHeaderStyles}
+        >
+          <EuiPanel {...(panelProps as EuiPanelProps)}>
+            <div
+              className="euiCommentEvent__headerMain"
+              css={headerStyles.euiCommentEvent__headerMain}
+            >
+              <div
+                className="euiCommentEvent__headerData"
+                css={headerStyles.euiCommentEvent__headerData}
+              >
+                {eventIcon && (
+                  <EuiAvatar
+                    className="euiCommentEvent__headerEventIcon"
+                    css={headerStyles.euiCommentEvent__headerEventIcon}
+                    size="s"
+                    iconType={eventIcon}
+                    name={eventIconAriaLabel ? eventIconAriaLabel : ''}
+                    color="subdued"
+                    aria-hidden={!eventIconAriaLabel}
+                  />
+                )}
+                {username && (
+                  <div
+                    className="euiCommentEvent__headerUsername"
+                    css={headerStyles.euiCommentEvent__headerUsername}
+                  >
+                    {username}
+                  </div>
+                )}
+                {event && (
+                  <div
+                    className="euiCommentEvent__headerEvent"
+                    css={headerStyles.euiCommentEvent__headerEvent}
+                  >
+                    {event}
+                  </div>
+                )}
+                {timestamp && (
+                  <div className="euiCommentEvent__headerTimestamp">
+                    <time>{timestamp}</time>
+                  </div>
+                )}
               </div>
-            )}
-          </div>
-
-          {actions && <div css={cssHeaderActionsStyles}>{actions}</div>}
+              {actions && (
+                <div
+                  className="euiCommentEvent__headerActions"
+                  css={headerStyles.euiCommentEvent__headerActions}
+                >
+                  {actions}
+                </div>
+              )}
+            </div>
+          </EuiPanel>
+        </HeaderElement>
+      )}
+
+      {children && (
+        <div className="euiCommentEvent__body" css={cssBodyStyles}>
+          {children}
         </div>
-      </EuiPanel>
-    </HeaderElement>
-  );
-
-  return (
-    <Element className={classes} css={cssStyles}>
-      {hasEventElements && eventHeader}
-
-      {children && <div css={cssBodyStyles}>{children}</div>}
+      )}
     </Element>
   );
 };
diff --git a/upcoming_changelogs/6089.md b/upcoming_changelogs/6089.md
new file mode 100644
index 00000000000..548d0464670
--- /dev/null
+++ b/upcoming_changelogs/6089.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Restored non-Emotion classNames to `EuiCommentEvent`'s children