diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 9106ffed..a4ca4eeb 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -5,7 +5,12 @@
     </div>
     <template>
       <div class="mb-6 mb-sm-0">
-        <v-btn icon class="ml-n1 mr-2" @click="openDialog = true">
+        <v-btn
+          icon
+          class="ml-n1 mr-2"
+          @click="openDialog = true"
+          :data-cy="`${dataCy}:open`"
+        >
           <v-icon>$ayiEdit</v-icon>
         </v-btn>
         <span @click="openDialog = true">{{ displayServiceAddress }}</span>
@@ -310,9 +315,13 @@
           <v-card-actions>
             <v-spacer></v-spacer>
 
-            <v-btn color="blue darken-1" text @click="close()">{{
-              $ay.t("OK")
-            }}</v-btn>
+            <v-btn
+              color="blue darken-1"
+              text
+              @click="close()"
+              :data-cy="`${dataCy}:btnok`"
+              >{{ $ay.t("OK") }}</v-btn
+            >
           </v-card-actions>
         </v-card>
       </v-dialog>
@@ -369,6 +378,7 @@ export default {
       default: null,
       type: Object
     },
+    dataCy: { type: String, default: null },
     formKey: { type: String, default: "" }, //used to grab template from store
     readonly: Boolean,
     disabled: Boolean
diff --git a/ayanova/src/components/work-order-state.vue b/ayanova/src/components/work-order-state.vue
index 27161330..d2ce72f6 100644
--- a/ayanova/src/components/work-order-state.vue
+++ b/ayanova/src/components/work-order-state.vue
@@ -4,7 +4,11 @@
       <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
     </div>
     <template>
-      <div class="mb-6 mb-sm-0" @click="openDialog = true">
+      <div
+        class="mb-6 mb-sm-0"
+        @click="openDialog = true"
+        :data-cy="`${dataCy}:open`"
+      >
         <v-btn icon class="ml-n1 mr-2">
           <v-icon>{{ openIcon() }}</v-icon>
         </v-btn>
@@ -75,6 +79,7 @@
                   :label="$ay.t('NewStatus')"
                   prepend-icon="$ayiEdit"
                   @click:prepend="handleEditStateClick()"
+                  :data-cy="`${dataCy}:picker`"
                 >
                   <template v-slot:item="data">
                     <v-list-item-avatar>
@@ -121,6 +126,7 @@
               :disabled="selectedStatus == null"
               text
               @click="save()"
+              :data-cy="`${dataCy}:btnok`"
               >{{ $ay.t("OK") }}</v-btn
             >
           </v-card-actions>
@@ -155,6 +161,7 @@ export default {
       default: null,
       type: Array
     },
+    dataCy: { type: String, default: null },
     formKey: { type: String, default: "" }, //used to grab template from store
     readonly: Boolean,
     disabled: Boolean