diff --git a/packages/test/src/streams/appendToStream-batch-append-flood.test.ts b/packages/test/src/streams/appendToStream-batch-append-flood.test.ts
index 61d0c1a6..66e94b21 100644
--- a/packages/test/src/streams/appendToStream-batch-append-flood.test.ts
+++ b/packages/test/src/streams/appendToStream-batch-append-flood.test.ts
@@ -16,11 +16,7 @@ describe("appendToStream - batch append - flood", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
   });
 
   afterAll(async () => {
diff --git a/packages/test/src/streams/appendToStream-batch-append.test.ts b/packages/test/src/streams/appendToStream-batch-append.test.ts
index ad961b8f..d0c2a2d7 100644
--- a/packages/test/src/streams/appendToStream-batch-append.test.ts
+++ b/packages/test/src/streams/appendToStream-batch-append.test.ts
@@ -20,11 +20,7 @@ describe("appendToStream - batch append", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
     batchSpy = spyOn.call(client, "GRPCStreamCreator");
     executeSpy = spyOn.call(client, "execute");
   });
diff --git a/packages/test/src/streams/appendToStream-errors.test.ts b/packages/test/src/streams/appendToStream-errors.test.ts
index 78d4ee7b..14d3cc0b 100644
--- a/packages/test/src/streams/appendToStream-errors.test.ts
+++ b/packages/test/src/streams/appendToStream-errors.test.ts
@@ -23,11 +23,7 @@ describe("appendToStream - errors", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri, throwOnAppendFailure: true },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
   });
 
   afterAll(async () => {
diff --git a/packages/test/src/streams/deleteStream.test.ts b/packages/test/src/streams/deleteStream.test.ts
index d8d00ae9..d0589ea4 100644
--- a/packages/test/src/streams/deleteStream.test.ts
+++ b/packages/test/src/streams/deleteStream.test.ts
@@ -13,11 +13,7 @@ describe("deleteStream", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
   });
 
   afterAll(async () => {
@@ -37,7 +33,7 @@ describe("deleteStream", () => {
         expect(result).toBeDefined();
 
         await expect(
-          collect(client.readStream(ANY_REVISION_STREAM, { maxCount: 10 }))
+          collect(await client.readStream(ANY_REVISION_STREAM, { maxCount: 10 }))
         ).rejects.toThrowError(StreamNotFoundError);
       });
     });
@@ -68,7 +64,7 @@ describe("deleteStream", () => {
 
         it("succeeds", async () => {
           const events = await collect(
-            client.readStream(STREAM, {
+            await client.readStream(STREAM, {
               maxCount: 1,
               direction: BACKWARDS,
               fromRevision: "end",
@@ -84,7 +80,7 @@ describe("deleteStream", () => {
           expect(result).toBeDefined();
 
           await expect(
-            collect(client.readStream(STREAM, { maxCount: 1 }))
+            collect(await client.readStream(STREAM, { maxCount: 1 }))
           ).rejects.toThrowError(StreamNotFoundError);
         });
       });
diff --git a/packages/test/src/streams/getStreamMetadata.test.ts b/packages/test/src/streams/getStreamMetadata.test.ts
index 66145cdc..bbf3d4f7 100644
--- a/packages/test/src/streams/getStreamMetadata.test.ts
+++ b/packages/test/src/streams/getStreamMetadata.test.ts
@@ -7,11 +7,7 @@ describe("getStreamMetadata", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
   });
 
   afterAll(async () => {
diff --git a/packages/test/src/streams/setStreamMetadata.test.ts b/packages/test/src/streams/setStreamMetadata.test.ts
index bd9899c1..3d9d5e4a 100644
--- a/packages/test/src/streams/setStreamMetadata.test.ts
+++ b/packages/test/src/streams/setStreamMetadata.test.ts
@@ -11,11 +11,7 @@ describe("setStreamMetadata", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
   });
 
   afterAll(async () => {
@@ -131,7 +127,7 @@ describe("setStreamMetadata", () => {
       await client.appendToStream(STREAM_NAME, jsonTestEvents(20));
 
       let count = 0;
-      for await (const _ of client.readStream(STREAM_NAME, {
+      for await (const _ of await client.readStream(STREAM_NAME, {
         fromRevision: START,
         maxCount: 200,
       })) {
diff --git a/packages/test/src/streams/subscribeToAll-filters.test.ts b/packages/test/src/streams/subscribeToAll-filters.test.ts
index ca6ccd5f..f3fd3e49 100644
--- a/packages/test/src/streams/subscribeToAll-filters.test.ts
+++ b/packages/test/src/streams/subscribeToAll-filters.test.ts
@@ -29,13 +29,7 @@ describe("subscribeToAll", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      {
-        rootCertificate: node.certs.root,
-      },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
 
     await client.appendToStream(STREAM_NAME_A, jsonTestEvents(4));
     await client.appendToStream(STREAM_NAME_B, jsonTestEvents(4));
diff --git a/packages/test/src/streams/subscribeToAll.test.ts b/packages/test/src/streams/subscribeToAll.test.ts
index 621ad06f..5b1d59a0 100644
--- a/packages/test/src/streams/subscribeToAll.test.ts
+++ b/packages/test/src/streams/subscribeToAll.test.ts
@@ -29,13 +29,7 @@ describe("subscribeToAll", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      {
-        rootCertificate: node.certs.root,
-      },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
 
     await client.appendToStream(STREAM_NAME_A, jsonTestEvents(4));
     await client.appendToStream(STREAM_NAME_B, jsonTestEvents(4));
diff --git a/packages/test/src/streams/subscribeToStream.test.ts b/packages/test/src/streams/subscribeToStream.test.ts
index 712d0d14..ee05b9c5 100644
--- a/packages/test/src/streams/subscribeToStream.test.ts
+++ b/packages/test/src/streams/subscribeToStream.test.ts
@@ -33,11 +33,7 @@ describe("subscribeToStream", () => {
 
   beforeAll(async () => {
     await node.up();
-    client = new EventStoreDBClient(
-      { endpoint: node.uri },
-      { rootCertificate: node.certs.root },
-      { username: "admin", password: "changeit" }
-    );
+    client = EventStoreDBClient.connectionString(node.connectionString());
     await client.appendToStream("out_of_stream_name", jsonTestEvents(4));
   });
 
diff --git a/packages/test/src/streams/tombstoneStream.test.ts b/packages/test/src/streams/tombstoneStream.test.ts
index 655dbb91..60dcf4c0 100644
--- a/packages/test/src/streams/tombstoneStream.test.ts
+++ b/packages/test/src/streams/tombstoneStream.test.ts
@@ -16,11 +16,7 @@ describe("tombstoneStream", () => {
 
     beforeAll(async () => {
       await node.up();
-      client = new EventStoreDBClient(
-        { endpoint: node.uri },
-        { rootCertificate: node.certs.root },
-        { username: "admin", password: "changeit" }
-      );
+      client = EventStoreDBClient.connectionString(node.connectionString());
     });
 
     afterAll(async () => {
@@ -39,7 +35,7 @@ describe("tombstoneStream", () => {
         expect(result).toBeDefined();
 
         try {
-          for await (const event of client.readStream(ANY_REVISION_STREAM, {
+          for await (const event of await client.readStream(ANY_REVISION_STREAM, {
             maxCount: 10,
           })) {
             expect(event).toBe("Unreachable");
@@ -81,7 +77,7 @@ describe("tombstoneStream", () => {
         it("succeeds", async () => {
           let revision!: bigint;
 
-          for await (const { event } of client.readStream(STREAM, {
+          for await (const { event } of await client.readStream(STREAM, {
             maxCount: 1,
             direction: BACKWARDS,
             fromRevision: END,
@@ -96,7 +92,7 @@ describe("tombstoneStream", () => {
           expect(result).toBeDefined();
 
           try {
-            for await (const event of client.readStream(STREAM, {
+            for await (const event of await client.readStream(STREAM, {
               maxCount: 10,
             })) {
               expect(event).toBeDefined();
@@ -143,8 +139,8 @@ describe("tombstoneStream", () => {
 
           expect(result).toBeDefined();
 
-          await expect(() =>
-            collect(client.readStream(NOT_A_STREAM, { maxCount: 10 }))
+          await expect(async () =>
+            collect(await client.readStream(NOT_A_STREAM, { maxCount: 10 }))
           ).rejects.toThrowError(StreamDeletedError);
         });
       });
diff --git a/packages/test/src/utils/enableVersionCheck.ts b/packages/test/src/utils/enableVersionCheck.ts
index 0bc7a5db..19fa7bc7 100644
--- a/packages/test/src/utils/enableVersionCheck.ts
+++ b/packages/test/src/utils/enableVersionCheck.ts
@@ -15,14 +15,7 @@ const checkCapabilities = async () => {
   const node = new Cluster(1);
   await node.up();
 
-  const client = new EventStoreDBClient(
-    {
-      endpoint: node.uri,
-    },
-    { rootCertificate: node.certs.root },
-    { username: "admin", password: "changeit" }
-  );
-
+  const client = EventStoreDBClient.connectionString(node.connectionString());
   const capabilities = await extractVersion.call(client);
 
   await node.down();