diff --git a/cypress.json b/cypress.json
index 2f5026f..afcd657 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,5 +1,5 @@
 {
-    "baseUrl": "http://test_site:8000/",
+    "baseUrl": "http://test_site:8000",
     "projectId": "da59y9",
     "adminPassword": "admin",
     "defaultCommandTimeout": 20000,
diff --git a/cypress/integration/test_organizational_chart_desktop.js b/cypress/integration/test_organizational_chart_desktop.js
index 807ef57..b11b9ea 100644
--- a/cypress/integration/test_organizational_chart_desktop.js
+++ b/cypress/integration/test_organizational_chart_desktop.js
@@ -2,9 +2,11 @@
 	before(() => {
 		cy.login();
 		cy.visit('/app/website');
+		cy.awesomebar('Organizational Chart');
 
-		cy.visit(`app/organizational-chart`);
-		cy.fill_field('company', 'Test Org Chart');
+		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
+		cy.get('@input').type('Test Org Chart');
+
 		cy.get('body').click();
 		cy.wait(500);
 	});
diff --git a/cypress/integration/test_organizational_chart_mobile.js b/cypress/integration/test_organizational_chart_mobile.js
index f48972b..a42562f 100644
--- a/cypress/integration/test_organizational_chart_mobile.js
+++ b/cypress/integration/test_organizational_chart_mobile.js
@@ -3,10 +3,11 @@
 		cy.login();
 		cy.viewport(375, 667);
 		cy.visit('/app/website');
+		cy.awesomebar('Organizational Chart');
 
-		cy.visit(`app/organizational-chart`);
-		cy.wait(500);
-		cy.fill_field('company', 'Test Org Chart');
+		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
+		cy.get('@input').type('Test Org Chart');
+
 		cy.get('body').click();
 		cy.wait(500);
 	});