diff --git a/src/fireedge/src/client/components/Tables/Datastores/row.js b/src/fireedge/src/client/components/Tables/Datastores/row.js
index 908b15bcc0..e61a20e2f1 100644
--- a/src/fireedge/src/client/components/Tables/Datastores/row.js
+++ b/src/fireedge/src/client/components/Tables/Datastores/row.js
@@ -38,7 +38,7 @@ const Row = ({ original, value, ...props }) => {
     DatastoreModel.getState(original)
 
   return (
-    <div {...props}>
+    <div {...props} data-cy={`datastore-${ID}`}>
       <div>
         <StatusCircle color={stateColor} tooltip={stateName} />
       </div>
diff --git a/src/fireedge/src/client/components/Tables/Enhanced/filters.js b/src/fireedge/src/client/components/Tables/Enhanced/filters.js
index ad7c848f64..7774806f30 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/filters.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/filters.js
@@ -95,7 +95,7 @@ const Filters = ({ onlyGlobalSearch, useTableProps, searchProps }) => {
           [classes.contentWithFilter]: !noFilters,
         })}
       >
-        <GlobalFilter useTableProps={useTableProps} />
+        <GlobalFilter useTableProps={useTableProps} searchProps={searchProps} />
 
         {!noFilters && <div className={classes.filters}>{filters}</div>}
       </CardContent>
diff --git a/src/fireedge/src/client/components/Tables/Groups/row.js b/src/fireedge/src/client/components/Tables/Groups/row.js
index 49a80aebe6..0a4b093716 100644
--- a/src/fireedge/src/client/components/Tables/Groups/row.js
+++ b/src/fireedge/src/client/components/Tables/Groups/row.js
@@ -26,7 +26,7 @@ const Row = ({ original, value, ...props }) => {
   const { ID, NAME, TOTAL_USERS } = value
 
   return (
-    <div {...props}>
+    <div {...props} data-cy={`group-${ID}`}>
       <div className={classes.main}>
         <div className={classes.title}>
           <Typography component="span">{NAME}</Typography>
diff --git a/src/fireedge/src/client/components/Tables/Hosts/row.js b/src/fireedge/src/client/components/Tables/Hosts/row.js
index f9a9384ddb..209794aab2 100644
--- a/src/fireedge/src/client/components/Tables/Hosts/row.js
+++ b/src/fireedge/src/client/components/Tables/Hosts/row.js
@@ -51,7 +51,7 @@ const Row = ({ original, value, ...props }) => {
   const labels = [...new Set([IM_MAD, VM_MAD])]
 
   return (
-    <div {...props}>
+    <div {...props} data-cy={`host-${ID}`}>
       <div>
         <StatusCircle color={stateColor} tooltip={stateName} />
       </div>
diff --git a/src/fireedge/src/client/components/Tables/Users/row.js b/src/fireedge/src/client/components/Tables/Users/row.js
index 2dc1fc7111..c94e252290 100644
--- a/src/fireedge/src/client/components/Tables/Users/row.js
+++ b/src/fireedge/src/client/components/Tables/Users/row.js
@@ -26,7 +26,7 @@ const Row = ({ original, value, ...props }) => {
   const { ID, NAME, GNAME, ENABLED, AUTH_DRIVER } = value
 
   return (
-    <div {...props}>
+    <div {...props} data-cy={`user-${ID}`}>
       <div className={classes.main}>
         <div className={classes.title}>
           <Typography component="span">{NAME}</Typography>
diff --git a/src/fireedge/src/client/components/Tables/Vms/row.js b/src/fireedge/src/client/components/Tables/Vms/row.js
index 070486434d..0bd4923e95 100644
--- a/src/fireedge/src/client/components/Tables/Vms/row.js
+++ b/src/fireedge/src/client/components/Tables/Vms/row.js
@@ -56,21 +56,23 @@ const Row = ({ original, value, ...props }) => {
           <Typography noWrap component="span">
             {NAME}
           </Typography>
-          <span className={classes.labels}>{LOCK && <Lock />}</span>
+          <span className={classes.labels}>
+            {LOCK && <Lock data-cy="lock" />}
+          </span>
         </div>
         <div className={classes.caption}>
           <span title={time.toFormat('ff')}>{`#${ID} ${timeAgo}`}</span>
           <span title={`Owner: ${UNAME}`}>
             <User />
-            <span>{` ${UNAME}`}</span>
+            <span data-cy="uname">{` ${UNAME}`}</span>
           </span>
           <span title={`Group: ${GNAME}`}>
             <Group />
-            <span>{` ${GNAME}`}</span>
+            <span data-cy="gname">{` ${GNAME}`}</span>
           </span>
           <span title={`Hostname: ${HOSTNAME}`}>
             <HardDrive />
-            <span>{` ${HOSTNAME}`}</span>
+            <span data-cy="hostname">{` ${HOSTNAME}`}</span>
           </span>
         </div>
       </div>
diff --git a/src/fireedge/src/client/containers/VirtualMachines/index.js b/src/fireedge/src/client/containers/VirtualMachines/index.js
index 817e688cbf..21173a7abe 100644
--- a/src/fireedge/src/client/containers/VirtualMachines/index.js
+++ b/src/fireedge/src/client/containers/VirtualMachines/index.js
@@ -26,6 +26,7 @@ import MultipleTags from 'client/components/MultipleTags'
 function VirtualMachines() {
   const [selectedRows, onSelectedRowsChange] = useState(() => [])
   const actions = VmActions()
+  const dataCy = 'vms'
 
   return (
     <Stack height={1} py={2} overflow="auto" component={Container}>
@@ -33,7 +34,8 @@ function VirtualMachines() {
         <VmsTable
           onSelectedRowsChange={onSelectedRowsChange}
           globalActions={actions}
-          rootProps={{ 'data-cy': 'vms' }}
+          rootProps={{ 'data-cy': dataCy }}
+          searchProps={{ 'data-cy': `search-${dataCy}` }}
         />
 
         {selectedRows?.length > 0 && (