diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index 38fa1e20a18c248266c70077cc244f21cd1cb0fc..9342bd95c6ce04063587c3c3c086f3b1128820e4 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -215,6 +215,7 @@ export default class PresentationArea extends Component {
             timeout={{ enter: 400 }}
           >
             <svg
+              data-test="whiteboard"
               width={width}
               height={height}
               ref={(ref) => { if (ref != null) { this.svggroup = ref; } }}
diff --git a/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js b/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js
index 8113c41e76a42c874bd646e9097a5c2abcecabcc..6211f5d6f4a3f86c931750e9c3767906a0bed271 100644
--- a/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js
+++ b/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js
@@ -1,5 +1,4 @@
-exports.whiteboard = 'svg._imports_ui_components_presentation__styles__svgStyles';
-exports.toolbox = '._imports_ui_components_whiteboard_whiteboard_toolbar__styles__toolbarContainer';
+exports.whiteboard = '[data-test="whiteboard"]';
 exports.tools = 'button[aria-label="Tools"]';
 exports.pencil = 'button[aria-label="Pencil"]';
 exports.rectangle = 'button[aria-label="Rectangle"]';