diff --git a/views/administration/users_edit.hbs b/views/administration/users_edit.hbs
index 5aa825ae42..3d1592ebd2 100644
--- a/views/administration/users_edit.hbs
+++ b/views/administration/users_edit.hbs
@@ -161,7 +161,7 @@
                     <div class="pull-left">
                         {{#unless schoolUsesLdap}}
                         {{#ifCond isAdmin '|| !' editTeacher}}
-                        <button style="margin: 0 10px 20px 0" class="btn btn-secondary btn-pw"
+                        <button style="margin: 0 10px 20px 0" class="btn btn-secondary btn-pw" data-testid="button-change-password"
                             {{#if @root.hidePwChangeButton}}
                                 disabled
                                 {{#if @root.consentNecessary}}
diff --git a/views/authentication/forms/login.hbs b/views/authentication/forms/login.hbs
index cdb8a91d5e..d7c7c53fac 100644
--- a/views/authentication/forms/login.hbs
+++ b/views/authentication/forms/login.hbs
@@ -36,7 +36,7 @@
                     </div>
 
 
-                <button type="button" title="{{$t "login.button.moreOptions"}}" class="btn form-group toggle-btn btn-block btn-secondary btn-toggle-providers ">
+                <button type="button" title="{{$t "login.button.moreOptions"}}" class="btn form-group toggle-btn btn-block btn-secondary btn-toggle-providers " data-testid="login-more-options">
                     <i aria-hidden="true" class="fa fa-chevron-up"></i> {{$t "login.button.moreOptions"}}
                 </button>