diff --git a/libs/core/popover/base/base-popover.class.ts b/libs/core/popover/base/base-popover.class.ts
index 476e193114f..50d3a2bd7a8 100644
--- a/libs/core/popover/base/base-popover.class.ts
+++ b/libs/core/popover/base/base-popover.class.ts
@@ -167,7 +167,7 @@ export class BasePopoverClass {
     beforeOpen = new EventEmitter();
 
     /** @hidden Aria role for the popover body. */
-    _bodyRole: string | null = null;
+    _bodyRole: string | null = 'dialog';
 
     /** @hidden ID for the popover body. */
     _bodyId: string | null = null;
diff --git a/libs/core/popover/popover-body/popover-body.component.ts b/libs/core/popover/popover-body/popover-body.component.ts
index b441f56af3a..30bd6e2956a 100644
--- a/libs/core/popover/popover-body/popover-body.component.ts
+++ b/libs/core/popover/popover-body/popover-body.component.ts
@@ -98,7 +98,7 @@ export class PopoverBodyComponent implements AfterViewInit {
     _closeOnEscapeKey = false;
 
     /** @hidden Aria role for the popover body. */
-    _bodyRole: Nullable<string> = null;
+    _bodyRole: Nullable<string> = 'dialog';
 
     /** @hidden Aria role for the popover body. */
     _bodyId: Nullable<string> = null;
diff --git a/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts b/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts
index 8cfde260aad..ca31489529b 100644
--- a/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts
+++ b/libs/docs/core/multi-combobox/e2e/multi-combobox.po.ts
@@ -16,7 +16,7 @@ export class MultiComboboxPo extends CoreBaseComponentPo {
     listItem = this.list + ' li.fd-list__item[role="option"]';
     selectedListItem = `${this.list} .fd-list__item.is-selected .fd-list__title`;
 
-    dialog = '[role="dialog"]';
+    dialog = '.fd-dialog';
     dialogButton = this.dialog + ' .fd-button';
     dialogListItem = this.dialog + ' .fd-list__item[role="option"]';
     selectedDialogItem = this.dialog + ' .fd-list__item.is-selected .fd-list__title';
diff --git a/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts b/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts
index 8861c26ba18..099ae097ff9 100644
--- a/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts
+++ b/libs/docs/platform/multi-combobox/e2e/multi-combobox.po.ts
@@ -16,7 +16,7 @@ export class MultiComboboxPo extends PlatformBaseComponentPo {
     listItem = this.list + ' li.fd-list__item[role="option"]';
     selectedListItem = `${this.list} .fd-list__item.is-selected .fd-list__title`;
 
-    dialog = '[role="dialog"]';
+    dialog = '.fd-dialog';
     dialogButton = this.dialog + ' .fd-button';
     dialogListItem = this.dialog + ' .fd-list__item[role="option"]';
     selectedDialogItem = this.dialog + ' .fd-list__item.is-selected .fd-list__title';
diff --git a/libs/docs/platform/multi-input/e2e/multi-input.po.ts b/libs/docs/platform/multi-input/e2e/multi-input.po.ts
index 58a3ca8ca88..ea16be94c38 100644
--- a/libs/docs/platform/multi-input/e2e/multi-input.po.ts
+++ b/libs/docs/platform/multi-input/e2e/multi-input.po.ts
@@ -15,7 +15,7 @@ export class MultiInputPo extends PlatformBaseComponentPo {
     expandedDropdown = 'fdp-list .fd-list';
     activeDropdownButtons = 'button[aria-label="value-help"]';
     activeInputs = '.fd-input-group.fd-input-group--control input';
-    mobileInput = 'div[role="dialog"] input';
+    mobileInput = '.fd-dialog input';
     filledInput = '.fd-tokenizer__inner';
     approveButton = '[fdtype="emphasized"]';
     groupHeader = '.fd-list__group-header';
diff --git a/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts b/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts
index 9912212069a..246c56e4128 100644
--- a/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts
+++ b/libs/docs/platform/table/e2e/table-settings-dialog.e2e-spec.ts
@@ -137,7 +137,7 @@ describe('Table component test suite', () => {
         it('should check filtering by status color positive', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect((await getText(tableCellStatusColor, 1)).trim()).withContext('positive');
         });
@@ -145,7 +145,7 @@ describe('Table component test suite', () => {
         it('should check filtering by status color negative', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect((await getText(tableCellStatusColor, 2)).trim()).withContext('negative');
         });
@@ -153,7 +153,7 @@ describe('Table component test suite', () => {
         it('should check no filter results', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li.last-child');
+            const elem = await $('li.last-child');
             elem.click();
             await expect(await doesItExist(tableFilterableExample + tableRow)).withContext(false, '');
         });
@@ -161,7 +161,7 @@ describe('Table component test suite', () => {
         it('should check filtering by status', async () => {
             await scrollIntoView(tableFilterableExample);
             await click(tableFilterableExample + toolbarButton);
-            const elem = $('li:nth-child(2)');
+            const elem = await $('li:nth-child(2)');
             elem.click();
             const rowLength = await getElementArrayLength(tableFilterableExample + tableRow);
             for (let i = 0; i < rowLength; i++) {