diff --git a/packages/components/accordion/src/accordion.ts b/packages/components/accordion/src/accordion.ts
index 7ef6ac2f..bf71a2b1 100644
--- a/packages/components/accordion/src/accordion.ts
+++ b/packages/components/accordion/src/accordion.ts
@@ -7,46 +7,31 @@ export const accordionProps = buildProps({
     type: String,
     required: true,
   },
-  buttonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   title: {
     type: String,
     required: false,
     default: undefined,
   },
-  titleDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   subTitle: {
     type: String,
     required: false,
     default: undefined,
   },
-  subTitleDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   icon: {
     type: String,
     required: false,
     default: undefined,
   },
-  iconDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   disabled: {
     type: Boolean,
     required: false,
     default: false,
   },
+  dataTest: {
+    type: String,
+    required: false,
+    default: undefined,
+  },
 } as const)
 
 export const accordionEmits = ['click']
diff --git a/packages/components/accordion/src/accordion.vue b/packages/components/accordion/src/accordion.vue
index 6657a4ad..e3d1bdf4 100644
--- a/packages/components/accordion/src/accordion.vue
+++ b/packages/components/accordion/src/accordion.vue
@@ -11,7 +11,7 @@
       :aria-controls="id"
       class="puik-accordion__header"
       :disabled="disabled"
-      :data-test="buttonDataTest"
+      :data-test="`button-${dataTest}`"
       @click="onClick"
     >
       <puik-icon
@@ -19,19 +19,19 @@
         class="puik-accordion__header__icon"
         :icon="icon"
         :font-size="24"
-        :data-test="iconDataTest"
+        :data-test="`icon-${dataTest}`"
       ></puik-icon>
       <div class="puik-accordion__header__content">
         <div
           class="puik-accordion__header__content__title"
-          :data-test="titleDataTest"
+          :data-test="`title-${dataTest}`"
         >
           {{ title }}
         </div>
         <div
           v-if="subTitle"
           class="puik-accordion__header__content__sub-title"
-          :data-test="subTitleDataTest"
+          :data-test="`subTitle-${dataTest}`"
         >
           {{ subTitle }}
         </div>
diff --git a/packages/components/accordion/stories/accordion.stories.ts b/packages/components/accordion/stories/accordion.stories.ts
index 8d2a0d96..d9160e08 100644
--- a/packages/components/accordion/stories/accordion.stories.ts
+++ b/packages/components/accordion/stories/accordion.stories.ts
@@ -15,26 +15,14 @@ export default {
       control: 'text',
       description: 'Title displayed in the header',
     },
-    titleDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute for the title',
-    },
     subTitle: {
       control: 'text',
       description: 'Sub title displayed in the header',
     },
-    subTitleDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute for the sub title',
-    },
     icon: {
       control: 'text',
       description: 'Icon used in the header',
     },
-    iconDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute for the icon',
-    },
     disabled: {
       control: 'boolean',
       description: 'Set accordion disabled',
@@ -48,6 +36,11 @@ export default {
       control: 'none',
       description: 'Accordion content',
     },
+    dataTest: {
+      control: 'text',
+      description:
+        'Set the data-test attribute for the accordion `button-${dataTest}` `title-${dataTest}` `icon-${dataTest}` `subTitle-${dataTest}`',
+    },
   },
 } as Meta
 
