diff --git a/cli/tests/pmm-server-docker-generic.spec.ts b/cli/tests/pmm-server-docker-generic.spec.ts
index cff05fcdd..7fbc6c03c 100644
--- a/cli/tests/pmm-server-docker-generic.spec.ts
+++ b/cli/tests/pmm-server-docker-generic.spec.ts
@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test';
 import * as cli from '@helpers/cliHelper';
+import Output from "@support/types/output";
 
 const DOCKER_IMAGE = process.env.DOCKER_VERSION && process.env.DOCKER_VERSION.length > 0
     ? process.env.DOCKER_VERSION
@@ -12,15 +13,17 @@ test.describe('PMM Server CLI tests for Docker Environment Variables', async ()
    */
   test('PMM-T224 run docker container with a invalid value for a environment variable DATA_RETENTION=48', async ({}) => {
     await cli.exec(`docker run -d -p 81:80 -p 446:443 --name PMM-T224 -e DATA_RETENTION=48 ${DOCKER_IMAGE}`);
+    let out: Output
+
     await expect(async () => {
-      await (await cli.exec('docker ps | grep PMM-T224')).exitCodeEquals(1);
+      out = await cli.exec('docker logs PMM-T224 2>&1 | grep \'Configuration error: environment variable\'');
+      await out.exitCodeEquals(0)
     }).toPass({
       // Probe, wait 1s, probe, wait 2s, probe, wait 2s, probe, wait 2s, probe, ....
       intervals: [1_000, 2_000, 2_000],
       timeout: 60_000
     });
-    await (await cli.exec(`docker logs PMM-T224 2>&1 | grep 'Configuration error: environment variable "DATA_RETENTION=48" has invalid duration 48'`))
-        .assertSuccess();
+    await out.outContains('Configuration error: environment variable \\"DATA_RETENTION=48\\" has invalid duration 48.')
     await (await cli.exec('docker rm PMM-T224')).assertSuccess();
   });
 
@@ -29,11 +32,18 @@ test.describe('PMM Server CLI tests for Docker Environment Variables', async ()
    */
   test('PMM-T225 run docker container with a unexpected environment variable DATA_TENTION=48', async ({}) => {
     await cli.exec(`docker run -d -p 82:80 -p 447:443 --name PMM-T225 -e DATA_TENTION=48 ${DOCKER_IMAGE}`);
-    //TODO: implement fluent wait instead of sleep
-    // await cli.exec('sleep 20');
-    await (await cli.exec('docker ps | grep PMM-T225')).assertSuccess();
-    await (await cli.exec(`docker logs PMM-T225 2>&1 | grep 'Configuration warning: unknown environment variable "DATA_TENTION=48"'`))
-        .assertSuccess();
+    let out: Output
+
+    await expect(async () => {
+      out = await cli.exec(`docker logs PMM-T225 2>&1 | grep 'Configuration warning: unknown environment variable'`);
+      await out.exitCodeEquals(0)
+    }).toPass({
+      // Probe, wait 1s, probe, wait 2s, probe, wait 2s, probe, wait 2s, probe, ....
+      intervals: [1_000, 2_000, 2_000],
+      timeout: 60_000
+    });
+
+    await out.outContains('Configuration warning: unknown environment variable \\"DATA_TENTION=48\\".')
     await (await cli.exec('docker stop PMM-T225')).assertSuccess();
     await (await cli.exec('docker rm PMM-T225')).assertSuccess();
   });
@@ -48,8 +58,24 @@ test.describe('PMM Server CLI tests for Docker Environment Variables', async ()
     //TODO: implement fluent wait instead of sleep
     await cli.exec('sleep 20');
     await (await cli.exec('docker ps | grep PMM-T226')).assertSuccess();
-    await (await cli.exec('docker logs PMM-T226 2>&1 | grep "WARN"')).exitCodeEquals(1);
-    await (await cli.exec('docker logs PMM-T226 2>&1 | grep "ERRO"')).exitCodeEquals(1);
+    await expect(async () => {
+      const out = await cli.exec('docker logs PMM-T226 2>&1 | grep "WARN"');
+      await out.exitCodeEquals(1)
+    }).toPass({
+      // Probe, wait 1s, probe, wait 2s, probe, wait 2s, probe, wait 2s, probe, ....
+      intervals: [1_000, 2_000, 2_000],
+      timeout: 60_000
+    });
+
+    await expect(async () => {
+      const out = await cli.exec('docker logs PMM-T226 2>&1 | grep "ERRO"');
+      await out.exitCodeEquals(1)
+    }).toPass({
+      // Probe, wait 1s, probe, wait 2s, probe, wait 2s, probe, wait 2s, probe, ....
+      intervals: [1_000, 2_000, 2_000],
+      timeout: 60_000
+    });
+
     await (await cli.exec('docker stop PMM-T226')).assertSuccess();
     await (await cli.exec('docker rm PMM-T226')).assertSuccess();
   });