diff --git a/src/core/client/ui/components/Tabs/__snapshots__/Tab.spec.tsx.snap b/src/core/client/ui/components/Tabs/__snapshots__/Tab.spec.tsx.snap
index 8754dd612..a30d114a8 100644
--- a/src/core/client/ui/components/Tabs/__snapshots__/Tab.spec.tsx.snap
+++ b/src/core/client/ui/components/Tabs/__snapshots__/Tab.spec.tsx.snap
@@ -3,13 +3,12 @@
 exports[`renders correctly 1`] = `
 <li
   className="Tab-root"
-  id="three-tab"
-  onClick={[Function]}
+  id="tab-three"
   role="presentation"
 >
   <button
-    aria-controls="three"
-    className="BaseButton-root"
+    aria-controls="tabPane-three"
+    className="BaseButton-root Tab-button"
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
diff --git a/src/core/client/ui/components/Tabs/__snapshots__/TabBar.spec.tsx.snap b/src/core/client/ui/components/Tabs/__snapshots__/TabBar.spec.tsx.snap
index 0f588bd1d..fd9f2ae4a 100644
--- a/src/core/client/ui/components/Tabs/__snapshots__/TabBar.spec.tsx.snap
+++ b/src/core/client/ui/components/Tabs/__snapshots__/TabBar.spec.tsx.snap
@@ -6,15 +6,14 @@ exports[`renders correctly 1`] = `
   role="tablist"
 >
   <li
-    className="Tab-root Tab-primary Tab-active"
-    id="one-tab"
-    onClick={[Function]}
+    className="Tab-root"
+    id="tab-one"
     role="presentation"
   >
     <button
-      aria-controls="one"
+      aria-controls="tabPane-one"
       aria-selected={true}
-      className="BaseButton-root"
+      className="BaseButton-root Tab-button Tab-primary Tab-active"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
@@ -29,15 +28,14 @@ exports[`renders correctly 1`] = `
     </button>
   </li>
   <li
-    className="Tab-root Tab-primary"
-    id="two-tab"
-    onClick={[Function]}
+    className="Tab-root"
+    id="tab-two"
     role="presentation"
   >
     <button
-      aria-controls="two"
+      aria-controls="tabPane-two"
       aria-selected={false}
-      className="BaseButton-root"
+      className="BaseButton-root Tab-button Tab-primary"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
@@ -52,15 +50,14 @@ exports[`renders correctly 1`] = `
     </button>
   </li>
   <li
-    className="Tab-root Tab-primary"
-    id="three-tab"
-    onClick={[Function]}
+    className="Tab-root"
+    id="tab-three"
     role="presentation"
   >
     <button
-      aria-controls="three"
+      aria-controls="tabPane-three"
       aria-selected={false}
-      className="BaseButton-root"
+      className="BaseButton-root Tab-button Tab-primary"
       onBlur={[Function]}
       onClick={[Function]}
       onFocus={[Function]}
diff --git a/src/core/client/ui/components/Tabs/__snapshots__/TabContent.spec.tsx.snap b/src/core/client/ui/components/Tabs/__snapshots__/TabContent.spec.tsx.snap
index 0fb2810e0..cdaf48d7d 100644
--- a/src/core/client/ui/components/Tabs/__snapshots__/TabContent.spec.tsx.snap
+++ b/src/core/client/ui/components/Tabs/__snapshots__/TabContent.spec.tsx.snap
@@ -2,8 +2,8 @@
 
 exports[`renders correctly 1`] = `
 <section
-  aria-labelledby="one-tab"
-  id="one"
+  aria-labelledby="tab-one"
+  id="tabPane-one"
   role="tabpanel"
 >
   Hola One
diff --git a/src/core/client/ui/components/Tabs/__snapshots__/TabPane.spec.tsx.snap b/src/core/client/ui/components/Tabs/__snapshots__/TabPane.spec.tsx.snap
index 97032314c..ad884add2 100644
--- a/src/core/client/ui/components/Tabs/__snapshots__/TabPane.spec.tsx.snap
+++ b/src/core/client/ui/components/Tabs/__snapshots__/TabPane.spec.tsx.snap
@@ -2,8 +2,8 @@
 
 exports[`renders correctly 1`] = `
 <section
-  aria-labelledby="three-tab"
-  id="three"
+  aria-labelledby="tab-three"
+  id="tabPane-three"
   role="tabpanel"
 >
   Three