diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature
index e74ed7c4f8..f6ac348149 100644
--- a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature
+++ b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature
@@ -21,9 +21,9 @@ Feature: User interacts with the Enrollment New Event Workspace
     And the user selects Positive
     And you click the Save without completing button
     Then all events should be displayed
-    And the newest event in datatable nr 1 should contain Active
-    And the newest event in datatable nr 1 should contain 13
-    And the newest event in datatable nr 1 should contain Positive
+    And the newest event in datatable nr 2 should contain Active
+    And the newest event in datatable nr 2 should contain 13
+    And the newest event in datatable nr 2 should contain Positive
     And the events in Sputum smear microscopy are deleted
 
   Scenario: Required fields should display an error when saving without data
diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js
index 7a8523cfa6..8870d88e19 100644
--- a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js
+++ b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js
@@ -132,7 +132,7 @@ Then('all events should be displayed', () => {
 });
 
 Then(/^the newest event in datatable nr (.*) should contain (.*)$/, (eq, status) => {
-    cy.get('[data-test="dhis2-uicore-datatable"]')
+    cy.get('[data-test="stage-content"]')
         .eq(eq)
         .within(() => {
             cy.get('[data-test="dhis2-uicore-datatablerow"]')
diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
index 31ab0f99c8..b0eb978b21 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature
@@ -77,6 +77,7 @@ And the user see the following text: 11
     When the user clicks on the cancel button
     Then the user is navigated to the enrollment dashboard
 
+@with-restore-event-schedule-date
 Scenario: User can update schedule date for a scheduled event
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=RIrfCcEP8Uu&orgUnitId=DiszpKrYNg8
     Then the view enrollment event form is in edit mode
diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
index 3f42786176..46c7045b98 100644
--- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
+++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -1,6 +1,18 @@
-import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When, Before } from '@badeball/cypress-cucumber-preprocessor';
 import { getCurrentYear } from '../../../support/date';
 
+Before({ tags: '@with-restore-event-schedule-date' }, () => {
+    cy.buildApiUrl('tracker', 'events/RIrfCcEP8Uu')
+        .then(url => cy.request(url))
+        .then((apiResponse) => {
+            const event = apiResponse.body;
+            const eventToUpdate = { ...event, scheduledAt: `${getCurrentYear() - 15}-01-07` };
+            return cy
+                .buildApiUrl('tracker?async=false&importStrategy=UPDATE')
+                .then(eventUrl => cy.request('POST', eventUrl, { events: [eventToUpdate] }));
+        });
+});
+
 const changeEnrollmentAndEventsStatus = () => (
     cy.buildApiUrl(
         'tracker',