diff --git a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/clickhouseHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/clickhouseHappyPath.cy.js
index fd7499ce90..5a5a298967 100644
--- a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/clickhouseHappyPath.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/clickhouseHappyPath.cy.js
@@ -88,8 +88,7 @@ describe("ClickHouse", () => {
         verifyDSConnection("failed", "getaddrinfo ENOTFOUND invalid-host");
 
         fillDSConnectionForm(clickhouseFormConfig, clickhouseFormConfig.invalidPort);
-        // ClickHouse HTTP port returns "Timeout error" (not ECONNREFUSED) for invalid ports
-        verifyDSConnection("failed", "Timeout error");
+        verifyDSConnection("failed", "connect ECONNREFUSED");
     });
 });
 
diff --git a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/elasticsearchHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/elasticsearchHappyPath.cy.js
index e0b9a4fc35..3f3dce9eff 100644
--- a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/elasticsearchHappyPath.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/elasticsearchHappyPath.cy.js
@@ -103,7 +103,7 @@ describe("Elasticsearch", () => {
         verifyDSConnection("failed", "getaddrinfo ENOTFOUND invalid-host");
 
         fillDSConnectionForm(elasticsearchFormConfig, elasticsearchFormConfig.invalidPort);
-        verifyDSConnection("failed", "TimeoutError: Request timed out");
+        verifyDSConnection("failed", "connect ECONNREFUSED");
     });
 });
 
diff --git a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mongodbHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mongodbHappyPath.cy.js
index e83c871d25..78b9309150 100644
--- a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mongodbHappyPath.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mongodbHappyPath.cy.js
@@ -115,7 +115,7 @@ describe("MongoDB", () => {
         verifyDSConnection("failed", "getaddrinfo ENOTFOUND invalid-host");
 
         fillDSConnectionForm(mongodbFormConfig, mongodbFormConfig.invalidPort);
-        verifyDSConnection("failed", "connection timed out");
+        verifyDSConnection("failed", "connect ECONNREFUSED");
 
 
         // Note: need to get new creds
diff --git a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mysqlHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mysqlHappyPath.cy.js
index e9f4e2ed64..0abfea79d1 100644
--- a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mysqlHappyPath.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/mysqlHappyPath.cy.js
@@ -114,7 +114,7 @@ describe("MySQL", () => {
         verifyDSConnection("failed", "Access denied for user");
 
         fillDSConnectionForm(mysqlFormConfig, mysqlFormConfig.invalidPort);
-        verifyDSConnection("failed", "connect ETIMEDOUT");
+        verifyDSConnection("failed", "connect ECONNREFUSED");
 
         fillDSConnectionForm(mysqlFormConfig, mysqlFormConfig.invalidDatabase);
         verifyDSConnection("failed", "Unknown database 'nonexistent_database'");
diff --git a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/postgresHappyPath.cy.js b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/postgresHappyPath.cy.js
index 3a9fea41cf..54ea48d5ed 100644
--- a/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/postgresHappyPath.cy.js
+++ b/cypress-tests/cypress/e2e/happyPath/marketplace/commonTestcases/datasources/postgresHappyPath.cy.js
@@ -119,7 +119,7 @@ describe("PostgreSQL", () => {
         verifyDSConnection("failed", `password authentication failed for user "postgres"`);
 
         fillDSConnectionForm(postgresFormConfig, postgresFormConfig.invalidPort);
-        verifyDSConnection("failed", "Connection test failed: Database connection timeout. Please check host/port/firewall");
+        verifyDSConnection("failed", "Connection test failed: connect ECONNREFUSED");
     });
 
     it("4. PostgreSQL - Verify query editor", () => {