diff --git a/app/client/cypress.json b/app/client/cypress.json
index 089428372d..b90a8606ef 100644
--- a/app/client/cypress.json
+++ b/app/client/cypress.json
@@ -20,7 +20,7 @@
 	"viewportHeight": 1100,
 	"viewportWidth": 1400,
 	"retries": {
-		"runMode": 2,
+		"runMode": 1,
 		"openMode": 0
 	}
-}
\ No newline at end of file
+}
diff --git a/app/client/cypress/fixtures/datasources.json b/app/client/cypress/fixtures/datasources.json
index a1eb147212..80569437fb 100644
--- a/app/client/cypress/fixtures/datasources.json
+++ b/app/client/cypress/fixtures/datasources.json
@@ -2,7 +2,7 @@
     "mongo-authenticationAuthtype": "SCRAM-SHA-1",
     "mongo-host": "localhost",
     "mongo-port": 28017,
-    "mongo-databaseName": "sample_airbnb",
+    "mongo-databaseName": "mongo_samples",
     "mongo-uri": "mongodb+srv://localhost:localhost@mockdb.net/mock?retryWrites=true&w=majority",
     "postgres-host": "localhost",
     "postgres-port": 5432,
@@ -46,4 +46,4 @@
     "mockDatabasePassword": "LimitedAccess123#",
     "readonly":"readonly",
     "authenticatedApiUrl": "https://fakeapi.com"
-}
\ No newline at end of file
+}
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
index 48a99c8b36..d1f1dd3dbc 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ExplorerTests/Entity_Explorer_Datasource_Structure_spec.js
@@ -40,13 +40,13 @@ describe("Entity explorer datasource structure", function() {
       200,
     );
 
-    cy.get(explorer.datasourceStructure)
-      .first()
-      .find(explorer.collapse)
-      .click();
-    cy.get(explorer.datasourceColumn)
-      .first()
-      .click();
+    // cy.get(explorer.datasourceStructure)
+    //   .first()
+    //   .find(explorer.collapse)
+    //   .click();
+    // cy.get(explorer.datasourceColumn)
+    //   .first()
+    //   .click();
     cy.get(".bp3-popover-content").should("be.visible");
 
     cy.get(explorer.templateMenuIcon)
@@ -63,10 +63,11 @@ describe("Entity explorer datasource structure", function() {
     );
 
     cy.deleteQueryUsingContext();
-
     cy.CheckAndUnfoldEntityItem("QUERIES/JS");
     cy.GlobalSearchEntity("MyQuery");
-    cy.get(`.t--entity-name:contains(MyQuery)`).click();
+    cy.get(`.t--entity-name:contains(MyQuery)`)
+      .scrollIntoView()
+      .click();
     cy.deleteQueryUsingContext();
 
     cy.get(commonlocators.entityExplorersearch).clear({ force: true });