diff --git a/cypress/integration/query_report.js b/cypress/integration/query_report.js
index e8edc688a1..04bc1a6fd4 100644
--- a/cypress/integration/query_report.js
+++ b/cypress/integration/query_report.js
@@ -12,15 +12,17 @@ context('Form', () => {
 		cy.get('#page-query-report input[data-fieldname="doctype"]').as('input-test');
 		cy.get('@input-test').focus().type('Role', { delay: 100 }).blur();
 		cy.get('.datatable').should('exist');
-		cy.get('.menu-btn-group .btn').click({force: true});
-		cy.get('.grey-link:contains("Add Column")').click({force: true});
-		cy.get('.modal-dialog select[data-fieldname="doctype"]').select("Role", {force: true});
-		cy.get('.modal-dialog select[data-fieldname="field"]').select("Role Name", {force: true});
-		cy.get('.modal-dialog select[data-fieldname="insert_after"]').select("Name", {force: true});
-		cy.get('.modal-dialog .btn-primary:contains("Submit")').click({force: true});
-		cy.get('.menu-btn-group .btn').click({force: true});
-		cy.get('.grey-link:contains("Save")').click({force: true});
-		cy.get('.modal-dialog input[data-fieldname="report_name"]').type("Test Report", {force: true});
-		cy.get('.modal:visible .btn-primary:contains("Submit")').click({force: true});
+		cy.get('button').contains('Menu').click({force: true});
+		cy.get('.dropdown-menu li').contains('Add Column').click({force: true});
+		cy.get('.modal-dialog').should('contain', 'Add Column');
+		cy.get('select[data-fieldname="doctype"]').select("Role", {force: true});
+		cy.get('select[data-fieldname="field"]').select("Role Name", {force: true});
+		cy.get('select[data-fieldname="insert_after"]').select("Name", {force: true});
+		cy.get('button').contains('Submit').click({force: true});
+		cy.get('button').contains('Menu').click({force: true});
+		cy.get('.dropdown-menu li').contains('Save').click({force: true});
+		cy.get('.modal-dialog').should('contain', 'Save Report');
+		cy.get('input[data-fieldname="report_name"]').type("Test Report", {force: true});
+		cy.get('button').contains('Submit').click({force: true});
 	});
 });
\ No newline at end of file