diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/NoneEndEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/NoneEndEventActivityBehavior.java
index e7e37b3bedc1f92badf212a1046214c89ad699f3..e0d28fde52178525855e2b6f99a593e924a1a7fb 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/NoneEndEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/NoneEndEventActivityBehavior.java
@@ -20,8 +20,10 @@ import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
  */
 public class NoneEndEventActivityBehavior extends FlowNodeActivityBehavior {
 
+    private static final long serialVersionUID = 1L;
+
     public void execute(ActivityExecution execution) {
-        Context.getAgenda().planEndExecutionOperation(execution);
+        Context.getAgenda().planTakeOutgoingSequenceFlowsOperation(execution);
     }
 
 }
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ProcessInstanceEventsTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ProcessInstanceEventsTest.java
index c1d07de3333def27a050729959347ddf15933b0a..8e09e3df152b879317fe2399590e47855ad8db59 100755
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ProcessInstanceEventsTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/event/ProcessInstanceEventsTest.java
@@ -282,7 +282,8 @@ public class ProcessInstanceEventsTest extends PluggableActivitiTestCase {
     public void testProcessCompleted_ParallelGatewayTwoEnds() throws Exception {
         this.runtimeService.startProcessInstanceByKey("noEndProcess");
 
-        assertEquals("ActivitiEventType.PROCESS_COMPLETED was expected 1 time.", 1, listener.filterEvents(ActivitiEventType.PROCESS_COMPLETED).size());
+        List<ActivitiEvent> events = listener.filterEvents(ActivitiEventType.PROCESS_COMPLETED);
+        assertEquals("ActivitiEventType.PROCESS_COMPLETED was expected 2 times.", 2, events.size());
     }
 
     @Deployment(resources = { "org/activiti/engine/test/api/runtime/oneTaskProcess.bpmn20.xml" })