diff --git a/src/fireedge/src/client/components/Cards/SnapshotCard.js b/src/fireedge/src/client/components/Cards/SnapshotCard.js
index 1197fa3de1..a6c31d1a9a 100644
--- a/src/fireedge/src/client/components/Cards/SnapshotCard.js
+++ b/src/fireedge/src/client/components/Cards/SnapshotCard.js
@@ -32,15 +32,19 @@ const SnapshotCard = memo(
     const timeAgo = `created ${time.toRelative()}`
 
     return (
-      <Paper variant="outlined" className={classes.root}>
+      <Paper
+        variant="outlined"
+        className={classes.root}
+        data-cy={`snapshot-${SNAPSHOT_ID}`}
+      >
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography noWrap component="span">
+            <Typography noWrap component="span" data-cy="snapshot-name">
               {NAME}
             </Typography>
           </div>
           <div className={classes.caption}>
-            <span title={time.toFormat('ff')}>
+            <span title={time.toFormat('ff')} data-cy="snapshot-id">
               {`#${SNAPSHOT_ID} ${timeAgo}`}
             </span>
           </div>
diff --git a/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js b/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
index 448e55243c..6916005133 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/History/HistoryRecord.js
@@ -85,10 +85,14 @@ const HistoryRecordCard = memo(
     })
 
     return (
-      <Paper variant="outlined" className={classes.root}>
+      <Paper
+        variant="outlined"
+        className={classes.root}
+        data-cy={`record-${SEQ}`}
+      >
         <div className={classes.main}>
           <div className={classes.title}>
-            <Typography noWrap component="span">
+            <Typography noWrap component="span" data-cy="record-data">
               {`#${SEQ} | #${HID} ${HOSTNAME} | ${Tr(T.Action)}: ${action}`}
             </Typography>
           </div>
diff --git a/src/fireedge/src/client/components/Tabs/Vm/History/index.js b/src/fireedge/src/client/components/Tabs/Vm/History/index.js
index f9a16bf648..9081d18e72 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/History/index.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/History/index.js
@@ -49,7 +49,10 @@ const VmHistoryTab = ({ tabProps: { actions } = {}, id }) => {
   }, [vm])
 
   return (
-    <div style={{ display: 'grid', gap: '1em', paddingBlock: '0.8em' }}>
+    <div
+      style={{ display: 'grid', gap: '1em', paddingBlock: '0.8em' }}
+      data-cy="history"
+    >
       {records.map((history, idx) => (
         <HistoryRecord key={idx} history={history} actions={actionsAvailable} />
       ))}
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Info/capacity.js b/src/fireedge/src/client/components/Tabs/Vm/Info/capacity.js
index 5e58273e3e..435bca5923 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Info/capacity.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Info/capacity.js
@@ -156,7 +156,10 @@ const PanelHeader = ({ vm = {}, actions = [] }) => {
           }}
           options={[
             {
-              dialogProps: { title: T.ResizeCapacity },
+              dialogProps: {
+                title: T.ResizeCapacity,
+                dataCy: 'modal-resize-capacity',
+              },
               form: () => ResizeCapacityForm({ initialValues: vm.TEMPLATE }),
               onSubmit: handleResizeCapacity,
             },
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Snapshot/Actions.js b/src/fireedge/src/client/components/Tabs/Vm/Snapshot/Actions.js
index b7604d6eaf..80e5b49e85 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Snapshot/Actions.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Snapshot/Actions.js
@@ -45,7 +45,10 @@ const CreateAction = memo(({ vmId }) => {
       }}
       options={[
         {
-          dialogProps: { title: T.TakeSnapshot },
+          dialogProps: {
+            title: T.TakeSnapshot,
+            dataCy: 'modal-create-snapshot',
+          },
           form: CreateSnapshotForm,
           onSubmit: handleCreate,
         },
@@ -79,6 +82,7 @@ const RevertAction = memo(({ vmId, snapshot }) => {
                 values={`#${SNAPSHOT_ID} - ${NAME}`}
               />
             ),
+            dataCy: 'modal-revert-snapshot',
             children: <p>{Tr(T.DoYouWantProceed)}</p>,
           },
           onSubmit: handleRevert,
@@ -113,6 +117,7 @@ const DeleteAction = memo(({ vmId, snapshot }) => {
                 values={`#${SNAPSHOT_ID} - ${NAME}`}
               />
             ),
+            dataCy: 'modal-delete-snapshot',
             children: <p>{Tr(T.DoYouWantProceed)}</p>,
           },
           onSubmit: handleDelete,
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Snapshot/index.js b/src/fireedge/src/client/components/Tabs/Vm/Snapshot/index.js
index 5a933f950d..dcc45b1ae2 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Snapshot/index.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Snapshot/index.js
@@ -63,7 +63,7 @@ const VmSnapshotTab = ({ tabProps: { actions } = {}, id }) => {
         <CreateAction vmId={id} />
       )}
 
-      <Stack gap="1em" py="0.8em">
+      <Stack gap="1em" py="0.8em" data-cy="snapshots">
         {snapshots.map((snapshot) => (
           <SnapshotCard
             snapshot={snapshot}
diff --git a/src/fireedge/src/client/features/OneApi/vm.js b/src/fireedge/src/client/features/OneApi/vm.js
index 3d850914b0..d98e0c0aa6 100644
--- a/src/fireedge/src/client/features/OneApi/vm.js
+++ b/src/fireedge/src/client/features/OneApi/vm.js
@@ -760,7 +760,7 @@ const vmApi = oneApi.injectEndpoints({
        * @throws Fails when response isn't code 200
        */
       query: (params) => {
-        const name = Actions.VM_SNAP_REVERT
+        const name = Actions.VM_SNAP_DELETE
         const command = { name, ...Commands[name] }
 
         return { params, command }