diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js
index 53856d6ae4..4ef226ccba 100644
--- a/test/components/datagrid/datagrid.e2e-spec.js
+++ b/test/components/datagrid/datagrid.e2e-spec.js
@@ -12,7 +12,8 @@ const openPersonalizationDialog = async () => {
   await element(by.css('li a[data-option="personalize-columns"')).click();
   await browser.driver.sleep(config.sleep);
   await browser.driver
-    .wait(protractor.ExpectedConditions.presenceOf(await element.all(by.css('input[data-column-id="hidden"]')).last()), config.waitsFor);
+    .wait(protractor.ExpectedConditions.visibilityOf(await element(by.css('.modal-content'))), config.waitsFor);
+  await browser.driver.sleep(config.sleep);
 };
 
 describe('Datagrid Alternate Row Tests', () => {
diff --git a/test/components/timepicker/timepicker-settings.func-spec.js b/test/components/timepicker/timepicker-settings.func-spec.js
index 6601b72ebb..445739e4bf 100644
--- a/test/components/timepicker/timepicker-settings.func-spec.js
+++ b/test/components/timepicker/timepicker-settings.func-spec.js
@@ -30,7 +30,8 @@ describe('TimePicker settings', () => {
 
   it('Should set settings', () => {
     const settings = {
-      locale: '',
+      locale: null,
+      language: null,
       timeFormat: 'HH:mm:ss',
       minuteInterval: 5,
       secondInterval: 5,
@@ -45,7 +46,8 @@ describe('TimePicker settings', () => {
 
   it('Should update set settings via data', () => {
     const settings = {
-      locale: '',
+      locale: null,
+      language: null,
       timeFormat: 'HH:mm:ss',
       minuteInterval: 10,
       secondInterval: 10,
@@ -64,7 +66,8 @@ describe('TimePicker settings', () => {
 
   it('Should update set settings via parameter', () => {
     const settings = {
-      locale: '',
+      locale: null,
+      language: null,
       timeFormat: 'HH:mm:ss',
       minuteInterval: 10,
       secondInterval: 10,