diff --git a/cypress.config.js b/cypress.config.js
index ad224e9a5..6bbc4f898 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -4,14 +4,15 @@ module.exports = defineConfig({
   e2e: {
     baseUrl: 'http://localhost',
     experimentalStudio: true,
+    experimentalRunAllSpecs: true,
     credentials: {
       staff: {
-        email: "bb@bb.com",
-        password: "Bb123123+"
+        email: "admin@fossbilling.org",
+        password: "Admin123+"
       },
       client: {
-        email: "bb@bb.com",
-        password: "Bb123123+"
+        email: "client@fossbilling.org",
+        password: "Client123+"
       }
     }
   },
diff --git a/cypress/e2e/api/guest/system.cy.js b/cypress/e2e/modules/System/api/guest.cy.js
similarity index 100%
rename from cypress/e2e/api/guest/system.cy.js
rename to cypress/e2e/modules/System/api/guest.cy.js
diff --git a/cypress/e2e/api/guest/nonexistent.cy.js b/cypress/e2e/modules/nonexistent.cy.js
similarity index 100%
rename from cypress/e2e/api/guest/nonexistent.cy.js
rename to cypress/e2e/modules/nonexistent.cy.js
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 53a44b3e7..e9f5e61fc 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -13,7 +13,7 @@ Cypress.Commands.add('staffLogin', (username, password) => {
 
         cy.get('.btn').click();
 
-        cy.url().should('include', '/admin/index')
+        cy.url().should('eq', `${Cypress.config().baseUrl}/admin/index`)
       },
       {
         validate: () => {
@@ -38,7 +38,7 @@ Cypress.Commands.add('clientLogin', (username, password) => {
 
         cy.get('.btn').click();
 
-        cy.url().should('include', '/')
+        cy.url().should('eq', `${Cypress.config().baseUrl}/`)
       },
       {
         validate: () => {