diff --git a/app/assets/javascripts/discourse/templates/components/group-form.hbs b/app/assets/javascripts/discourse/templates/components/group-form.hbs
index d8a6570af10..43eeea98377 100644
--- a/app/assets/javascripts/discourse/templates/components/group-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-form.hbs
@@ -181,7 +181,7 @@
   <div class='control-group buttons'>
     {{d-button action="save"
         disabled=disableSave
-        class='btn btn-primary'
+        class='btn btn-primary group-form-save'
         label=saveLabel}}
 
     {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index dd243927340..f2d00aac48c 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -12,7 +12,7 @@
       {{d-button action="resetPassword"
                  label="forgot_password.reset"
                  disabled=submitDisabled
-                 class="btn-primary"}}
+                 class="btn-primary forgot-password-reset"}}
     {{else}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js.es6
index 5e21fc8b60d..19a0d39c6bc 100644
--- a/test/javascripts/acceptance/forgot-password-test.js.es6
+++ b/test/javascripts/acceptance/forgot-password-test.js.es6
@@ -25,14 +25,14 @@ QUnit.test("requesting password reset", assert => {
 
   andThen(() => {
     assert.equal(
-      find('button[title="Reset Password"]').attr("disabled"),
+      find('.forgot-password-reset').attr("disabled"),
       "disabled",
       'it should disable the button until the field is filled'
     );
   });
 
   fillIn("#username-or-email", 'someuser');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
@@ -43,7 +43,7 @@ QUnit.test("requesting password reset", assert => {
   });
 
   fillIn("#username-or-email", 'someuser@gmail.com');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
@@ -59,7 +59,7 @@ QUnit.test("requesting password reset", assert => {
     userFound = true;
   });
 
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
@@ -75,7 +75,7 @@ QUnit.test("requesting password reset", assert => {
   click("header .login-button");
   click('#forgot-password-link');
   fillIn("#username-or-email", 'someuser@gmail.com');
-  click('button[title="Reset Password"]');
+  click('.forgot-password-reset');
 
   andThen(() => {
     assert.equal(
diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js.es6
index 472ce77c07f..7d8b3d9f744 100644
--- a/test/javascripts/acceptance/groups-new-test.js.es6
+++ b/test/javascripts/acceptance/groups-new-test.js.es6
@@ -29,7 +29,7 @@ QUnit.test("Creating a new group", assert => {
     );
 
     assert.ok(
-      find("button[title='Create']:disabled").length === 1,
+      find(".group-form-save:disabled").length === 1,
       'it should disable the save button'
     );
   });