diff --git a/config/alfresco/hibernate-context.xml b/config/alfresco/hibernate-context.xml
index f276c7502d..d78f49c06b 100644
--- a/config/alfresco/hibernate-context.xml
+++ b/config/alfresco/hibernate-context.xml
@@ -180,6 +180,7 @@
                 <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value>
                 <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value>
                 <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value>
+                <value>org/jbpm/job/CleanUpProcessJob.hbm.xml</value>
             </list>
         </property>
         <property name="hibernateProperties" ref="hibernateConfigProperties" />
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java
index 3ae50c695e..c9ef5d1f08 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java
@@ -129,7 +129,15 @@ public class WorkflowServiceImplTest extends BaseSpringTest
         assertNotNull(nodeRef);
         assertTrue(nodeService.hasAspect(nodeRef, WorkflowModel.ASPECT_WORKFLOW_PACKAGE));
         ChildAssociationRef childAssoc = nodeService.createNode(rootRef, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_PREFIX, "test"), ContentModel.TYPE_CONTENT, null);
-        nodeService.addChild(nodeRef, childAssoc.getChildRef(), ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_PREFIX, "test"));
+
+        List<WorkflowInstance> exisingInstances = workflowService.getWorkflowsForContent(childAssoc.getChildRef(), true);
+        int size = 0;
+        if (exisingInstances != null)
+        {
+            size = exisingInstances.size();
+        }
+        
+        nodeService.addChild(nodeRef, childAssoc.getChildRef(), ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_PREFIX, "test123"));
         
         // start workflow
         List<WorkflowDefinition> workflowDefs = workflowService.getDefinitions();
@@ -154,8 +162,29 @@ public class WorkflowServiceImplTest extends BaseSpringTest
         // get workflows for content
         List<WorkflowInstance> instances = workflowService.getWorkflowsForContent(childAssoc.getChildRef(), true);
         assertNotNull(instances);
-        assertEquals(1, instances.size());
-        assertEquals(instances.get(0).id, path.instance.id);
+        assertEquals(size + 1, instances.size());
+
+        for (WorkflowInstance instance : instances)
+        {
+            boolean fNew = true;
+            for (WorkflowInstance exisingInstance : exisingInstances)
+            {
+                if (instance.id.equals(exisingInstance.id))
+                {
+                    fNew = false;
+                    break;
+                }
+                fNew = true;
+                break;
+            }
+
+            if (fNew)
+            {
+                assertEquals(instance.id, path.instance.id);
+            }
+
+        }
+        
         List<WorkflowInstance> completedInstances = workflowService.getWorkflowsForContent(childAssoc.getChildRef(), false);
         assertNotNull(completedInstances);
         assertEquals(0, completedInstances.size());
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
index d0be26505f..cfd84815be 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
@@ -90,15 +90,6 @@ public class AlfrescoTimer extends Timer
             public Boolean doWork() throws Exception
             {
                 boolean deleteTimer = AlfrescoTimer.super.execute(jbpmContext);
-                
-                // NOTE: there may be an issue in jBPM where a timer that causes a process to
-                //       end is deleted twice (once via specific delete operation and once via
-                //       delete DML statement) which causes a hibernate exception.
-                //       Only delete timer if not at end of process
-                if (getProcessInstance().getEnd() != null)
-                {
-                    deleteTimer = false;
-                }
                 return deleteTimer;
             }
         }, (username == null) ? "system" : username);
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
index 8ad8bc0a73..a33bbc966e 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
@@ -100,6 +100,7 @@ public class JBPMSpringTest extends BaseSpringTest
         throws Exception
     {
         theProcessInstanceContinuesWhenAnAsyncMessageIsReceived();
+        undeployProcessDefinition();
         setComplete();
     }
     
@@ -135,6 +136,21 @@ public class JBPMSpringTest extends BaseSpringTest
         });
     }
 
+    
+    private void undeployProcessDefinition()
+    {
+        jbpmTemplate.execute(new JbpmCallback()
+        {
+            public Object doInJbpm(JbpmContext context)
+            {
+                GraphSession graphSession = context.getGraphSession();
+                ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition("hello world");
+                graphSession.deleteProcessDefinition(processDefinition.getId());
+                return null;
+            }
+        });
+    }
+    
     private void processInstanceIsCreatedWhenUserSubmitsWebappForm()
     {
         jbpmTemplate.execute(new JbpmCallback()
diff --git a/source/test-resources/jbpmresources/hibernate.cfg.xml b/source/test-resources/jbpmresources/hibernate.cfg.xml
index 016c5fda65..396343c1ef 100644
--- a/source/test-resources/jbpmresources/hibernate.cfg.xml
+++ b/source/test-resources/jbpmresources/hibernate.cfg.xml
@@ -40,9 +40,8 @@
     <!-- want to use the jBPM identity mgmgt           -->
     <!-- component.                                    -->
     <!-- identity mappings (begin) -->
-    <mapping resource="org/jbpm/identity/User.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+    <mapping resource="hibernate.identity.hbm.xml"/>
+    
     <!-- identity mappings (end) -->
     
     <!-- following mapping files have a dependendy on  -->