diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
index d8497f20df..16d0980450 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
@@ -82,10 +82,20 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
   });
 
   it("Datepicker input value changes to work with selected date formats", function() {
+    cy.openPropertyPane("datepickerwidget2");
+    cy.get(".t--property-control-mindate .bp3-input")
+      .clear()
+      .type("2021-01-01");
+    cy.closePropertyPane();
+    cy.openPropertyPane("datepickerwidget2");
+    cy.get(".t--property-control-maxdate .bp3-input")
+      .clear()
+      .type("2021-10-10");
+    cy.closePropertyPane();
     cy.openPropertyPane("datepickerwidget2");
     cy.get(".t--property-control-defaultdate .bp3-input").clear();
-    cy.get(formWidgetsPage.toggleJsDefaultDate).click();
     cy.selectDateFormat("DD/MM/YYYY HH:mm");
+    cy.get(formWidgetsPage.toggleJsDefaultDate).click();
     cy.testJsontext(
       "defaultdate",
       '{{moment("04/05/2021 05:25", "DD/MM/YYYY HH:mm").toISOString()}}',
@@ -98,6 +108,7 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
     cy.selectDateFormat("LLL");
     cy.SearchEntityandOpen("Text1");
     cy.testJsontext("text", "{{DatePicker1.formattedDate}}");
+    cy.wait("@updateLayout");
     cy.get(".t--draggable-textwidget .bp3-ui-text")
       .first()
       .should("have.text", "May 4, 2021 6:25 AM");