diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index 761ac995e..6959ad754 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -2,7 +2,7 @@
 const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
-    <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
+    <QDate v-model="model" :today-btn="true" :options="$attrs.options" data-cy />
 </template>
 <style lang="scss" scoped>
 .q-date {
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 57a495ac3..445ad6aa7 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -132,7 +132,7 @@ const handleInsertMode = (e) => {
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
+            v-data-cy
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index eb9dc0f38..19b1f15d6 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -108,6 +108,7 @@ const manageDate = (date) => {
             :clearable="false"
             @click="isPopupOpen = true"
             hide-bottom-space
+            data-cy="date"
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e116be32a..d19b12abf 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -313,7 +313,7 @@ function handleKeyDown(event) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
-        :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
+        data-cy
     >
         <template #append>
             <QIcon