diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index 1f641164..2da0a3e4 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -2,7 +2,10 @@
   <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
-      <v-card id="ayaNovaVersioncard">
+      <v-card
+        id="ayaNovaVersioncard"
+        :data-cy="!!$ay.dev ? 'versionCard' : false"
+      >
         <v-subheader>AyaNova App</v-subheader>
         <div>
           <span class="ml-6 body-1">{{ $ay.t("Version") }}: </span>
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index 60a2f886..bc8bc4c8 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -1,7 +1,7 @@
 <template>
   <v-row v-if="formState.ready">
     <v-col>
-      <v-form ref="form">
+      <v-form ref="form" :data-cy="!!$ay.dev ? 'customizeForm' : false">
         <v-row>
           <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
           <template v-for="item in obj">
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 4f7c0b00..11998818 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -10,7 +10,10 @@
       <v-col rows="12">
         <template v-if="$route.params.userlog">
           <!-- **** USER LOG ****** -->
-          <v-timeline :dense="$vuetify.breakpoint.smAndDown">
+          <v-timeline
+            :dense="$vuetify.breakpoint.smAndDown"
+            :data-cy="!!$ay.dev ? 'timeLine' : false"
+          >
             <v-timeline-item
               v-for="i in obj"
               :key="i.index"
@@ -47,7 +50,10 @@
         </template>
         <template v-else>
           <!-- **** OBJECT LOG ****** -->
-          <v-timeline :dense="$vuetify.breakpoint.smAndDown">
+          <v-timeline
+            :dense="$vuetify.breakpoint.smAndDown"
+            :data-cy="!!$ay.dev ? 'timeLine' : false"
+          >
             <v-timeline-item
               v-for="i in obj"
               :key="i.index"
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index c9ed76ca..e4531f45 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -2,7 +2,13 @@
   <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
-      <v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>
+      <v-textarea
+        v-model="logText"
+        full-width
+        readonly
+        auto-grow
+        :data-cy="!!$ay.dev ? 'logText' : false"
+      ></v-textarea>
     </v-col>
   </v-row>
 </template>
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index 7dcea5df..df93af66 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -15,6 +15,7 @@
       :dataListSort="dataListSort"
       :showSelect="rights.change"
       v-on:selection-change="handleSelected"
+      :data-cy="!!$ay.dev ? 'widgetsTable' : false"
     >
     </gz-data-table>
   </div>
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index 6190f5ab..433eb69b 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -201,22 +201,22 @@ describe("SMOKE", () => {
 
     cy.visit("/about");
     cy.url().should("include", "/about");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=versionCard]");
 
     cy.visit("/applog");
     cy.url().should("include", "/applog");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=logText]");
 
     cy.visit("/customize/Widget");
     cy.url().should("include", "/customize/Widget");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=customizeForm]");
 
     cy.visit("/data-list-view/TestWidgetDataList/widget-list/0");
     cy.url().should(
       "include",
       "/data-list-view/TestWidgetDataList/widget-list"
     );
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=name]");
 
     cy.visit("/review/2/1");
     cy.url().should("include", "/review/2/1");
@@ -224,17 +224,17 @@ describe("SMOKE", () => {
 
     cy.visit("/history/3/1");
     cy.url().should("include", "/history/3/1");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=timeLine]");
 
     //TODO: REPORT
 
     cy.visit("/widgets");
     cy.url().should("include", "/widgets");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=widgetsTable]");
 
     cy.visit("/widgets/0");
     cy.url().should("include", "/widgets/0");
-    cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=name]");
 
     cy.visit("/NOTFOUND");
     cy.contains("404");