diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index 2ad57a05..cc4093b4 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -24,17 +24,29 @@
                 :locale="languageName"
                 :data-cy="'dpick:' + testId"
               >
-                <v-btn text color="primary" @click="$emit('input', null)">{{
-                  $ay.t("Delete")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="$emit('input', null)"
+                  :data-cy="'dpickdelete:' + testId"
+                  >{{ $ay.t("Delete") }}</v-btn
+                >
                 <v-spacer></v-spacer>
-                <v-btn text color="primary" @click="setToday()">{{
-                  $ay.t("DateRangeToday")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="setToday()"
+                  :data-cy="'dpicktoday:' + testId"
+                  >{{ $ay.t("DateRangeToday") }}</v-btn
+                >
                 <v-spacer></v-spacer>
-                <v-btn text color="primary" @click="dlgdate = false">{{
-                  $ay.t("OK")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="dlgdate = false"
+                  :data-cy="'dpickok:' + testId"
+                  >{{ $ay.t("OK") }}</v-btn
+                >
               </v-date-picker>
             </v-dialog>
           </v-col>
@@ -60,17 +72,29 @@
                 @input="updateTimeValue"
                 :data-cy="'tpick:' + testId"
               >
-                <v-btn text color="primary" @click="$emit('input', null)">{{
-                  $ay.t("Delete")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="$emit('input', null)"
+                  :data-cy="'ttfpickdelete:' + testId"
+                  >{{ $ay.t("Delete") }}</v-btn
+                >
                 <v-spacer></v-spacer>
-                <v-btn text color="primary" @click="setNow()">{{
-                  $ay.t("Now")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="setNow()"
+                  :data-cy="'ttfpicknow:' + testId"
+                  >{{ $ay.t("Now") }}</v-btn
+                >
                 <v-spacer></v-spacer>
-                <v-btn text color="primary" @click="dlgtime = false">{{
-                  $ay.t("OK")
-                }}</v-btn>
+                <v-btn
+                  text
+                  color="primary"
+                  @click="dlgtime = false"
+                  :data-cy="'ttfpickok:' + testId"
+                  >{{ $ay.t("OK") }}</v-btn
+                >
               </v-time-picker>
             </v-dialog>
           </v-col>
diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue
index ac630a64..b431abd5 100644
--- a/ayanova/src/views/ay-evaluate.vue
+++ b/ayanova/src/views/ay-evaluate.vue
@@ -48,6 +48,7 @@
               color="blue darken-1"
               text
               @click="generate()"
+              data-cy="btnStart"
               >{{ $ay.t("StartJob") }}</v-btn
             >
           </v-card-actions>
@@ -92,6 +93,7 @@
                   text
                   @click="seedDialog = !seedDialog"
                   class="my-8 mr-12"
+                  data-cy="btnSeed"
                   >{{ $ay.t("GenerateSampleData") }}</v-btn
                 >
               </v-col>
diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index 22eec621..7cbdcefe 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -25,6 +25,7 @@
               :readonly="formState.readOnly"
               ref="startDate"
               data-cy="startDate"
+              test-id="startDate"
               :error-messages="form().serverErrors(this, 'startDate')"
               @input="fieldValueChanged('startDate')"
             ></gz-date-time-picker>
@@ -39,6 +40,7 @@
               :readonly="formState.readOnly"
               ref="stopDate"
               data-cy="stopDate"
+              test-id="stopDate"
               @input="fieldValueChanged('stopDate')"
             ></gz-date-time-picker>
           </v-col>