diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/migration/CaseInstanceEventSubscriptionMigrationTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/migration/CaseInstanceEventSubscriptionMigrationTest.java
new file mode 100644
index 00000000000..445031400ba
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/migration/CaseInstanceEventSubscriptionMigrationTest.java
@@ -0,0 +1,263 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.flowable.cmmn.test.migration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.flowable.cmmn.api.history.HistoricPlanItemInstance;
+import org.flowable.cmmn.api.migration.PlanItemDefinitionMappingBuilder;
+import org.flowable.cmmn.api.repository.CaseDefinition;
+import org.flowable.cmmn.api.runtime.CaseInstance;
+import org.flowable.cmmn.api.runtime.PlanItemDefinitionType;
+import org.flowable.cmmn.api.runtime.PlanItemInstance;
+import org.flowable.cmmn.api.runtime.PlanItemInstanceState;
+import org.flowable.cmmn.engine.test.impl.CmmnHistoryTestHelper;
+import org.flowable.common.engine.impl.history.HistoryLevel;
+import org.flowable.eventsubscription.api.EventSubscription;
+import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.junit.jupiter.api.Test;
+
+public class CaseInstanceEventSubscriptionMigrationTest extends AbstractCaseMigrationTest {
+
+    @Test
+    void withBasicEventRegistryEvent() {
+        // Arrange
+        deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener.cmmn.xml");
+        CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("testCase").start();
+        CaseDefinition destinationDefinition = deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener-extratask.cmmn.xml");
+
+        List<EventSubscription> eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        // Act
+        cmmnMigrationService.createCaseInstanceMigrationBuilder()
+                .migrateToCaseDefinition(destinationDefinition.getId())
+                .addActivatePlanItemDefinitionMapping(PlanItemDefinitionMappingBuilder.createActivatePlanItemDefinitionMappingFor("humanTask2"))
+                .migrate(caseInstance.getId());
+
+        // Assert
+        CaseInstance caseInstanceAfterMigration = cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .singleResult();
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionKey()).isEqualTo("testCase");
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionVersion()).isEqualTo(2);
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionDeploymentId()).isEqualTo(destinationDefinition.getDeploymentId());
+        List<PlanItemInstance> planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .list();
+        assertThat(planItemInstances).hasSize(3);
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getCaseDefinitionId)
+                .containsOnly(destinationDefinition.getId());
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getName)
+                .containsExactlyInAnyOrder("Event", "My new taskname 1", "Task 2");
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getState)
+                .containsOnly(PlanItemInstanceState.AVAILABLE, PlanItemInstanceState.ACTIVE);
+        
+        eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        List<Task> tasks = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(tasks).hasSize(2);
+        for (Task task : tasks) {
+            assertThat(task.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            cmmnTaskService.complete(task.getId());
+        }
+        
+        planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(planItemInstances).hasSize(1);
+        cmmnRuntimeService.triggerPlanItemInstance(planItemInstances.get(0).getId());
+        
+        assertThat(cmmnRuntimeService.createCaseInstanceQuery().caseInstanceId(caseInstance.getId()).count()).isZero();
+
+        if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).count()).isEqualTo(1);
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).singleResult().getCaseDefinitionId())
+                .isEqualTo(destinationDefinition.getId());
+
+            List<HistoricPlanItemInstance> historicPlanItemInstances = cmmnHistoryService.createHistoricPlanItemInstanceQuery()
+                .planItemInstanceCaseInstanceId(caseInstance.getId()).list();
+            assertThat(historicPlanItemInstances).hasSize(3);
+            for (HistoricPlanItemInstance historicPlanItemInstance : historicPlanItemInstances) {
+                assertThat(historicPlanItemInstance.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+
+            List<HistoricTaskInstance> historicTasks = cmmnHistoryService.createHistoricTaskInstanceQuery().caseInstanceId(caseInstance.getId()).list();
+            assertThat(historicTasks).hasSize(2);
+            for (HistoricTaskInstance historicTask : historicTasks) {
+                assertThat(historicTask.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+        }
+    }
+    
+    @Test
+    void withEventRegistryEventWithRepetition() {
+        // Arrange
+        deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener-repetition.cmmn.xml");
+        CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("testCase").start();
+        
+        PlanItemInstance planItemInstance = cmmnRuntimeService.createPlanItemInstanceQuery().caseInstanceId(caseInstance.getId()).planItemDefinitionType(PlanItemDefinitionType.GENERIC_EVENT_LISTENER).singleResult();
+        assertThat(planItemInstance).isNotNull();
+        cmmnRuntimeService.triggerPlanItemInstance(planItemInstance.getId());
+        
+        CaseDefinition destinationDefinition = deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener-repetition-extratask.cmmn.xml");
+
+        List<EventSubscription> eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        // Act
+        cmmnMigrationService.createCaseInstanceMigrationBuilder()
+                .migrateToCaseDefinition(destinationDefinition.getId())
+                .addActivatePlanItemDefinitionMapping(PlanItemDefinitionMappingBuilder.createActivatePlanItemDefinitionMappingFor("humanTask2"))
+                .migrate(caseInstance.getId());
+
+        // Assert
+        CaseInstance caseInstanceAfterMigration = cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .singleResult();
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionKey()).isEqualTo("testCase");
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionVersion()).isEqualTo(2);
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionDeploymentId()).isEqualTo(destinationDefinition.getDeploymentId());
+        List<PlanItemInstance> planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .list();
+        assertThat(planItemInstances).hasSize(3);
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getCaseDefinitionId)
+                .containsOnly(destinationDefinition.getId());
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getName)
+                .containsExactlyInAnyOrder("Event", "My new taskname 1", "Task 2");
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getState)
+                .containsOnly(PlanItemInstanceState.AVAILABLE, PlanItemInstanceState.ACTIVE);
+        
+        eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        List<Task> tasks = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(tasks).hasSize(2);
+        for (Task task : tasks) {
+            assertThat(task.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            cmmnTaskService.complete(task.getId());
+        }
+        
+        planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(planItemInstances).hasSize(1);
+        cmmnRuntimeService.triggerPlanItemInstance(planItemInstances.get(0).getId());
+        
+        if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).count()).isEqualTo(1);
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).singleResult().getCaseDefinitionId())
+                .isEqualTo(destinationDefinition.getId());
+
+            List<HistoricPlanItemInstance> historicPlanItemInstances = cmmnHistoryService.createHistoricPlanItemInstanceQuery()
+                .planItemInstanceCaseInstanceId(caseInstance.getId()).list();
+            assertThat(historicPlanItemInstances).hasSize(5);
+            for (HistoricPlanItemInstance historicPlanItemInstance : historicPlanItemInstances) {
+                assertThat(historicPlanItemInstance.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+
+            List<HistoricTaskInstance> historicTasks = cmmnHistoryService.createHistoricTaskInstanceQuery().caseInstanceId(caseInstance.getId()).list();
+            assertThat(historicTasks).hasSize(2);
+            for (HistoricTaskInstance historicTask : historicTasks) {
+                assertThat(historicTask.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+        }
+    }
+    
+    @Test
+    void withEventRegistryEventWithRepetitionInStage() {
+        // Arrange
+        deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition.cmmn.xml");
+        CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("testCase").start();
+        
+        PlanItemInstance planItemInstance = cmmnRuntimeService.createPlanItemInstanceQuery().caseInstanceId(caseInstance.getId()).planItemDefinitionType(PlanItemDefinitionType.GENERIC_EVENT_LISTENER).singleResult();
+        assertThat(planItemInstance).isNotNull();
+        cmmnRuntimeService.triggerPlanItemInstance(planItemInstance.getId());
+        
+        CaseDefinition destinationDefinition = deployCaseDefinition("test1", "org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition-extratask.cmmn.xml");
+
+        List<EventSubscription> eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        // Act
+        cmmnMigrationService.createCaseInstanceMigrationBuilder()
+                .migrateToCaseDefinition(destinationDefinition.getId())
+                .addActivatePlanItemDefinitionMapping(PlanItemDefinitionMappingBuilder.createActivatePlanItemDefinitionMappingFor("humanTask3"))
+                .migrate(caseInstance.getId());
+
+        // Assert
+        CaseInstance caseInstanceAfterMigration = cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .singleResult();
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionKey()).isEqualTo("testCase");
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionVersion()).isEqualTo(2);
+        assertThat(caseInstanceAfterMigration.getCaseDefinitionDeploymentId()).isEqualTo(destinationDefinition.getDeploymentId());
+        List<PlanItemInstance> planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery()
+                .caseInstanceId(caseInstance.getId())
+                .list();
+        assertThat(planItemInstances).hasSize(6);
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getCaseDefinitionId)
+                .containsOnly(destinationDefinition.getId());
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getName)
+                .containsExactlyInAnyOrder("Stage", "Event", "Task 1", "Task 2", "Task 1", "Task 3");
+        assertThat(planItemInstances)
+                .extracting(PlanItemInstance::getState)
+                .containsOnly(PlanItemInstanceState.WAITING_FOR_REPETITION, PlanItemInstanceState.AVAILABLE, PlanItemInstanceState.ACTIVE);
+        
+        eventSubscriptions = cmmnRuntimeService.createEventSubscriptionQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(eventSubscriptions).hasSize(1);
+        
+        List<Task> tasks = cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).list();
+        assertThat(tasks).hasSize(3);
+        for (Task task : tasks) {
+            assertThat(task.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            cmmnTaskService.complete(task.getId());
+        }
+        
+        planItemInstances = cmmnRuntimeService.createPlanItemInstanceQuery().caseInstanceId(caseInstance.getId()).planItemDefinitionType(PlanItemDefinitionType.GENERIC_EVENT_LISTENER).list();
+        assertThat(planItemInstances).hasSize(1);
+        cmmnRuntimeService.triggerPlanItemInstance(planItemInstances.get(0).getId());
+        
+        if (CmmnHistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, cmmnEngineConfiguration)) {
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).count()).isEqualTo(1);
+            assertThat(cmmnHistoryService.createHistoricCaseInstanceQuery().caseInstanceId(caseInstance.getId()).singleResult().getCaseDefinitionId())
+                .isEqualTo(destinationDefinition.getId());
+
+            List<HistoricPlanItemInstance> historicPlanItemInstances = cmmnHistoryService.createHistoricPlanItemInstanceQuery()
+                .planItemInstanceCaseInstanceId(caseInstance.getId()).list();
+            assertThat(historicPlanItemInstances).hasSize(9);
+            for (HistoricPlanItemInstance historicPlanItemInstance : historicPlanItemInstances) {
+                assertThat(historicPlanItemInstance.getCaseDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+
+            List<HistoricTaskInstance> historicTasks = cmmnHistoryService.createHistoricTaskInstanceQuery().caseInstanceId(caseInstance.getId()).list();
+            assertThat(historicTasks).hasSize(4);
+            for (HistoricTaskInstance historicTask : historicTasks) {
+                assertThat(historicTask.getScopeDefinitionId()).isEqualTo(destinationDefinition.getId());
+            }
+        }
+    }
+}
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-extratask.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-extratask.cmmn.xml
new file mode 100644
index 00000000000..063316f0ce9
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-extratask.cmmn.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Event" definitionRef="eventListener1" />      
+      <planItem id="planItem2" name="My new taskname 1" definitionRef="humanTask1" />
+      <planItem id="planItem3" name="Task 2" definitionRef="humanTask2" />
+      
+      <humanTask id="humanTask1" name="My new taskname 1" />
+      <humanTask id="humanTask2" name="Task 2" />
+      <eventListener id="eventListener1" name="Event">
+        <extensionElements>
+          <flowable:eventType>myEvent</flowable:eventType>
+        </extensionElements>
+      </eventListener>
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition-extratask.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition-extratask.cmmn.xml
new file mode 100644
index 00000000000..0658ae28b5f
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition-extratask.cmmn.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Event" definitionRef="eventListener1">
+        <itemControl>
+          <repetitionRule flowable:counterVariable="repetitionCounter" />
+        </itemControl>
+      </planItem>      
+      <planItem id="planItem2" name="My new taskname 1" definitionRef="humanTask1" />
+      <planItem id="planItem3" name="Task 2" definitionRef="humanTask2" />
+      
+      <humanTask id="humanTask1" name="My new taskname 1" />
+      <humanTask id="humanTask2" name="Task 2" />
+      <eventListener id="eventListener1" name="Event">
+        <extensionElements>
+          <flowable:eventType>myEvent</flowable:eventType>
+        </extensionElements>
+      </eventListener>
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition.cmmn.xml
new file mode 100644
index 00000000000..98e7fb59294
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-repetition.cmmn.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Event" definitionRef="eventListener1">
+        <itemControl>
+          <repetitionRule flowable:counterVariable="repetitionCounter" />
+        </itemControl>
+      </planItem>      
+      <planItem id="planItem2" name="My new taskname 1" definitionRef="humanTask1" />
+      
+      <humanTask id="humanTask1" name="My new taskname 1" />
+      <eventListener id="eventListener1" name="Event">
+        <extensionElements>
+          <flowable:eventType>myEvent</flowable:eventType>
+        </extensionElements>
+      </eventListener>
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition-extratask.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition-extratask.cmmn.xml
new file mode 100644
index 00000000000..498f095f090
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition-extratask.cmmn.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Stage" definitionRef="stage1" />
+      <planItem id="planItem5" name="Task 3" definitionRef="humanTask3" />
+      
+      <stage id="stage1" name="Stage">
+        <planItem id="planItem2" name="Event" definitionRef="eventListener1">
+            <itemControl>
+              <repetitionRule flowable:counterVariable="repetitionCounter" />
+            </itemControl>
+        </planItem>
+        <planItem id="planItem3" name="Task 1" definitionRef="humanTask1">
+            <itemControl>
+              <repetitionRule flowable:counterVariable="repetitionCounter" />
+            </itemControl>
+            <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry" />
+        </planItem>      
+        <planItem id="planItem4" name="Task 2" definitionRef="humanTask2" />
+        <sentry id="sentrycmmnEntrySentry">
+            <planItemOnPart id="sentryOnPartcmmnEntrySentry" sourceRef="planItem2">
+              <standardEvent>occur</standardEvent>
+            </planItemOnPart>
+        </sentry>
+        <humanTask id="humanTask1" name="Task 1" />
+        <humanTask id="humanTask2" name="Task 2" />
+        <eventListener id="eventListener1" name="Event">
+            <extensionElements>
+                <flowable:eventType>myEvent</flowable:eventType>
+            </extensionElements>
+        </eventListener>
+      </stage>
+      
+      <humanTask id="humanTask3" name="Task 3" />
+      
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition.cmmn.xml
new file mode 100644
index 00000000000..83404ae4721
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener-stage-repetition.cmmn.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Stage" definitionRef="stage1" />
+      
+      <stage id="stage1" name="Stage">
+        <planItem id="planItem2" name="Event" definitionRef="eventListener1">
+            <itemControl>
+              <repetitionRule flowable:counterVariable="repetitionCounter" />
+            </itemControl>
+        </planItem>
+        <planItem id="planItem3" name="Task 1" definitionRef="humanTask1">
+            <itemControl>
+              <repetitionRule flowable:counterVariable="repetitionCounter" />
+            </itemControl>
+            <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry" />
+        </planItem>      
+        <planItem id="planItem4" name="Task 2" definitionRef="humanTask2" />
+        <sentry id="sentrycmmnEntrySentry">
+            <planItemOnPart id="sentryOnPartcmmnEntrySentry" sourceRef="planItem2">
+              <standardEvent>occur</standardEvent>
+            </planItemOnPart>
+        </sentry>
+        <humanTask id="humanTask1" name="Task 1" />
+        <humanTask id="humanTask2" name="Task 2" />
+        <eventListener id="eventListener1" name="Event">
+            <extensionElements>
+                <flowable:eventType>myEvent</flowable:eventType>
+            </extensionElements>
+        </eventListener>
+      </stage>
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener.cmmn.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener.cmmn.xml
new file mode 100644
index 00000000000..762b70edf43
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/migration/event-registry-listener.cmmn.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:flowable="http://flowable.org/cmmn" xmlns:cmmndi="http://www.omg.org/spec/CMMN/20151109/CMMNDI" xmlns:dc="http://www.omg.org/spec/CMMN/20151109/DC" xmlns:di="http://www.omg.org/spec/CMMN/20151109/DI" xmlns:design="http://flowable.org/design" targetNamespace="http://flowable.org/cmmn">
+  <case id="testCase" flowable:initiatorVariableName="initiator">
+    <casePlanModel id="onecaseplanmodel1" name="Case plan model">
+      
+      <planItem id="planItem1" name="Event" definitionRef="eventListener1" />      
+      <planItem id="planItem2" name="My new taskname 1" definitionRef="humanTask1" />
+      
+      <humanTask id="humanTask1" name="My new taskname 1" />
+      <eventListener id="eventListener1" name="Event">
+        <extensionElements>
+          <flowable:eventType>myEvent</flowable:eventType>
+        </extensionElements>
+      </eventListener>
+    </casePlanModel>
+  </case>
+</definitions>
\ No newline at end of file