diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Map_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Map_spec.js
index 9024dd831b..cf73f6dfb0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Map_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Map_spec.js
@@ -128,7 +128,6 @@ if (Cypress.env("APPSMITH_GOOGLE_MAPS_API_KEY")) {
     });
 
     it("Map-Check Visible field Validation", function() {
-      cy.openPropertyPane("mapwidget");
       //Check the disableed checkbox and Validate
       cy.CheckWidgetProperties(commonlocators.visibleCheckbox);
       cy.PublishtheApp();
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
index 2690cffa85..f466810ef0 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
@@ -15,8 +15,14 @@ describe("Onboarding", function() {
       201,
     );
     cy.wait("@getDataSources");
-    cy.get(".t--start-building").click();
-
+    cy.wait("@getPluginForm").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+    cy.get(".t--start-building")
+      .should("be.visible")
+      .click({ force: true });
     // Create and run query
     cy.get(".t--onboarding-indicator").should("be.visible");
     cy.get(".t--create-query").click();