diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index ea6ca81e66..dbfabeda3f 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -145,7 +145,7 @@ Cypress.Commands.add("getComponent", componentId => {
     .its("body")
     .should("not.be.null")
     .then(cy.wrap)
-    .find(`[data-component-id=${componentId}]`)
+    .find(`[data-id=${componentId}]`)
 })
 
 Cypress.Commands.add("navigateToFrontend", () => {
diff --git a/packages/client/src/utils/styleable.js b/packages/client/src/utils/styleable.js
index 899854ecc9..3fce1bcf26 100644
--- a/packages/client/src/utils/styleable.js
+++ b/packages/client/src/utils/styleable.js
@@ -52,7 +52,6 @@ export const styleable = (node, styles = {}) => {
     // Applies a style string to a DOM node
     const applyStyles = styleString => {
       node.style = `${baseString}${styleString}`
-      node.dataset.componentId = componentId
     }
 
     // Applies the "normal" style definition