diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
index a70f4d2751..3a2383ff6c 100644
--- a/e2e/protractor.excludes.json
+++ b/e2e/protractor.excludes.json
@@ -12,5 +12,6 @@
   "C216430": "https://alfresco.atlassian.net/browse/ACS-4595",
   "C280063": "https://alfresco.atlassian.net/browse/ACS-4595",
   "C280064": "https://alfresco.atlassian.net/browse/ACS-4595",
-  "C280407": "https://alfresco.atlassian.net/browse/ACS-4595"
+  "C280407": "https://alfresco.atlassian.net/browse/ACS-4595",
+  "C277288": "https://alfresco.atlassian.net/browse/AAE-15475"
 }
diff --git a/lib/testing/src/lib/protractor/core/pages/material/date-time-picker-calendar.page.ts b/lib/testing/src/lib/protractor/core/pages/material/date-time-picker-calendar.page.ts
index 0c76b3ced7..aa4029c0db 100644
--- a/lib/testing/src/lib/protractor/core/pages/material/date-time-picker-calendar.page.ts
+++ b/lib/testing/src/lib/protractor/core/pages/material/date-time-picker-calendar.page.ts
@@ -21,8 +21,8 @@ import { BrowserActions } from '../../utils/browser-actions';
 
 export class DateTimePickerCalendarPage {
 
-    datePicker = $(`.mat-datepicker-calendar`);
-    today = $(`.mat-calendar-body-today`);
+    datePicker = $(`[class*='picker-content']`);
+    today = $(`[class*='calendar-body-today']`);
     timePicker = $('.mat-datetimepicker-clock');
     hourTime = $$('.mat-datetimepicker-clock-hours .mat-datetimepicker-clock-cell').first();
     minutesTime = $$('.mat-datetimepicker-clock-minutes .mat-datetimepicker-clock-cell').first();