diff --git a/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java b/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
index cf830fa8e3..ad857b7236 100644
--- a/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
+++ b/source/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
@@ -40,11 +40,12 @@ import org.activiti.engine.form.StartFormData;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
 import org.activiti.engine.history.HistoricVariableInstance;
-import org.activiti.engine.impl.bpmn.diagram.ProcessDiagramGenerator;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.repository.ProcessDefinitionQuery;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.image.ProcessDiagramGenerator;
+import org.activiti.image.impl.DefaultProcessDiagramGenerator;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.model.Repository;
@@ -1011,7 +1012,8 @@ public class ProcessesImpl extends WorkflowRestImpl implements Processes
             if(model != null && model.getLocationMap().size() > 0)
             {
                 List<String> activeActivities = activitiProcessEngine.getRuntimeService().getActiveActivityIds(processId);
-                InputStream generateDiagram = ProcessDiagramGenerator.generateDiagram(model, "png", activeActivities);
+                ProcessDiagramGenerator generator = new DefaultProcessDiagramGenerator();
+                InputStream generateDiagram = generator.generateDiagram(model, "png", activeActivities);
                 
                 File file = TempFileProvider.createTempFile(processId + UUID.randomUUID(), ".png");
                 FileOutputStream fos = new FileOutputStream(file);
diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
index 679794a1dc..896b23edc2 100644
--- a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
+++ b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
@@ -37,7 +37,6 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.activiti.engine.history.HistoricTaskInstance;
-import org.activiti.engine.impl.util.ClockUtil;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.DelegationState;
 import org.activiti.engine.task.IdentityLinkType;
@@ -86,8 +85,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         // Alter current engine date
         Calendar createdCal = Calendar.getInstance();
         createdCal.set(Calendar.MILLISECOND, 0);
-        ClockUtil.setCurrentTime(createdCal.getTime());
-        
+           
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), null);
         
         try
@@ -1132,9 +1130,7 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
     {
         // Alter current engine date
         Calendar createdCal = Calendar.getInstance();
-        createdCal.set(Calendar.MILLISECOND, 0);
-        ClockUtil.setCurrentTime(createdCal.getTime());
-        
+        createdCal.set(Calendar.MILLISECOND, 0);        
         RequestContext requestContext = initApiClientWithTestUser();
         
         String otherPerson = getOtherPersonInNetwork(requestContext.getRunAsUser(), requestContext.getNetworkId()).getId();
@@ -1222,7 +1218,6 @@ public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
         
         Calendar taskCreated = Calendar.getInstance();
         taskCreated.set(Calendar.MILLISECOND, 0);
-        ClockUtil.setCurrentTime(taskCreated.getTime());
         String businessKey = UUID.randomUUID().toString();
         ProcessInstance processInstance = startAdhocProcess(requestContext.getRunAsUser(), requestContext.getNetworkId(), businessKey);