diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
index 8ef77d2a9d..d7d50aedb3 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
@@ -636,7 +636,7 @@ public class JBPMEngine extends BPMEngine
                     }
                     else
                     {
-                        Node node = taskInstance.getTask().getTaskNode();
+                        Node node = taskInstance.getToken().getNode();
                         if (node.getLeavingTransition(transition) == null)
                         {
                             throw new WorkflowException("Transition '" + transition + "' is invalid for Workflow task '" + taskId + "'");
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java
index 36fcf875e2..0f9d53b058 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java
@@ -60,8 +60,6 @@ public class JBPMEngineTest extends BaseSpringTest
         workflowDefinitionComponent = registry.getWorkflowDefinitionComponent("jbpm");
         workflowComponent = registry.getWorkflowComponent("jbpm");
         taskComponent = registry.getTaskComponent("jbpm");
-        
-
     }
 
     
@@ -268,11 +266,9 @@ public class JBPMEngineTest extends BaseSpringTest
     public void testSignal()
     {
         WorkflowDefinition workflowDef = getTestDefinition();
-        Map<QName, Serializable> parameters = new HashMap<QName, Serializable>();
-        parameters.put(QName.createQName(NamespaceService.DEFAULT_URI, "reviewer"), "admin");
-        WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters);
+        WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, null);
         assertNotNull(path);
-        WorkflowPath updatedPath = workflowComponent.signal(path.id, path.node.transitions[0]);
+        WorkflowPath updatedPath = workflowComponent.signal(path.id, path.node.transitions[1]);
         assertNotNull(updatedPath);
     }
     
@@ -285,8 +281,11 @@ public class JBPMEngineTest extends BaseSpringTest
         WorkflowPath path = workflowComponent.startWorkflow(workflowDef.id, parameters);
         assertNotNull(path);
         assertNotNull(path);
-        WorkflowPath updatedPath = workflowComponent.signal(path.id, path.node.transitions[0]);
-        assertNotNull(updatedPath);
+        List<WorkflowTask> tasks = workflowComponent.getTasksForWorkflowPath(path.id);
+        assertNotNull(tasks);
+        assertEquals(1, tasks.size());
+        WorkflowTask updatedTask = taskComponent.endTask(tasks.get(0).id, path.node.transitions[0]);
+        assertNotNull(updatedTask);
         List<WorkflowTask> completedTasks = taskComponent.getAssignedTasks("admin", WorkflowTaskState.COMPLETED);
         assertNotNull(completedTasks);
         assertEquals(0, completedTasks.size());
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml b/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml
index 55dec354b3..1b242cb5ba 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml
+++ b/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml
@@ -3,12 +3,13 @@
 <process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="Review and Approve">
    <swimlane name="Initiator"></swimlane>
    <start-state name="start">
-     <task name="Submit" swimlane="Initiator">
+     <task name="Submit" swimlane="Initiator" blocking="true">
         <controller>
-          <variable name="reviewer" />
+          <variable name="reviewer" access="write,required" />
         </controller>
       </task>
       <transition name="" to="Review"></transition>
+      <transition name="end" to="end"></transition>
    </start-state>
    <swimlane name="Reviewer">
       <assignment actor-id="#{reviewer}"></assignment>
@@ -22,7 +23,6 @@
       <transition name="reject" to="Rejected"></transition>
       <transition name="approve" to="Approved"></transition>
    </task-node>
-   <end-state name="end"></end-state>
    <task-node name="Rejected">
       <task name="Rejected" swimlane="Initiator">
          <controller>
@@ -39,4 +39,5 @@
       </task>
       <transition name="" to="end"></transition>
    </task-node>
+   <end-state name="end"></end-state>
 </process-definition>
\ No newline at end of file