diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts
index d7ade39429..b140e682ee 100644
--- a/tests/e2e/pageObjects/browser-page.ts
+++ b/tests/e2e/pageObjects/browser-page.ts
@@ -202,7 +202,7 @@ export class BrowserPage {
       this.treeViewButton = Selector('[data-testid=view-type-list-btn]');
       this.browserViewButton = Selector('[data-testid=view-type-browser-btn]');
       this.treeViewSeparator = Selector('[data-testid=select-tree-view-separator]');
-      this.treeViewKeysItem = Selector('[data-testid="keys:keys:"]');
+      this.treeViewKeysItem = Selector('[data-testid*="keys:keys:"]');
       this.treeViewNodeArrowIcon = Selector('[data-test-subj^=node-arrow-icon_]');
       //TEXT INPUTS (also referred to as 'Text fields')
       this.keySizeDetails = Selector('[data-testid=key-size-text]');
@@ -265,7 +265,7 @@ export class BrowserPage {
       this.treeViewFolders = Selector('[data-test-subj^=node-arrow-icon_]');
       this.totalKeysNumber = Selector('[data-testid=keys-total]');
       this.databaseInfoToolTip = Selector('[data-testid=db-info-tooltip]');
-      this.treeViewDeviceFolder = Selector('[data-testid^=device] div');
+      this.treeViewDeviceFolder = Selector('[data-testid^=node-item_device] div');
       this.treeViewDeviceKyesCount = Selector('[data-testid^=count_device] span');
       this.modulesTypeDetails = Selector('[data-testid=modules-type-details]');
       this.internalLinkToWorkbench = Selector('[data-testid=internal-workbench-link]');
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 76e5c2ba07..bb99102503 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,13 +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.visible).ok('The database scanned value is displayed', { timeout: 60000 });
         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(browserPage.scannedValue.textContent).eql(`${scannedValue} 000`, `The database is automatically scanned by ${scannedValue} 000 keys`, { timeout: 40000 });
+            await t.expect(browserPage.scannedValue.textContent).eql(`${scannedValue} 000`, `The database is automatically scanned by ${scannedValue} 000 keys`, { timeout: 60000 });
         }       
     });
 test
@@ -65,6 +65,7 @@ test
         const percentage = await browserPage.treeViewPercentage.textContent;
         //Set filter by key name
         await browserPage.searchByKeyName(keyNameFilter);
+        await t.expect(browserPage.treeViewKeysItem.visible).ok('The key appears after the filtering', { timeout: 60000 });
         await t.click(browserPage.treeViewKeysItem);
         //Verify the results
         await t.expect(browserPage.treeViewKeysNumber.textContent).notEql(numberOfKeys, 'The number of keys is recalculated');
diff --git a/tests/e2e/tests/regression/tree-view/tree-view.e2e.ts b/tests/e2e/tests/regression/tree-view/tree-view.e2e.ts
index 1ccf234210..af9ea3373c 100644
--- a/tests/e2e/tests/regression/tree-view/tree-view.e2e.ts
+++ b/tests/e2e/tests/regression/tree-view/tree-view.e2e.ts
@@ -52,6 +52,7 @@ test
     ('Verify that when user deletes the key he can see the key is removed from the folder, the number of keys is reduced, the percentage is recalculated', async t => {
         //Open the first key in the tree view and remove
         await t.click(browserPage.treeViewButton);
+        await t.expect(browserPage.treeViewDeviceFolder.visible).ok('The key folder is displayed', { timeout: 60000 });
         await t.click(browserPage.treeViewDeviceFolder);
         const numberOfKeys = await browserPage.treeViewDeviceKyesCount.textContent;
         const keyFolder = await browserPage.treeViewDeviceFolder.nth(2).textContent;