diff --git a/src/fireedge/src/client/components/AutoScrollBox/index.js b/src/fireedge/src/client/components/AutoScrollBox/index.js
index a6cda462af..d3b84fc06d 100644
--- a/src/fireedge/src/client/components/AutoScrollBox/index.js
+++ b/src/fireedge/src/client/components/AutoScrollBox/index.js
@@ -34,7 +34,8 @@ const AutoScrollBox = memo(({
   autoButtonText,
   preventInteraction,
   scrollBehavior,
-  showOption
+  showOption,
+  dataCy
 }) => {
   const classes = useStyles()
   const [autoScroll, setAutoScroll] = useState(true)
@@ -89,6 +90,7 @@ const AutoScrollBox = memo(({
         onWheel={onWheel}
         ref={containerElement}
         style={style}
+        data-cy={dataCy}
       >
         <Slide in={!autoScroll} direction="down" mountOnEnter unmountOnExit>
           <div className={classes.wrapperButton}>
@@ -124,7 +126,8 @@ AutoScrollBox.propTypes = {
   // Ability to disable the smooth scrolling behavior.
   scrollBehavior: PropTypes.oneOf(['smooth', 'auto']),
   // Show the auto scroll option.
-  showOption: PropTypes.bool
+  showOption: PropTypes.bool,
+  dataCy: PropTypes.string
 }
 
 AutoScrollBox.defaultProps = {
@@ -134,7 +137,8 @@ AutoScrollBox.defaultProps = {
   autoButtonText: 'Auto scroll',
   preventInteraction: false,
   scrollBehavior: 'smooth',
-  showOption: true
+  showOption: true,
+  dataCy: 'auto-scroll'
 }
 
 AutoScrollBox.displayName = 'AutoScrollBox'
diff --git a/src/fireedge/src/client/components/DebugLog/index.js b/src/fireedge/src/client/components/DebugLog/index.js
index 9f43f7b3cc..b5f2ef6454 100644
--- a/src/fireedge/src/client/components/DebugLog/index.js
+++ b/src/fireedge/src/client/components/DebugLog/index.js
@@ -58,7 +58,7 @@ const DebugLog = memo(({ uuid, socket, logDefault, title }) => {
       <Filters log={log} filters={filters} setFilters={setFilters} />
 
       <div className={classes.containerScroll}>
-        <AutoScrollBox scrollBehavior="auto">
+        <AutoScrollBox scrollBehavior='auto'>
           <MessageList log={log} filters={filters} />
         </AutoScrollBox>
       </div>
diff --git a/src/fireedge/src/client/components/DebugLog/message.js b/src/fireedge/src/client/components/DebugLog/message.js
index 92f97249c6..d366a9954f 100644
--- a/src/fireedge/src/client/components/DebugLog/message.js
+++ b/src/fireedge/src/client/components/DebugLog/message.js
@@ -53,6 +53,7 @@ const Message = memo(({ timestamp, severity, message }) => {
     <div
       className={clsx(classes.root, classes[severity])}
       onClick={() => setCollapse(prev => !prev)}
+      data-cy='message'
     >
       <span>
         {isMoreThanMaxChars && (isCollapsed ? (