diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
index e714145702..e733e0296f 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
@@ -36,6 +36,7 @@ import org.activiti.engine.history.HistoricDetail;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricVariableUpdate;
 import org.activiti.engine.task.Task;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.workflow.BPMEngineRegistry;
 import org.alfresco.repo.workflow.WorkflowModel;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -568,8 +569,10 @@ public class ActivitiTaskComponentTest extends AbstractActivitiComponentTest
         // Set process prop
         runtime.setVariable(task.getExecutionId(), "processVar", "testing");
         
-        // End the task
+        // End the task as TEST_USER
+        AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
         workflowEngine.endTask(globalTaskId, null);
+        AuthenticationUtil.setFullyAuthenticatedUser("admin");
 
         // Test query by taskId
         WorkflowTaskQuery taskQuery = createWorkflowTaskQuery(WorkflowTaskState.COMPLETED);
diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
index 258ec49a57..f34f8995d3 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
@@ -517,7 +517,8 @@ public class ActivitiPropertyConverter
     {
         HistoricDetailQuery query = activitiUtil.getHistoryService()
             .createHistoricDetailQuery()
-            .processInstanceId(processId);
+            .processInstanceId(processId)
+            .excludeTaskDetails();
         return getHistoricVariables(query);
     }