diff --git a/ghost/admin/app/components/gh-task-button.hbs b/ghost/admin/app/components/gh-task-button.hbs
index a02b5a2731..f4adbb40e8 100644
--- a/ghost/admin/app/components/gh-task-button.hbs
+++ b/ghost/admin/app/components/gh-task-button.hbs
@@ -6,8 +6,8 @@
         isFailure=this.isFailure
     )}}
 {{else}}
-    {{#if this.isRunning}}<span data-test-state="running">{{svg-jar "spinner" class="gh-icon-spinner"}}{{this.runningText}}</span>{{/if}}
-    {{#if this.isIdle}}<span data-test-state="idle">{{this.buttonText}}</span>{{/if}}
-    {{#if this.isSuccess}}<span {{did-insert this.handleReset}} data-test-state="success">{{svg-jar "check-circle"}} {{this.successText}}</span>{{/if}}
-    {{#if this.isFailure}}<span data-test-state="failure">{{svg-jar "retry"}} {{this.failureText}}</span>{{/if}}
+    {{#if this.isRunning}}<span data-test-task-button-state="running">{{svg-jar "spinner" class="gh-icon-spinner"}}{{this.runningText}}</span>{{/if}}
+    {{#if this.isIdle}}<span data-test-task-button-state="idle">{{this.buttonText}}</span>{{/if}}
+    {{#if this.isSuccess}}<span {{did-insert this.handleReset}} data-test-task-button-state="success">{{svg-jar "check-circle"}} {{this.successText}}</span>{{/if}}
+    {{#if this.isFailure}}<span data-test-task-button-state="failure">{{svg-jar "retry"}} {{this.failureText}}</span>{{/if}}
 {{/if}}
diff --git a/ghost/admin/tests/integration/components/gh-task-button-test.js b/ghost/admin/tests/integration/components/gh-task-button-test.js
index cbea83bff2..b967e9006e 100644
--- a/ghost/admin/tests/integration/components/gh-task-button-test.js
+++ b/ghost/admin/tests/integration/components/gh-task-button-test.js
@@ -155,7 +155,7 @@ describe('Integration: Component: gh-task-button', function () {
         await render(hbs`<GhTaskButton @task={{myTask}} />`);
 
         this.myTask.perform();
-        await waitFor('[data-test-state="idle"]', {timeout: 50});
+        await waitFor('[data-test-task-button-state="idle"]', {timeout: 50});
 
         await settled();
     });