diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
index adcae5f0f..6c4f1960d 100644
--- a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
+++ b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
@@ -10,7 +10,7 @@
       [disabled]="actionRef.disabled"
       #matTrigger="matMenuTrigger"
     >
-      <span *ngIf="actionRef.title" data-automation-id="menu-item-title">{{ actionRef.title | translate }}</span>
+      <span *ngIf="actionRef.title" data-automation-id="mat-button-menu-item-title">{{ actionRef.title | translate }}</span>
     </button>
   </ng-container>
 
@@ -25,7 +25,7 @@
       [disabled]="actionRef.disabled"
       #matTrigger="matMenuTrigger"
     >
-      <span *ngIf="actionRef.title" data-automation-id="menu-item-title">{{ actionRef.title | translate }}</span>
+      <span *ngIf="actionRef.title" data-automation-id="mat-flat-button-menu-item-title">{{ actionRef.title | translate }}</span>
     </button>
   </ng-container>
 
diff --git a/projects/aca-testing-shared/src/components/search/search-input.ts b/projects/aca-testing-shared/src/components/search/search-input.ts
index 6e7adb143..f1b163a5b 100755
--- a/projects/aca-testing-shared/src/components/search/search-input.ts
+++ b/projects/aca-testing-shared/src/components/search/search-input.ts
@@ -29,7 +29,7 @@ import { BrowserActions, BrowserVisibility, TestElement } from '@alfresco/adf-te
 
 export class SearchInput extends Component {
   get searchButton() {
-    return browser.element(by.css('.app-search-button'));
+    return browser.element(by.css('aca-search-input .app-search-button'));
   }
 
   searchContainer = browser.element(by.css('.app-search-container'));