diff --git a/packages/react/src/AvatarStack/AvatarStack.test.tsx b/packages/react/src/AvatarStack/AvatarStack.test.tsx
index 81bc50838e6..b8c46e426e1 100644
--- a/packages/react/src/AvatarStack/AvatarStack.test.tsx
+++ b/packages/react/src/AvatarStack/AvatarStack.test.tsx
@@ -25,9 +25,24 @@ const rightAvatarComp = (
 describe('AvatarStack', () => {
   implementsClassName(AvatarStack, classes.AvatarStack)
 
+  describe('AvatarStack data-component attributes', () => {
+    it('renders AvatarStack with data-component attribute', () => {
+      const {container} = render(avatarComp)
+      const root = container.querySelector('[data-component="AvatarStack"]')
+      expect(root).toBeInTheDocument()
+    })
+
+    it('renders AvatarStack.Body with data-component attribute', () => {
+      const {container} = render(avatarComp)
+      const body = container.querySelector('[data-component="AvatarStack.Body"]')
+      expect(body).toBeInTheDocument()
+    })
+  })
+
   it('respects alignRight props', () => {
     const {container} = render(rightAvatarComp)
-    expect(container.firstChild).toMatchSnapshot()
+    const root = container.querySelector('[data-component="AvatarStack"]')
+    expect(root).toHaveAttribute('data-align-right', '')
   })
 
   it('should have a tabindex of 0 if there are no interactive children', () => {
diff --git a/packages/react/src/AvatarStack/AvatarStack.tsx b/packages/react/src/AvatarStack/AvatarStack.tsx
index ae400a90876..f7df678552a 100644
--- a/packages/react/src/AvatarStack/AvatarStack.tsx
+++ b/packages/react/src/AvatarStack/AvatarStack.tsx
@@ -42,6 +42,7 @@ const AvatarStackBody = ({
 } & React.ComponentPropsWithoutRef<'div'>) => {
   return (
     <div
+      data-component="AvatarStack.Body"
       data-disable-expand={disableExpand ? '' : undefined}
       className={clsx(
         {
@@ -158,6 +159,7 @@ const AvatarStack = ({
 
   return (
     <span
+      data-component="AvatarStack"
       data-variant={variant}
       data-shape={shape}
       data-avatar-count={count > 3 ? '3+' : count}
diff --git a/packages/react/src/AvatarStack/__snapshots__/AvatarStack.test.tsx.snap b/packages/react/src/AvatarStack/__snapshots__/AvatarStack.test.tsx.snap
deleted file mode 100644
index 04f86ce225d..00000000000
--- a/packages/react/src/AvatarStack/__snapshots__/AvatarStack.test.tsx.snap
+++ /dev/null
@@ -1,40 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`AvatarStack > respects alignRight props 1`] = `
-<span
-  class="pc-AvatarStack--variant pc-AvatarStack--shape pc-AvatarStack--three-plus pc-AvatarStack--right prc-AvatarStack-AvatarStack-LcJ4R"
-  data-align-right=""
-  data-avatar-count="3+"
-  data-responsive=""
-  data-shape="circle"
-  data-variant="cascade"
-  style="--stackSize-narrow: 20px; --stackSize-regular: 20px; --stackSize-wide: 20px;"
->
-  <div
-    class="pc-AvatarStackBody prc-AvatarStack-AvatarStackBody-LVwsN"
-    tabindex="0"
-  >
-     
-    <img
-      alt=""
-      class="pc-AvatarItem prc-AvatarStack-AvatarItem-ZlFbL"
-      src="https://avatars.githubusercontent.com/primer"
-    />
-    <img
-      alt=""
-      class="pc-AvatarItem prc-AvatarStack-AvatarItem-ZlFbL"
-      src="https://avatars.githubusercontent.com/github"
-    />
-    <img
-      alt=""
-      class="pc-AvatarItem prc-AvatarStack-AvatarItem-ZlFbL"
-      src="https://avatars.githubusercontent.com/primer"
-    />
-    <img
-      alt=""
-      class="pc-AvatarItem prc-AvatarStack-AvatarItem-ZlFbL"
-      src="https://avatars.githubusercontent.com/github"
-    />
-  </div>
-</span>
-`;