diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js
index 2e865e6a57..1f38677504 100644
--- a/cypress/integration/list_view.js
+++ b/cypress/integration/list_view.js
@@ -14,12 +14,7 @@ context('List View', () => {
 		cy.get('.dropdown-menu li:visible .dropdown-item .menu-item-label[data-label="Edit"]').click();
 
 		cy.get('.modal-body .form-control[data-fieldname="field"]').first().select('Due Date').wait(200);
-		cy.get('.modal-body .frappe-control[data-fieldname="value"] input:visible').first().focus();
-		cy.get('.datepickers-container .datepicker.active').should('be.visible');
-
-		cy.get('.datepickers-container .datepicker.active .datepicker--cell-day.-current-').click({force: true});
-		cy.get('.modal-body .frappe-control[data-fieldname="value"] input:visible').first().focus();
-		cy.get('.datepickers-container .datepicker.active .datepicker--cell-day.-current-').click({force: true});
+		cy.fill_field('value', '09-28-21', 'Date');
 
 		cy.get('.modal-footer .standard-actions .btn-primary').click();
 		cy.wait(500);
diff --git a/cypress/integration/navigation.js b/cypress/integration/navigation.js
index ba45137cbd..c4d0638f26 100644
--- a/cypress/integration/navigation.js
+++ b/cypress/integration/navigation.js
@@ -13,6 +13,7 @@ context('Navigation', () => {
 
 	it.only('Navigate to previous page after login', () => {
 		cy.visit('/app/todo');
+		cy.findByTitle('To Do').should('be.visible');
 		cy.request('/api/method/logout');
 		cy.reload();
 		cy.get('.btn-primary').contains('Login').click();