diff --git a/src/js/step.js b/src/js/step.js
index a63d0a7eb..dd6d90f92 100644
--- a/src/js/step.js
+++ b/src/js/step.js
@@ -190,7 +190,7 @@ export class Step extends Evented {
   _createTooltipContent() {
     const content = document.createElement('div');
     const classes = this.options.classes || '';
-    const element = createFromHTML(`<div class='${classes}' data-id='${this.id}' id="step-${this.options.id}-${uniqueId()}"}>`);
+    const element = createFromHTML(`<div class='${classes}' data-shepherd-step-id='${this.id}' id="step-${this.options.id}-${uniqueId()}"}>`);
     const header = document.createElement('header');
 
     if (this.options.title) {
diff --git a/test/unit/test.step.js b/test/unit/test.step.js
index 219ebd298..bf31a631c 100644
--- a/test/unit/test.step.js
+++ b/test/unit/test.step.js
@@ -100,7 +100,7 @@ describe('Tour | Step', () => {
       it('shows step evoking method, regardless of order', () => {
         showTestStep.show();
 
-        assert.equal(document.querySelector('[data-id=test2]').dataset.id, 'test2');
+        assert.exists(document.querySelector('[data-shepherd-step-id=test2]'));
       });
     });
   });