diff --git a/qa-core/src/integrations/validators/arango.spec.ts b/qa-core/src/integrations/validators/arango.spec.ts
index 51282de13f..7c0faafd61 100644
--- a/qa-core/src/integrations/validators/arango.spec.ts
+++ b/qa-core/src/integrations/validators/arango.spec.ts
@@ -41,7 +41,7 @@ describe("datasource validators", () => {
         collection: "",
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test wrong password", async () => {
@@ -54,6 +54,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error: "not authorized to execute this request",
       })
     })
@@ -68,6 +69,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error: "getaddrinfo ENOTFOUND not.here",
       })
     })
diff --git a/qa-core/src/integrations/validators/couch.spec.ts b/qa-core/src/integrations/validators/couch.spec.ts
index 18fbea8c43..9a736b4b95 100644
--- a/qa-core/src/integrations/validators/couch.spec.ts
+++ b/qa-core/src/integrations/validators/couch.spec.ts
@@ -37,7 +37,7 @@ describe("datasource validators", () => {
         database: "db",
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test invalid database", async () => {
@@ -56,6 +56,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error:
           "request to http://invalid:123/any failed, reason: getaddrinfo ENOTFOUND invalid",
       })
diff --git a/qa-core/src/integrations/validators/dynamodb.spec.ts b/qa-core/src/integrations/validators/dynamodb.spec.ts
index 53377ff06b..c885f64213 100644
--- a/qa-core/src/integrations/validators/dynamodb.spec.ts
+++ b/qa-core/src/integrations/validators/dynamodb.spec.ts
@@ -41,7 +41,7 @@ describe("datasource validators", () => {
       })
 
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test wrong endpoint", async () => {
@@ -54,6 +54,7 @@ describe("datasource validators", () => {
 
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error:
           "Inaccessible host: `wrong.url' at port `undefined'. This service may not be available in the `eu-west-1' region.",
       })
diff --git a/qa-core/src/integrations/validators/mongo.spec.ts b/qa-core/src/integrations/validators/mongo.spec.ts
index dd8e188f27..ad09f1ffb7 100644
--- a/qa-core/src/integrations/validators/mongo.spec.ts
+++ b/qa-core/src/integrations/validators/mongo.spec.ts
@@ -49,7 +49,7 @@ describe("datasource validators", () => {
         tlsCAFile: "",
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test invalid password", async () => {
diff --git a/qa-core/src/integrations/validators/mssql.spec.ts b/qa-core/src/integrations/validators/mssql.spec.ts
index 89af8e87c0..17f79d86ec 100644
--- a/qa-core/src/integrations/validators/mssql.spec.ts
+++ b/qa-core/src/integrations/validators/mssql.spec.ts
@@ -43,7 +43,7 @@ describe("datasource validators", () => {
         schema: "dbo",
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test invalid password", async () => {
@@ -57,6 +57,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error: "ConnectionError: Login failed for user 'sa'.",
       })
     })
diff --git a/qa-core/src/integrations/validators/mysql.spec.ts b/qa-core/src/integrations/validators/mysql.spec.ts
index 166085fdd5..6ee39731fa 100644
--- a/qa-core/src/integrations/validators/mysql.spec.ts
+++ b/qa-core/src/integrations/validators/mysql.spec.ts
@@ -31,7 +31,7 @@ describe("datasource validators", () => {
         rejectUnauthorized: true,
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test invalid database", async () => {
@@ -45,6 +45,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error: "Access denied for user 'user'@'%' to database 'test'",
       })
     })
@@ -60,6 +61,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error:
           "Access denied for user 'root'@'172.17.0.1' (using password: YES)",
       })
diff --git a/qa-core/src/integrations/validators/postgres.spec.ts b/qa-core/src/integrations/validators/postgres.spec.ts
index 5aa3250e2a..5101cf1d2d 100644
--- a/qa-core/src/integrations/validators/postgres.spec.ts
+++ b/qa-core/src/integrations/validators/postgres.spec.ts
@@ -30,7 +30,7 @@ describe("datasource validators", () => {
         rejectUnauthorized: false,
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test invalid connection string", async () => {
@@ -46,6 +46,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error: 'password authentication failed for user "wrong"',
       })
     })
diff --git a/qa-core/src/integrations/validators/redis.spec.ts b/qa-core/src/integrations/validators/redis.spec.ts
index fd35f5d23e..1c82e35b74 100644
--- a/qa-core/src/integrations/validators/redis.spec.ts
+++ b/qa-core/src/integrations/validators/redis.spec.ts
@@ -24,7 +24,7 @@ describe("datasource validators", () => {
           username: "",
         })
         const result = await integration.testConnection()
-        expect(result).toBe(true)
+        expect(result).toEqual({ connected: true })
       })
 
       it("test invalid connection even with wrong user/password", async () => {
@@ -64,7 +64,7 @@ describe("datasource validators", () => {
           password: "P@ssW0rd!",
         })
         const result = await integration.testConnection()
-        expect(result).toBe(true)
+        expect(result).toEqual({ connected: true })
       })
     })
   })
diff --git a/qa-core/src/integrations/validators/s3.spec.ts b/qa-core/src/integrations/validators/s3.spec.ts
index 6ed5c44449..7bb415ee3d 100644
--- a/qa-core/src/integrations/validators/s3.spec.ts
+++ b/qa-core/src/integrations/validators/s3.spec.ts
@@ -30,7 +30,7 @@ describe("datasource validators", () => {
         endpoint: `http://${host}:${port}`,
       })
       const result = await integration.testConnection()
-      expect(result).toBe(true)
+      expect(result).toEqual({ connected: true })
     })
 
     it("test wrong endpoint", async () => {
@@ -43,6 +43,7 @@ describe("datasource validators", () => {
       })
       const result = await integration.testConnection()
       expect(result).toEqual({
+        connected: false,
         error:
           "Inaccessible host: `wrong' at port `undefined'. This service may not be available in the `eu-west-2' region.",
       })