diff --git a/src/fireedge/src/client/components/Forms/FormWithSchema.js b/src/fireedge/src/client/components/Forms/FormWithSchema.js
index c6285ed2a6..11d67f4404 100644
--- a/src/fireedge/src/client/components/Forms/FormWithSchema.js
+++ b/src/fireedge/src/client/components/Forms/FormWithSchema.js
@@ -114,6 +114,7 @@ const FormWithSchema = ({
         <LegendWrapper>
           {legend && (
             <Legend
+              data-cy={`legend-${cy}`}
               title={legend}
               tooltip={legendTooltip}
               disableGutters={accordion}
diff --git a/src/fireedge/src/client/components/Forms/Legend.js b/src/fireedge/src/client/components/Forms/Legend.js
index 487f648c1d..3535aa987c 100644
--- a/src/fireedge/src/client/components/Forms/Legend.js
+++ b/src/fireedge/src/client/components/Forms/Legend.js
@@ -39,8 +39,8 @@ const StyledLegend = styled((props) => (
 )
 
 const Legend = memo(
-  ({ title, tooltip, disableGutters }) => (
-    <StyledLegend ownerState={{ tooltip, disableGutters }}>
+  ({ 'data-cy': dataCy, title, tooltip, disableGutters }) => (
+    <StyledLegend data-cy={dataCy} ownerState={{ tooltip, disableGutters }}>
       <Translate word={title} />
       {!!tooltip && <AdornmentWithTooltip title={tooltip} />}
     </StyledLegend>
@@ -49,6 +49,7 @@ const Legend = memo(
 )
 
 Legend.propTypes = {
+  'data-cy': PropTypes.string,
   title: PropTypes.any,
   tooltip: PropTypes.string,
   disableGutters: PropTypes.bool,
diff --git a/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/ExtraConfiguration/context/contextVarsSection.js b/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/ExtraConfiguration/context/contextVarsSection.js
index 5573b4a02d..86dbd038bd 100644
--- a/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/ExtraConfiguration/context/contextVarsSection.js
+++ b/src/fireedge/src/client/components/Forms/VmTemplate/CreateForm/Steps/ExtraConfiguration/context/contextVarsSection.js
@@ -81,6 +81,7 @@ const ContextVarsSection = ({ hypervisor }) => {
         <AccordionSummary>
           <Legend
             disableGutters
+            data-cy={'context-custom-vars'}
             title={T.ContextCustomVariables}
             tooltip={T.ContextCustomVariablesConcept}
           />