@@ -78,9 +71,6 @@ export const Default = {
     subTitle: 'Accordion subtitle',
     icon: 'home',
     disabled: false,
-    titleDataTest: '',
-    subTitleDataTest: '',
-    iconDataTest: '',
   },
 
   parameters: {
diff --git a/packages/components/alert/src/alert.ts b/packages/components/alert/src/alert.ts
index d81c172e..2ebcab79 100644
--- a/packages/components/alert/src/alert.ts
+++ b/packages/components/alert/src/alert.ts
@@ -19,21 +19,11 @@ export const alertProps = buildProps({
     required: false,
     default: undefined,
   },
-  titleDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   description: {
     type: String,
     required: false,
     default: undefined,
   },
-  descriptionDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   variant: {
     type: String as PropType<PuikAlertVariant>,
     default: 'success',
@@ -47,16 +37,16 @@ export const alertProps = buildProps({
     required: false,
     default: undefined,
   },
-  buttonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   ariaLive: {
     type: String as PropType<'polite' | 'assertive'>,
     required: false,
     default: 'polite',
   },
+  alertDataTest: {
+    type: String,
+    required: false,
+    default: undefined,
+  },
 } as const)
 
 export type AlertProps = ExtractPropTypes<typeof alertProps>
diff --git a/packages/components/alert/src/alert.vue b/packages/components/alert/src/alert.vue
index 5e842072..bd9bb409 100644
--- a/packages/components/alert/src/alert.vue
+++ b/packages/components/alert/src/alert.vue
@@ -10,13 +10,17 @@
     <div class="puik-alert__content">
       <puik-icon :icon="icon" font-size="1.25rem" class="puik-alert__icon" />
       <div class="puik-alert__text">
-        <p v-if="title" class="puik-alert__title" :data-test="titleDataTest">
+        <p
+          v-if="title"
+          class="puik-alert__title"
+          :data-test="`title-${alertDataTest}`"
+        >
           {{ title }}
         </p>
         <span
           v-if="$slots.default || description"
           class="puik-alert__description"
-          :data-test="descriptionDataTest"
+          :data-test="`description-${alertDataTest}`"
           ><slot>{{ description }}</slot></span
         >
       </div>
@@ -25,7 +29,7 @@
       v-if="buttonLabel"
       :variant="variant"
       class="puik-alert__button"
-      :button-data-test="buttonDataTest"
+      :button-data-test="`button-${alertDataTest}`"
       @click="click"
     >
       {{ buttonLabel }}
diff --git a/packages/components/alert/stories/alert.stories.ts b/packages/components/alert/stories/alert.stories.ts
index d0e349e7..a8be4a9e 100644
--- a/packages/components/alert/stories/alert.stories.ts
+++ b/packages/components/alert/stories/alert.stories.ts
@@ -44,14 +44,10 @@ export default {
       control: 'none',
       description: 'Set the alert description',
     },
-    titleDataTest: {
-      description: 'Set the data-test attribute for the title',
-    },
-    descriptionDataTest: {
-      description: 'Set the data-test attribute for the description',
-    },
-    buttonDataTest: {
-      description: 'Set the data-test attribute for the button',
+    alertDataTest: {
+      control: 'text',
+      description:
+        'Set the data-test attribute for the alert components `title-${alertDataTest}` `description-${alertDataTest}` `button-${alertDataTest}`',
     },
   },
   args: {
@@ -60,9 +56,6 @@ export default {
     variant: 'success',
     disableBorders: false,
     buttonLabel: 'Button',
-    titleDataTest: '',
-    descriptionDataTest: '',
-    buttonDataTest: '',
   },
 } as Meta
 
diff --git a/packages/components/badge/src/badge.ts b/packages/components/badge/src/badge.ts
index 26d6e333..bc2790e2 100644
--- a/packages/components/badge/src/badge.ts
+++ b/packages/components/badge/src/badge.ts
@@ -17,7 +17,7 @@ export const badgeProps = buildProps({
     type: String as PropType<PuikBadgeVariant>,
     default: 'neutral',
   },
-  badgeDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/badge/src/badge.vue b/packages/components/badge/src/badge.vue
index 888fde3f..692c7269 100644
--- a/packages/components/badge/src/badge.vue
+++ b/packages/components/badge/src/badge.vue
@@ -2,7 +2,7 @@
   <div
     class="puik-badge"
     :class="[`puik-badge--${variant}`]"
-    :data-test="badgeDataTest"
+    :data-test="dataTest"
   >
     <slot></slot>
   </div>
diff --git a/packages/components/badge/stories/badge.stories.ts b/packages/components/badge/stories/badge.stories.ts
index b9c06ad5..e77a28e4 100644
--- a/packages/components/badge/stories/badge.stories.ts
+++ b/packages/components/badge/stories/badge.stories.ts
@@ -25,7 +25,7 @@ export default {
         },
       },
     },
-    badgeDataTest: {
+    dataTest: {
       control: 'text',
       description: 'Set the data-test attribute on the badge',
     },
@@ -33,7 +33,6 @@ export default {
   args: {
     default: 'Status',
     variant: 'neutral',
-    badgeDataTest: '',
   },
 } as Meta
 
diff --git a/packages/components/button/src/button.ts b/packages/components/button/src/button.ts
index 9c8a2fdf..a6885676 100644
--- a/packages/components/button/src/button.ts
+++ b/packages/components/button/src/button.ts
@@ -48,21 +48,11 @@ export const buttonProps = buildProps({
     required: false,
     default: '',
   },
-  leftIconDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   rightIcon: {
     type: String,
     required: false,
     default: '',
   },
-  rightIconDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   to: {
     type: [Object, String] as PropType<RouteLocationRaw>,
     required: false,
@@ -78,7 +68,7 @@ export const buttonProps = buildProps({
     required: false,
     default: undefined,
   },
-  buttonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/button/src/button.vue b/packages/components/button/src/button.vue
index 828b9afc..745abac1 100644
--- a/packages/components/button/src/button.vue
+++ b/packages/components/button/src/button.vue
@@ -10,7 +10,7 @@
       { 'puik-button--fluid': fluid },
     ]"
     :disabled="disabled"
-    :data-test="buttonDataTest"
+    :data-test="`button-${dataTest}`"
     @click="setSelected"
   >
     <puik-icon
@@ -18,7 +18,7 @@
       :icon="leftIcon"
       :font-size="size !== 'sm' ? '1.25rem' : '1rem'"
       class="puik-button__left-icon"
-      :data-test="leftIconDataTest"
+      :data-test="`leftIcon-${dataTest}`"
     />
     <slot></slot>
     <puik-icon
@@ -26,7 +26,7 @@
       :icon="rightIcon"
       :font-size="size !== 'sm' ? '1.25rem' : '1rem'"
       class="puik-button__right-icon"
-      :data-test="rightIconDataTest"
+      :data-test="`rightIcon-${dataTest}`"
     />
   </component>
 </template>
diff --git a/packages/components/button/stories/button.stories.ts b/packages/components/button/stories/button.stories.ts
index 401d5efe..33217b57 100644
--- a/packages/components/button/stories/button.stories.ts
+++ b/packages/components/button/stories/button.stories.ts
@@ -71,17 +71,10 @@ export default {
       control: 'text',
       description: 'Set a link for the button (changes button to "a" html tag)',
     },
-    buttonDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set a data-test attribute to the button',
-    },
-    leftIconDataTest: {
-      control: 'text',
-      description: 'Set a data-test attribute to the left icon',
-    },
-    rightIconDataTest: {
-      control: 'text',
-      description: 'Set a data-test attribute to the right icon',
+      description:
+        'Set a data-test attribute to the button `button-${dataTest}` `left-icon-${dataTest}` `right-icon-${dataTest}`',
     },
   },
   args: {
@@ -94,9 +87,6 @@ export default {
     to: undefined,
     href: undefined,
     default: 'Add to cart',
-    buttonDataTest: '',
-    leftIconDataTest: '',
-    rightIconDataTest: '',
   },
 } as Meta
 
diff --git a/packages/components/checkbox/src/checkbox.ts b/packages/components/checkbox/src/checkbox.ts
index e63526ca..b47f0491 100644
--- a/packages/components/checkbox/src/checkbox.ts
+++ b/packages/components/checkbox/src/checkbox.ts
@@ -12,11 +12,6 @@ export const checkboxProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   disabled: {
     type: Boolean,
     required: false,
@@ -27,7 +22,7 @@ export const checkboxProps = buildProps({
     required: false,
     default: false,
   },
-  inputDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/checkbox/src/checkbox.vue b/packages/components/checkbox/src/checkbox.vue
index e91fd61a..e641dd6c 100644
--- a/packages/components/checkbox/src/checkbox.vue
+++ b/packages/components/checkbox/src/checkbox.vue
@@ -8,13 +8,13 @@
       type="checkbox"
       :indeterminate="indeterminate"
       :disabled="disabled"
-      :data-test="inputDataTest"
+      :data-test="`input-${dataTest}`"
     />
     <label
       v-if="$slots.default || label"
       :for="id"
       class="puik-checkbox__label"
-      :data-test="labelDataTest"
+      :data-test="`label-${dataTest}`"
     >
       <slot>{{ label }}</slot>
     </label>
diff --git a/packages/components/checkbox/stories/checkbox.stories.ts b/packages/components/checkbox/stories/checkbox.stories.ts
index 636a2f7d..877b20ee 100644
--- a/packages/components/checkbox/stories/checkbox.stories.ts
+++ b/packages/components/checkbox/stories/checkbox.stories.ts
@@ -33,11 +33,9 @@ export default {
         },
       },
     },
-    inputDataTest: {
-      description: 'Set the input data-test attribute',
-    },
-    labelDataTest: {
-      description: 'Set the label data-test attribute',
+    dataTest: {
+      description:
+        'Set the data-test attribute for the label and the input `label-${dataTest}` `input-${dataTest}`}`',
     },
   },
   args: {
@@ -46,8 +44,6 @@ export default {
     indeterminate: false,
     disabled: false,
     modelValue: false,
-    inputDataTest: '',
-    labelDataTest: '',
   },
 } as Meta
 
diff --git a/packages/components/input/src/input.ts b/packages/components/input/src/input.ts
index 812a81b7..a921ae82 100644
--- a/packages/components/input/src/input.ts
+++ b/packages/components/input/src/input.ts
@@ -90,12 +90,7 @@ export const inputProps = buildProps({
     required: false,
     default: false,
   },
-  inputDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  errorTextDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/input/src/input.vue b/packages/components/input/src/input.vue
index bbb031ce..d5b709e0 100644
--- a/packages/components/input/src/input.vue
+++ b/packages/components/input/src/input.vue
@@ -17,7 +17,7 @@
         :min="type === 'number' ? min : undefined"
         :max="type === 'number' ? max : undefined"
         :step="type === 'number' ? step : undefined"
-        :data-test="inputDataTest"
+        :data-test="`input-${dataTest}`"
         @focus="handleFocus"
         @blur="handleBlur"
       />
@@ -52,7 +52,7 @@
         ></puik-icon>
         <span
           class="puik-input__hint__error__text"
-          :data-test="errorTextDataTest"
+          :data-test="`error-${dataTest}`"
         >
           <slot name="error">{{ error }}</slot>
         </span>
diff --git a/packages/components/input/stories/input.stories.ts b/packages/components/input/stories/input.stories.ts
index 6e7bad25..95ee4e43 100644
--- a/packages/components/input/stories/input.stories.ts
+++ b/packages/components/input/stories/input.stories.ts
@@ -93,11 +93,9 @@ export default {
       control: 'none',
       description: 'Append an icon or text to the input',
     },
-    inputDataTest: {
-      description: 'Set the data-test attribute on the input element',
-    },
-    errorTextDataTest: {
-      description: 'Set the data-test attribute on the error slot',
+    dataTest: {
+      description:
+        'Set the data-test attribute on the input and error text elements `input-${inputDataTest}` `error-${inputDataTest}`',
     },
   },
 } as Meta
@@ -130,8 +128,6 @@ export const Default = {
     min: undefined,
     max: undefined,
     disabled: false,
-    inputDataTest: '',
-    errorTextDataTest: '',
   },
 
   parameters: {
diff --git a/packages/components/menu/src/menu-item-title.ts b/packages/components/menu/src/menu-item-title.ts
index e64742ce..139d95d4 100644
--- a/packages/components/menu/src/menu-item-title.ts
+++ b/packages/components/menu/src/menu-item-title.ts
@@ -3,7 +3,7 @@ import type { ExtractPropTypes } from 'vue'
 import type MenuItemTitle from './menu-item-title.vue'
 
 export const menuItemTitleProps = buildProps({
-  titleDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/menu/src/menu-item-title.vue b/packages/components/menu/src/menu-item-title.vue
index dcd7a9f4..695ac726 100644
--- a/packages/components/menu/src/menu-item-title.vue
+++ b/packages/components/menu/src/menu-item-title.vue
@@ -1,5 +1,5 @@
 <template>
-  <h4 class="puik-menu-item-title" :data-test="titleDataTest">
+  <h4 class="puik-menu-item-title" :data-test="`title-${dataTest}`">
     <slot></slot>
   </h4>
 </template>
diff --git a/packages/components/menu/stories/menu-item-title.stories.ts b/packages/components/menu/stories/menu-item-title.stories.ts
index de39c6f8..c519c2f6 100644
--- a/packages/components/menu/stories/menu-item-title.stories.ts
+++ b/packages/components/menu/stories/menu-item-title.stories.ts
@@ -9,8 +9,8 @@ export default {
       control: 'text',
       description: 'Default slot to set title text',
     },
-    titleDataTest: {
-      description: 'Set the data-test attribute for title',
+    dataTest: {
+      description: 'Set the data-test attribute for title `title-${dataTest}`',
       control: 'text',
     },
   },
diff --git a/packages/components/modal/src/modal.ts b/packages/components/modal/src/modal.ts
index b81a1689..d17b5a0c 100644
--- a/packages/components/modal/src/modal.ts
+++ b/packages/components/modal/src/modal.ts
@@ -30,21 +30,11 @@ export const modalProps = buildProps({
     required: false,
     default: undefined,
   },
-  titleDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   mainButtonText: {
     type: String,
     required: false,
     default: undefined,
   },
-  mainButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   isMainButtonDisabled: {
     type: Boolean,
     required: false,
@@ -55,21 +45,11 @@ export const modalProps = buildProps({
     required: false,
     default: undefined,
   },
-  secondButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   sideButtonText: {
     type: String,
     required: false,
     default: undefined,
   },
-  sideButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   variant: {
     type: String as PropType<ModalVariantType>,
     required: false,
@@ -90,7 +70,7 @@ export const modalProps = buildProps({
     required: false,
     default: undefined,
   },
-  closeButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/modal/src/modal.vue b/packages/components/modal/src/modal.vue
index dac3363e..e18f0860 100644
--- a/packages/components/modal/src/modal.vue
+++ b/packages/components/modal/src/modal.vue
@@ -22,7 +22,11 @@
             :is-disabled="!showTitleTooltip"
             class="puik-modal__dialogPanelContainer__dialogPanel__header__title"
           >
-            <h2 ref="modalTitleElem" class="title" :data-test="titleDataTest">
+            <h2
+              ref="modalTitleElem"
+              class="title"
+              :data-test="`title-${dataTest}`"
+            >
               {{ title }}
             </h2>
             <template #description>{{ title }}</template>
@@ -33,7 +37,7 @@
             :aria-label="t('puik.modal.closeButtonLabel')"
             class="puik-modal__dialogPanelContainer__dialogPanel__header__close-button"
             variant="text"
-            :data-test="closeButtonDataTest"
+            :data-test="`closeButton-${dataTest}`"
             @click="sendCloseModalEvent()"
           >
             <puik-icon icon="close" :font-size="CLOSE_ICON_SIZE" />
@@ -50,7 +54,7 @@
             v-if="secondButtonText"
             class="puik-modal__dialogPanelContainer__dialogPanel__footer__button--second"
             :variant="secondButtonVariant"
-            :data-test="secondButtonDataTest"
+            :data-test="`secondButton-${dataTest}`"
             @click="$emit('button-second')"
           >
             {{ secondButtonText }}
@@ -60,7 +64,7 @@
             class="puik-modal__dialogPanelContainer__dialogPanel__footer__button--main"
             :variant="mainButtonVariant"
             :disabled="isMainButtonDisabled"
-            :data-test="mainButtonDataTest"
+            :data-test="`mainButton-${dataTest}`"
             @click="$emit('button-main')"
           >
             {{ mainButtonText }}
@@ -72,7 +76,7 @@
             v-if="PuikModalVariant.DIALOG === variant && sideButtonText"
             class="puik-modal__dialogPanelContainer__dialogPanel__footer__button--side"
             variant="text"
-            :data-test="sideButtonDataTest"
+            :data-test="`sideButton-${dataTest}`"
             @click="$emit('button-side')"
           >
             {{ sideButtonText }}
diff --git a/packages/components/modal/stories/modal.stories.ts b/packages/components/modal/stories/modal.stories.ts
index 2644ff49..93912477 100644
--- a/packages/components/modal/stories/modal.stories.ts
+++ b/packages/components/modal/stories/modal.stories.ts
@@ -67,10 +67,6 @@ export default {
         },
       },
     },
-    titleDataTest: {
-      description: 'Set the data-test attribute of the title',
-      control: 'text',
-    },
     mainButtonText: {
       description: 'Set the text of the main button',
       control: 'text',
@@ -83,10 +79,6 @@ export default {
         },
       },
     },
-    mainButtonDataTest: {
-      description: 'Set the data-test attribute of the main button',
-      control: 'text',
-    },
     secondButtonText: {
       description: 'Set the text of the secondary button',
       control: 'text',
@@ -99,10 +91,6 @@ export default {
         },
       },
     },
-    secondButtonDataTest: {
-      description: 'Set the data-test attribute of the secondary button',
-      control: 'text',
-    },
     sideButtonText: {
       description: 'Set the text of the side button',
       control: 'text',
@@ -115,10 +103,6 @@ export default {
         },
       },
     },
-    sideButtonDataTest: {
-      description: 'Set the data-test attribute of the side button',
-      control: 'text',
-    },
     variant: {
       description: 'Set the style of the modal (use the PuikModalVariant enum)',
       control: 'select',
@@ -191,14 +175,15 @@ export enum PuikModalSize {
         },
       },
     },
+    dataTest: {
+      description:
+        'Set the data-test attribute for modal `title-${dataTest}` `mainButton-${dataTest}` `secondButton-${dataTest}` `sideButton-${dataTest}` `closeButton-${dataTest}`',
+      control: 'text',
+    },
     default: {
       description: 'Modal content',
       control: 'none',
     },
-    closeButtonDataTest: {
-      description: 'Set the data-test attribute of the close button',
-      control: 'text',
-    },
     'button-main': {
       control: 'none',
       description: 'Event emitted on main button click',
@@ -220,11 +205,6 @@ export enum PuikModalSize {
     titleIcon: 'home',
     variant: PuikModalVariant.DIALOG,
     size: PuikModalSize.SMALL,
-    titleDataTest: '',
-    mainButtonDataTest: '',
-    secondButtonDataTest: '',
-    sideButtonDataTest: '',
-    closeButtonDataTest: '',
   },
   parameters: {
     chromatic: { delay: 3000 },
diff --git a/packages/components/pagination/src/pagination-large.ts b/packages/components/pagination/src/pagination-large.ts
index 08316006..aa3e87f4 100644
--- a/packages/components/pagination/src/pagination-large.ts
+++ b/packages/components/pagination/src/pagination-large.ts
@@ -37,17 +37,7 @@ export const paginationLargeProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  previousButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination-large.vue b/packages/components/pagination/src/pagination-large.vue
index f325e05e..9ca1dfcd 100644
--- a/packages/components/pagination/src/pagination-large.vue
+++ b/packages/components/pagination/src/pagination-large.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="puik-pagination__label" :data-test="labelDataTest">
+  <span class="puik-pagination__label" :data-test="`label-${dataTest}`">
     {{ label }}
   </span>
 
@@ -10,7 +10,7 @@
       class="puik-pagination__previous-button puik-pagination__button"
       left-icon="keyboard_arrow_left"
       variant="tertiary"
-      :button-data-test="previousButtonDataTest"
+      :data-test="`previousButton-${dataTest}`"
       @click="emit('update:page', page - 1)"
     >
       <span class="puik-pagination__previous-button-text">
@@ -46,7 +46,7 @@
       class="puik-pagination__button puik-pagination__next-button"
       right-icon="keyboard_arrow_right"
       variant="tertiary"
-      :button-data-test="nextButtonDataTest"
+      :data-test="`nextButton-${dataTest}`"
       @click="emit('update:page', page + 1)"
     >
       <span class="puik-pagination__next-button-text">
diff --git a/packages/components/pagination/src/pagination-loader.ts b/packages/components/pagination/src/pagination-loader.ts
index c57f269c..b5f621a7 100644
--- a/packages/components/pagination/src/pagination-loader.ts
+++ b/packages/components/pagination/src/pagination-loader.ts
@@ -22,7 +22,7 @@ export const paginationLoaderProps = buildProps({
     required: false,
     default: undefined,
   },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination-loader.vue b/packages/components/pagination/src/pagination-loader.vue
index 88da8582..e7f83294 100644
--- a/packages/components/pagination/src/pagination-loader.vue
+++ b/packages/components/pagination/src/pagination-loader.vue
@@ -8,7 +8,7 @@
     variant="tertiary"
     class="puik-pagination__button puik-pagination__load-more-button"
     fluid
-    :button-data-test="nextButtonDataTest"
+    :data-test="`loadMoreButton-${dataTest}`"
     @click="$emit('update:modelValue', modelValue + 1)"
   >
     {{ currentButtonLabel }}
diff --git a/packages/components/pagination/src/pagination-medium.ts b/packages/components/pagination/src/pagination-medium.ts
index 577efeae..e711f31b 100644
--- a/packages/components/pagination/src/pagination-medium.ts
+++ b/packages/components/pagination/src/pagination-medium.ts
@@ -31,17 +31,7 @@ export const paginationMediumProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  previousButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination-medium.vue b/packages/components/pagination/src/pagination-medium.vue
index aecf6d34..58067a8e 100644
--- a/packages/components/pagination/src/pagination-medium.vue
+++ b/packages/components/pagination/src/pagination-medium.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="puik-pagination__label" :data-test="labelDataTest">
+  <span class="puik-pagination__label" :data-test="`label-${dataTest}`">
     {{ label }}
   </span>
 
@@ -10,7 +10,7 @@
       class="puik-pagination__previous-button puik-pagination__button"
       left-icon="keyboard_arrow_left"
       variant="secondary"
-      :button-data-test="previousButtonDataTest"
+      :data-test="`previousButton-${dataTest}`"
       @click="page -= 1"
     ></puik-button>
 
@@ -78,7 +78,7 @@
       class="puik-pagination__button puik-pagination__next-button"
       right-icon="keyboard_arrow_right"
       variant="secondary"
-      :button-data-test="nextButtonDataTest"
+      :data-test="`nextButton-${dataTest}`"
       @click="page += 1"
     ></puik-button>
   </div>
diff --git a/packages/components/pagination/src/pagination-mobile.ts b/packages/components/pagination/src/pagination-mobile.ts
index 9d1ced5a..09041a14 100644
--- a/packages/components/pagination/src/pagination-mobile.ts
+++ b/packages/components/pagination/src/pagination-mobile.ts
@@ -22,17 +22,7 @@ export const paginationMobileProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  previousButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination-mobile.vue b/packages/components/pagination/src/pagination-mobile.vue
index 06cf0447..5479c173 100644
--- a/packages/components/pagination/src/pagination-mobile.vue
+++ b/packages/components/pagination/src/pagination-mobile.vue
@@ -5,11 +5,11 @@
     class="puik-pagination__previous-button puik-pagination__button"
     left-icon="keyboard_arrow_left"
     variant="secondary"
-    :button-data-test="previousButtonDataTest"
+    :data-test="`previousButton-${dataTest}`"
     @click="emit('update:modelValue', modelValue - 1)"
   ></puik-button>
 
-  <span class="puik-pagination__label" :data-test="labelDataTest">
+  <span class="puik-pagination__label" :data-test="`label-${dataTest}`">
     {{ label }}
   </span>
 
@@ -19,7 +19,7 @@
     class="puik-pagination__button puik-pagination__next-button"
     right-icon="keyboard_arrow_right"
     variant="secondary"
-    :button-data-test="nextButtonDataTest"
+    :data-test="`nextButton-${dataTest}`"
     @click="emit('update:modelValue', modelValue + 1)"
   ></puik-button>
 </template>
diff --git a/packages/components/pagination/src/pagination-small.ts b/packages/components/pagination/src/pagination-small.ts
index 5cc1e166..7deaf8a8 100644
--- a/packages/components/pagination/src/pagination-small.ts
+++ b/packages/components/pagination/src/pagination-small.ts
@@ -22,17 +22,7 @@ export const paginationSmallProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  previousButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination-small.vue b/packages/components/pagination/src/pagination-small.vue
index 1c385c4b..ac813ba9 100644
--- a/packages/components/pagination/src/pagination-small.vue
+++ b/packages/components/pagination/src/pagination-small.vue
@@ -1,12 +1,12 @@
 <template>
-  <span class="puik-pagination__label" :data-test="labelDataTest">
+  <span class="puik-pagination__label" :data-test="`label-${dataTest}`">
     {{ label }}
   </span>
 
   <puik-button
     :aria-label="t('puik.pagination.previous', { page: page - 1 })"
     :disabled="page <= 1 || disabled"
-    :button-data-test="previousButtonDataTest"
+    :data-test="`previousButton-${dataTest}`"
     class="puik-pagination__previous-button puik-pagination__button"
     left-icon="keyboard_arrow_left"
     variant="secondary"
@@ -16,7 +16,7 @@
   <puik-button
     :aria-label="t('puik.pagination.next', { page: page + 1 })"
     :disabled="page >= maxPage || disabled"
-    :button-data-test="nextButtonDataTest"
+    :data-test="`nextButton-${dataTest}`"
     class="puik-pagination__button puik-pagination__next-button"
     right-icon="keyboard_arrow_right"
     variant="secondary"
diff --git a/packages/components/pagination/src/pagination.ts b/packages/components/pagination/src/pagination.ts
index e8c387d2..528b57ef 100644
--- a/packages/components/pagination/src/pagination.ts
+++ b/packages/components/pagination/src/pagination.ts
@@ -61,17 +61,7 @@ export const paginationProps = buildProps({
     required: false,
     default: false,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  previousButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  nextButtonDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/pagination/src/pagination.vue b/packages/components/pagination/src/pagination.vue
index 41161381..668dc8e9 100644
--- a/packages/components/pagination/src/pagination.vue
+++ b/packages/components/pagination/src/pagination.vue
@@ -11,7 +11,7 @@
       :label="currentLabel"
       :loader-button-label="loaderButtonLabel"
       :disabled="loaderButtonDisabled"
-      :next-button-data-test="nextButtonDataTest"
+      :data-test="dataTest"
     />
 
     <div v-else class="puik-pagination__content">
@@ -19,18 +19,14 @@
         v-if="variant === PuikPaginationVariantEnum.small"
         v-model="currentPage"
         v-bind="commonPaginationProps"
-        :label-data-test="labelDataTest"
-        :previous-button-data-test="previousButtonDataTest"
-        :next-button-data-test="nextButtonDataTest"
+        :data-test="dataTest"
       />
 
       <pagination-mobile
         v-if="variant === PuikPaginationVariantEnum.mobile"
         v-model="currentPage"
         v-bind="commonPaginationProps"
-        :previous-button-data-test="previousButtonDataTest"
-        :next-button-data-test="nextButtonDataTest"
-        :label-data-test="labelDataTest"
+        :data-test="dataTest"
       />
 
       <pagination-medium
@@ -38,9 +34,7 @@
         v-model="currentPage"
         v-bind="commonPaginationProps"
         :total-item="totalItem"
-        :previous-button-data-test="previousButtonDataTest"
-        :next-button-data-test="nextButtonDataTest"
-        :label-data-test="labelDataTest"
+        :data-test="dataTest"
       />
 
       <pagination-large
@@ -49,9 +43,7 @@
         :items-per-page="itemsPerPage"
         :total-item="totalItem"
         :items-per-page-options="itemsPerPageOptions"
-        :previous-button-data-test="previousButtonDataTest"
-        :next-button-data-test="nextButtonDataTest"
-        :label-data-test="labelDataTest"
+        :data-test="dataTest"
         v-bind="commonPaginationProps"
         @update:items-per-page="emit('update:itemsPerPage', $event)"
       />
diff --git a/packages/components/pagination/stories/pagination.stories.ts b/packages/components/pagination/stories/pagination.stories.ts
index ccd65702..3cc34016 100644
--- a/packages/components/pagination/stories/pagination.stories.ts
+++ b/packages/components/pagination/stories/pagination.stories.ts
@@ -90,18 +90,6 @@ export default {
         },
       },
     },
-    labelDataTest: {
-      control: 'text',
-      description: 'Set the label data-test attribute',
-      table: {
-        defaultValue: {
-          summary: 'undefined',
-        },
-        type: {
-          summary: 'string',
-        },
-      },
-    },
     loaderButtonLabel: {
       control: 'text',
       description: 'Set the text used in button on loader variant',
@@ -114,29 +102,10 @@ export default {
         },
       },
     },
-    previousButtonDataTest: {
-      control: 'text',
-      description: 'Set the previous button data-test attribute',
-      table: {
-        defaultValue: {
-          summary: 'undefined',
-        },
-        type: {
-          summary: 'string',
-        },
-      },
-    },
-    nextButtonDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the next button data-test attribute',
-      table: {
-        defaultValue: {
-          summary: 'undefined',
-        },
-        type: {
-          summary: 'string',
-        },
-      },
+      description:
+        'Set the data-test attribute `nextButton-${dataTest}` `previousButton-${dataTest}` `label-${dataTest}` `loadMoreButton-${dataTest}` (only for loader variant)',
     },
   },
   args: {
diff --git a/packages/components/progress-stepper/src/progress-stepper-step.ts b/packages/components/progress-stepper/src/progress-stepper-step.ts
index 3ca1572e..0ab8a271 100644
--- a/packages/components/progress-stepper/src/progress-stepper-step.ts
+++ b/packages/components/progress-stepper/src/progress-stepper-step.ts
@@ -7,17 +7,7 @@ export const progressStepperStepProps = buildProps({
     type: [String, Number],
     required: true,
   },
-  stepButtonDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  textDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  additionalTextDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/progress-stepper/src/progress-stepper-step.vue b/packages/components/progress-stepper/src/progress-stepper-step.vue
index cb2b1753..0c4ae69e 100644
--- a/packages/components/progress-stepper/src/progress-stepper-step.vue
+++ b/packages/components/progress-stepper/src/progress-stepper-step.vue
@@ -9,19 +9,22 @@
       aria-live="polite"
       class="puik-progress-stepper-step__button"
       size="sm"
-      :button-data-test="stepButtonDataTest"
+      :data-test="`stepButton-${dataTest}`"
       @click="onClick"
     >
       <template v-if="!isCompleted">
         {{ step }}
       </template>
     </puik-button>
-    <span class="puik-progress-stepper-step__text" :data-test="textDataTest">
+    <span
+      class="puik-progress-stepper-step__text"
+      :data-test="`text-${dataTest}`"
+    >
       <slot name="text"></slot>
     </span>
     <span
       class="puik-progress-stepper-step__additional-text"
-      :data-test="additionalTextDataTest"
+      :data-test="`additionalText-${dataTest}`"
     >
       <slot name="additional-text"></slot>
     </span>
diff --git a/packages/components/progress-stepper/stories/progress-stepper-step.stories.ts b/packages/components/progress-stepper/stories/progress-stepper-step.stories.ts
index 016239f2..d8eb92b4 100644
--- a/packages/components/progress-stepper/stories/progress-stepper-step.stories.ts
+++ b/packages/components/progress-stepper/stories/progress-stepper-step.stories.ts
@@ -15,24 +15,17 @@ export default {
         },
       },
     },
-    stepDataTest: {
-      description: 'Set the data-test of the step',
-      control: 'text',
-    },
     text: {
       description: 'Text of the step',
       control: 'text',
     },
-    textDataTest: {
-      description: 'Set the data-test of the text',
-      control: 'text',
-    },
     'additional-text': {
       description: 'Additional text of the step',
       control: 'text',
     },
-    additionalTextDataTest: {
-      description: 'Set the data-test of the additional text',
+    dataTest: {
+      description:
+        'Set the data-test of the progress stepper step `stepButton-${dataTest}` `text-${dataTest}` `additionalText-${dataTest}`',
       control: 'text',
     },
     click: {
diff --git a/packages/components/radio/src/radio.ts b/packages/components/radio/src/radio.ts
index 5df5d815..c50fc0ce 100644
--- a/packages/components/radio/src/radio.ts
+++ b/packages/components/radio/src/radio.ts
@@ -8,11 +8,6 @@ export const radioProps = buildProps({
     required: false,
     default: undefined,
   },
-  labelDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
   name: {
     type: String,
     required: false,
@@ -33,7 +28,7 @@ export const radioProps = buildProps({
     required: false,
     default: false,
   },
-  inputDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/radio/src/radio.vue b/packages/components/radio/src/radio.vue
index 8ac404b1..90bebd60 100644
--- a/packages/components/radio/src/radio.vue
+++ b/packages/components/radio/src/radio.vue
@@ -10,14 +10,14 @@
       class="puik-radio__input"
       type="radio"
       :name="name"
-      :data-test="inputDataTest"
+      :data-test="`input-${dataTest}`"
       @focus="handleFocus"
     />
     <label
       v-if="$slots.default || label"
       :for="id"
       class="puik-radio__label"
-      :data-test="labelDataTest"
+      :data-test="`label-${dataTest}`"
     >
       <slot>{{ label }}</slot>
     </label>
diff --git a/packages/components/radio/stories/radio.stories.ts b/packages/components/radio/stories/radio.stories.ts
index 58cbcb7e..2f03bd64 100644
--- a/packages/components/radio/stories/radio.stories.ts
+++ b/packages/components/radio/stories/radio.stories.ts
@@ -10,10 +10,6 @@ export default {
       control: 'text',
       description: 'Label of the radio button',
     },
-    labelDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute of the label',
-    },
     disabled: {
       control: 'boolean',
       description: 'Set if the radio button is disabled',
@@ -40,9 +36,10 @@ export default {
         },
       },
     },
-    inputDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the data-test attribute of the input',
+      description:
+        'Set the data-test attribute of the input and the label `label-${dataTest}` `input-${dataTest}`',
     },
   },
   args: {
@@ -51,8 +48,6 @@ export default {
     name: 'Slot by default',
     value: '',
     modelValue: '',
-    labelDataTest: '',
-    inputDataTest: '',
   },
 } as Meta
 
diff --git a/packages/components/select/src/option.ts b/packages/components/select/src/option.ts
index d2d4d2c2..b49dba0e 100644
--- a/packages/components/select/src/option.ts
+++ b/packages/components/select/src/option.ts
@@ -23,7 +23,7 @@ export const optionProps = buildProps({
     required: false,
     default: false,
   },
-  optionDataTest: {
+  dataTest: {
     type: String,
     required: false,
   },
diff --git a/packages/components/select/src/option.vue b/packages/components/select/src/option.vue
index 22efff69..24d29cc4 100644
--- a/packages/components/select/src/option.vue
+++ b/packages/components/select/src/option.vue
@@ -12,7 +12,7 @@
         'puik-option--selected': selectedValue === value,
         'puik-option--disabled': disabled,
       }"
-      :data-test="optionDataTest"
+      :data-test="dataTest"
     >
       <slot class="puik-option__label">{{ label }}</slot>
       <puik-icon
diff --git a/packages/components/select/src/select.ts b/packages/components/select/src/select.ts
index 82ac7575..00aeb708 100644
--- a/packages/components/select/src/select.ts
+++ b/packages/components/select/src/select.ts
@@ -83,12 +83,7 @@ export const selectProps = buildProps({
     required: false,
     default: undefined,
   },
-  searchInputDataTest: {
-    type: String,
-    required: false,
-    default: undefined,
-  },
-  noResultsDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/select/src/select.vue b/packages/components/select/src/select.vue
index 30433a6e..49ca0c10 100644
--- a/packages/components/select/src/select.vue
+++ b/packages/components/select/src/select.vue
@@ -54,7 +54,7 @@
             v-model="query"
             class="puik-select__search"
             :placeholder="t('puik.select.searchPlaceholder')"
-            :input-data-test="searchInputDataTest"
+            :data-test="`searchInput-${dataTest}`"
           >
             <template #prepend
               ><puik-icon
@@ -71,7 +71,7 @@
                 : !filteredItems?.length)
             "
             class="puik-select__no-results"
-            :data-test="noResultsDataTest"
+            :data-test="`noResults-${dataTest}`"
           >
             {{ noMatchText || `${t('puik.select.noResults')} ${query}` }}
           </p>
@@ -83,7 +83,7 @@
                   :key="option"
                   :label="option[labelKey]"
                   :value="isObject(option) ? option[valueKey] : option"
-                  :option-data-test="`dataTestOption-${index + 1}`"
+                  :data-test="`dataTestOption-${dataTest}-${index + 1}`"
                 />
               </template>
             </slot>
diff --git a/packages/components/select/stories/select.stories.ts b/packages/components/select/stories/select.stories.ts
index 0858f2f9..bfbcd35a 100644
--- a/packages/components/select/stories/select.stories.ts
+++ b/packages/components/select/stories/select.stories.ts
@@ -109,27 +109,14 @@ export default {
         category: 'Common',
       },
     },
-    selectDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the data-test attribute for the select',
+      description:
+        'Set the data-test attribute `searchInput-${dataTest}` `noResults-${dataTest}` `select-${dataTest}` `dataTestOption-${dataTest}-${index + 1}`',
       table: {
         category: 'Common',
       },
     },
-    searchInputDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute for the search input',
-      table: {
-        category: 'Searchable',
-      },
-    },
-    noResultsDataTest: {
-      control: 'text',
-      description: 'Set the data-test attribute for the no results message',
-      table: {
-        category: 'Searchable',
-      },
-    },
   },
   args: {
     labelKey: '',
diff --git a/packages/components/sidebar/src/sidebar-group-item.ts b/packages/components/sidebar/src/sidebar-group-item.ts
index 059a07f6..c1cfb797 100644
--- a/packages/components/sidebar/src/sidebar-group-item.ts
+++ b/packages/components/sidebar/src/sidebar-group-item.ts
@@ -21,7 +21,7 @@ export const sidebarGroupItemProps = buildProps({
     default: false,
     required: false,
   },
-  sidebarGroupItemDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/sidebar/src/sidebar-group-item.vue b/packages/components/sidebar/src/sidebar-group-item.vue
index df2334de..004620be 100644
--- a/packages/components/sidebar/src/sidebar-group-item.vue
+++ b/packages/components/sidebar/src/sidebar-group-item.vue
@@ -11,9 +11,7 @@
       :name="accordionName"
       :icon="icon"
       class="puik-sidebar-group-item__accordion"
-      :title-data-test="`${sidebarGroupItemDataTest}-title`"
-      :icon-data-test="`${sidebarGroupItemDataTest}-icon`"
-      :button-data-test="`${sidebarGroupItemDataTest}-button`"
+      :data-test="`sidebarAccordion-${dataTest}`"
     >
       <slot></slot>
     </puik-accordion>
@@ -23,7 +21,7 @@
           variant="text"
           fluid
           class="puik-sidebar-group-item__collapsed-button"
-          :button-data-test="`${sidebarGroupItemDataTest}-button`"
+          :data-test="`sidebarMenuButton-${dataTest}`"
         >
           <puik-icon :icon="icon" font-size="1.25rem"></puik-icon>
         </puik-button>
diff --git a/packages/components/sidebar/src/sidebar-item.ts b/packages/components/sidebar/src/sidebar-item.ts
index 881acf73..1bfdd318 100644
--- a/packages/components/sidebar/src/sidebar-item.ts
+++ b/packages/components/sidebar/src/sidebar-item.ts
@@ -28,7 +28,7 @@ export const sidebarItemProps = buildProps({
     required: false,
     default: false,
   },
-  sidebarItemDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/sidebar/src/sidebar-item.vue b/packages/components/sidebar/src/sidebar-item.vue
index af107456..0b815769 100644
--- a/packages/components/sidebar/src/sidebar-item.vue
+++ b/packages/components/sidebar/src/sidebar-item.vue
@@ -13,7 +13,7 @@
       fluid
       variant="text"
       class="puik-sidebar-item__button"
-      :button-data-test="`${sidebarItemDataTest}-menubuttonTitle`"
+      :data-test="`menubuttonTitle-${dataTest}`"
     >
       {{ title }}
     </puik-button>
@@ -28,11 +28,9 @@
     :href="href"
     fluid
     variant="text"
-    :button-data-test="`${sidebarItemDataTest}-buttonTitle`"
+    :data-test="`buttonTitle-${dataTest}`"
   >
-    <span v-if="isExpanded" :data-test="`${sidebarItemDataTest}-Title`">{{
-      title
-    }}</span>
+    <span v-if="isExpanded" :data-test="`title-${dataTest}`">{{ title }}</span>
   </puik-button>
 </template>
 
diff --git a/packages/components/sidebar/src/sidebar-title.ts b/packages/components/sidebar/src/sidebar-title.ts
index f76bfb10..3e8f42ab 100644
--- a/packages/components/sidebar/src/sidebar-title.ts
+++ b/packages/components/sidebar/src/sidebar-title.ts
@@ -8,7 +8,7 @@ export const sidebarTitleProps = buildProps({
     required: false,
     default: 'h3',
   },
-  sidebarTitleDataTest: {
+  dataTest: {
     type: String,
     required: false,
     default: undefined,
diff --git a/packages/components/sidebar/src/sidebar-title.vue b/packages/components/sidebar/src/sidebar-title.vue
index 2dd995ef..22022467 100644
--- a/packages/components/sidebar/src/sidebar-title.vue
+++ b/packages/components/sidebar/src/sidebar-title.vue
@@ -3,7 +3,7 @@
     :is="tag"
     v-if="isExpanded"
     class="puik-sidebar-title"
-    :data-test="sidebarTitleDataTest"
+    :data-test="`sidebarTitle-${dataTest}`"
   >
     <slot></slot>
   </component>
diff --git a/packages/components/sidebar/stories/sidebar-group-item.stories.ts b/packages/components/sidebar/stories/sidebar-group-item.stories.ts
index 82249000..e3ab8fe6 100644
--- a/packages/components/sidebar/stories/sidebar-group-item.stories.ts
+++ b/packages/components/sidebar/stories/sidebar-group-item.stories.ts
@@ -52,9 +52,10 @@ export default {
       control: 'none',
       description: 'Set the defaut content slot',
     },
-    sidebarGroupItemDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the data-test attribute on the sidebar group item',
+      description:
+        'Set the data-test attribute on the sidebar group item `sidebarAccordion-${dataTest}` `sidebarMenuButton-${dataTest}` ',
     },
   },
   args: {
diff --git a/packages/components/sidebar/stories/sidebar-item.stories.ts b/packages/components/sidebar/stories/sidebar-item.stories.ts
index f1f8ac26..41572548 100644
--- a/packages/components/sidebar/stories/sidebar-item.stories.ts
+++ b/packages/components/sidebar/stories/sidebar-item.stories.ts
@@ -67,9 +67,10 @@ export default {
       control: 'none',
       description: 'Set the defaut content slot',
     },
-    sidebarItemDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the data-test attribute on the item',
+      description:
+        'Set the data-test attribute on the item `menubuttonTitle-${dataTest}` `buttonTitle-${dataTest}` `title-${dataTest}`',
     },
   },
   args: {
diff --git a/packages/components/sidebar/stories/sidebar-title.stories.ts b/packages/components/sidebar/stories/sidebar-title.stories.ts
index 63f1bf46..ebcf35e8 100644
--- a/packages/components/sidebar/stories/sidebar-title.stories.ts
+++ b/packages/components/sidebar/stories/sidebar-title.stories.ts
@@ -30,9 +30,10 @@ export default {
         },
       },
     },
-    sidebarTitleDataTest: {
+    dataTest: {
       control: 'text',
-      description: 'Set the data-test attribute on the sidebar title',
+      description:
+        'Set the data-test attribute on the sidebar title `sidebarTitle-${dataTest}`',
     },
   },
   args: {