diff --git a/commands.js b/commands.js
index c518917edd13f0f8c2b8169f6461c6f37e1df4a1..d914d983e258aacd88d858bf4e37eef061722777 100644
--- a/commands.js
+++ b/commands.js
@@ -22,11 +22,8 @@ Cypress.Commands.add('login', (options) => {
     cy.get('#user-login-form').submit()
 })
 
-let password = '';
-
-Cypress.Commands.add('createDrupalUser', (username, roles) => {
+Cypress.Commands.add('createDrupalUser', (username, password, roles) => {
     cy.rememberLatestTaxonomyTerm();
-    password = 'random-password-' + Cypress._.random(0, 1e6);
     cy.drush('user:create ' + username + ' --password=' + password);
     roles.split(',').forEach(role => {
         cy.drush('user:role:add ' + role + ' ' + username);
@@ -34,7 +31,8 @@ Cypress.Commands.add('createDrupalUser', (username, roles) => {
 })
 
 Cypress.Commands.add('createAndLogin', (username, role) => {
-    cy.createDrupalUser(username, role);
+    let password = 'random-password-' + Cypress._.random(0, 1e6);
+    cy.createDrupalUser(username, password, role);
     cy.login({
         path: 'user/login',
         username: username,
@@ -43,7 +41,8 @@ Cypress.Commands.add('createAndLogin', (username, role) => {
 })
 
 Cypress.Commands.add('createAndLoginDrush', (username, role) => {
-    cy.createDrupalUser(username, role);
+    let password = 'random-password-' + Cypress._.random(0, 1e6);
+    cy.createDrupalUser(username, password, role);
     cy.drush('uli --uri ' + Cypress.config('baseUrl') + ' --name ' + username).then((result) => {
         cy.visit(result.stdout);
     })