diff --git a/tests/System/integration/api/com_users/Users.cy.js b/tests/System/integration/api/com_users/Users.cy.js
index 7415756d2bfa7..17d088c4c88ee 100644
--- a/tests/System/integration/api/com_users/Users.cy.js
+++ b/tests/System/integration/api/com_users/Users.cy.js
@@ -81,7 +81,7 @@ describe('Test that users API endpoint', () => {
         cy.get('#username').type('test');
         cy.get('#password').type('test');
         cy.get('#remember').check();
-        cy.get('.controls > .btn').click();
+        cy.get('.controls > button[type="submit"].btn').click();
         cy.visit('/index.php?option=com_users&view=login');
         cy.get('.com-users-logout').should('contain.text', 'Log out');
       });
diff --git a/tests/System/integration/site/components/com_users/Login.cy.js b/tests/System/integration/site/components/com_users/Login.cy.js
index e97036d560627..5db74825376ea 100644
--- a/tests/System/integration/site/components/com_users/Login.cy.js
+++ b/tests/System/integration/site/components/com_users/Login.cy.js
@@ -6,7 +6,7 @@ describe('Test in frontend that the users login view', () => {
         cy.get('#username').type('test');
         cy.get('#password').type('test');
         cy.get('#remember').check();
-        cy.get('.controls > .btn').click();
+        cy.get('.controls > button[type="submit"].btn').click();
         cy.visit('/index.php?option=com_users&view=login');
 
         cy.get('.com-users-logout').should('contain.text', 'Log out');
@@ -22,7 +22,7 @@ describe('Test in frontend that the users login view', () => {
         cy.get('#username').type('test');
         cy.get('#password').type('test');
         cy.get('#remember').check();
-        cy.get('.controls > .btn').click();
+        cy.get('.controls > button[type="submit"].btn').click();
         cy.get('a:contains(Automated test login)').click();
 
         cy.get('.com-users-logout').should('contain.text', 'Log out');
diff --git a/tests/System/integration/site/modules/mod_login/Default.cy.js b/tests/System/integration/site/modules/mod_login/Default.cy.js
index 0cc08d9a4623f..a83fca45c9ed1 100644
--- a/tests/System/integration/site/modules/mod_login/Default.cy.js
+++ b/tests/System/integration/site/modules/mod_login/Default.cy.js
@@ -15,7 +15,7 @@ describe('Test in frontend that the login module', () => {
       cy.get('#modlgn-username-16').type('test');
       cy.get('#modlgn-passwd-16').type('test');
       cy.get('input[name="remember"]').check();
-      cy.get('.mod-login__submit > .btn').click();
+      cy.get('button[name="Submit"]').click();
 
       cy.get('.mod-login-logout').should('contain.text', 'Hi automated test user');
     });