diff --git a/cli/tests/generic.spec.ts b/cli/tests/generic.spec.ts
index 5d97cbccd..37e9f2f6e 100644
--- a/cli/tests/generic.spec.ts
+++ b/cli/tests/generic.spec.ts
@@ -506,9 +506,7 @@ test.describe('PMM Client "Generic" CLI tests', async () => {
 
   test('PMM-T2025 - Verify that Nomad server is not running by default', async ({}) => {
     const output = await cli.exec('docker exec pmm-server supervisorctl status | grep "nomad-server"');
-    await output.assertSuccess();
-    await output.outContains('STOPPED');
-    await output.outContains('Not started');
+    await output.exitCodeEquals(1);
   });
 
   test('PMM-T2031 - Verify that nomad is not listed in pmm-admin list, when not used.', async ({}) => {
diff --git a/cli/tests/pmm-server-only.spec.ts b/cli/tests/pmm-server-only.spec.ts
index 9b5d450ff..158564f96 100644
--- a/cli/tests/pmm-server-only.spec.ts
+++ b/cli/tests/pmm-server-only.spec.ts
@@ -57,7 +57,7 @@ test.describe('PMM Server CLI tests for Docker Environment Variables', async ()
     stopList.push('PMM-T225');
     removeList.push('PMM-T225');
     // @ts-ignore
-    await out.outContains('Configuration warning: unknown environment variable \\"PMM_DATA_TENTION=48\\".');
+    await out.outContains('Configuration warning: unknown environment variable PMM_DATA_TENTION=48.');
   });
 
   /**