diff --git a/cypress.json b/cypress.json
index ae4495cfa8..15f8f230fa 100644
--- a/cypress.json
+++ b/cypress.json
@@ -9,5 +9,7 @@
   "retries": {
     "runMode": 2,
     "openMode": 2
-  }
+  },
+  "integrationFolder": ".",
+  "testFiles": ["cypress/integration/*.js", "**/ui_test_*.js"]
 }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 933f6a1758..4fe315c372 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -30,7 +30,7 @@ Cypress.Commands.add('login', (email, password) => {
 		email = 'Administrator';
 	}
 	if (!password) {
-		password = Cypress.config('adminPassword');
+		password = Cypress.env('adminPassword');
 	}
 	cy.request({
 		url: '/api/method/login',
@@ -161,7 +161,7 @@ Cypress.Commands.add('remove_doc', (doctype, name) => {
 
 Cypress.Commands.add('create_records', doc => {
 	return cy
-		.call('frappe.tests.ui_test_helpers.create_if_not_exists', {doc})
+		.call('frappe.tests.ui_test_helpers.create_if_not_exists', {doc: JSON.stringify(doc)})
 		.then(r => r.message);
 });