diff --git a/redisinsight/ui/src/components/virtual-tree/components/Node/Node.tsx b/redisinsight/ui/src/components/virtual-tree/components/Node/Node.tsx
index f302748bdb..0ea4e18519 100644
--- a/redisinsight/ui/src/components/virtual-tree/components/Node/Node.tsx
+++ b/redisinsight/ui/src/components/virtual-tree/components/Node/Node.tsx
@@ -58,7 +58,7 @@ const Node = ({
       onKeyDown={handleKeyDown}
       tabIndex={0}
       onFocus={() => {}}
-      data-testid={fullName}
+      data-testid={`node-item_${fullName}`}
     >
       <div className={styles.nodeName}>
         {!isLeaf && (
diff --git a/tests/e2e/tests/critical-path/database/modules.e2e.ts b/tests/e2e/tests/critical-path/database/modules.e2e.ts
index e4fa1315f2..be92fe2c2d 100644
--- a/tests/e2e/tests/critical-path/database/modules.e2e.ts
+++ b/tests/e2e/tests/critical-path/database/modules.e2e.ts
@@ -1,4 +1,4 @@
-import { rte } from '../../../helpers/constants';
+import { rte, env } from '../../../helpers/constants';
 import {
     acceptLicenseTerms,
     addNewStandaloneDatabase,
@@ -25,7 +25,7 @@ fixture `Database modules`
         await deleteDatabase(ossStandaloneRedisearch.databaseName);
     })
 test
-    .meta({ rte: rte.standalone })
+    .meta({ rte: rte.standalone, env: env.web })
     ('Verify that user can see DB modules on DB list page for Standalone DB', async t => {
         //Check module column on DB list page
         await t.expect(myRedisDatabasePage.moduleColumn.exists).ok('Module column');
diff --git a/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts b/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts
index f9d8fe83b0..76e5c2ba07 100644
--- a/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts
+++ b/tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts
@@ -42,12 +42,13 @@ test
     ('Verify that user can see DB is automatically scanned by 10K keys in the background, user can see the number of keys scanned and use the "Scan More" button to search per another 10000 keys', async t => {
         let scannedValue = 10;
         await t.click(browserPage.treeViewButton);
+        await t.expect(browserPage.scannedValue.visible).ok('The database scanned value is displayed', { timeout: 40000 });
         await t.expect(browserPage.scannedValue.textContent).eql(`${scannedValue} 000`, 'The database is automatically scanned by 10K keys');
         //Verify that user can use the "Scan More" button to search per another 10000 keys
         for (let i = 0; i < 10; i++){
             scannedValue = scannedValue + 10;
             await t.click(browserPage.scanMoreButton);
-            await t.expect(await browserPage.scannedValue.withExactText(`${scannedValue} 000`).exists).ok('The database is automatically scanned by 10K keys');
+            await t.expect(browserPage.scannedValue.textContent).eql(`${scannedValue} 000`, `The database is automatically scanned by ${scannedValue} 000 keys`, { timeout: 40000 });
         }       
     });
 test