diff --git a/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceCommentTest.java b/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceCommentTest.java
index 48bda7073c4..48e694dc8fb 100644
--- a/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceCommentTest.java
+++ b/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/runtime/ProcessInstanceCommentTest.java
@@ -47,7 +47,7 @@ public void testAddCommentToProcessInstance() {
             try {
                 taskService.addComment(null, processInstance.getId(), "Hello World 2");
             } catch (FlowableException e) {
-                assertTextPresent("Cannot add a comment to a suspended execution", e.getMessage());
+                assertTextPresent("Cannot add a comment to a suspended ProcessInstance", e.getMessage());
             }
 
             // Delete comments again
diff --git a/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/task/TaskServiceTest.java b/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/task/TaskServiceTest.java
index 5a7dc2ed2c0..9df4165212d 100644
--- a/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/task/TaskServiceTest.java
+++ b/modules/flowable5-test/src/test/java/org/activiti/engine/test/api/task/TaskServiceTest.java
@@ -1415,41 +1415,43 @@ public void testDeleteTaskPartOfProcess() {
         runtimeService.startProcessInstanceByKey("oneTaskProcess");
         org.flowable.task.api.Task task = taskService.createTaskQuery().singleResult();
         assertNotNull(task);
+        String taskErrorString = "Task[id=" + task.getId() + ", key=theTask, name=my task, processInstanceId=" + task.getProcessInstanceId() + ", executionId="
+                + task.getExecutionId() + ", processDefinitionId=" + task.getProcessDefinitionId() + "]";
 
         try {
             taskService.deleteTask(task.getId());
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
         try {
             taskService.deleteTask(task.getId(), true);
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
         try {
             taskService.deleteTask(task.getId(), "test");
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
         try {
             taskService.deleteTasks(Collections.singletonList(task.getId()));
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
         try {
             taskService.deleteTasks(Collections.singletonList(task.getId()), true);
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
         try {
             taskService.deleteTasks(Collections.singletonList(task.getId()), "test");
         } catch (FlowableException ae) {
-            assertEquals("The task cannot be deleted because is part of a running process", ae.getMessage());
+            assertEquals("The " + taskErrorString + " cannot be deleted because is part of a running process", ae.getMessage());
         }
 
     }
diff --git a/modules/flowable5-test/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java b/modules/flowable5-test/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java
index 226c682049b..3fe96268038 100644
--- a/modules/flowable5-test/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java
+++ b/modules/flowable5-test/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java
@@ -32,7 +32,7 @@ public void testTableCount() {
 
         String tablePrefix = processEngineConfiguration.getDatabaseTablePrefix();
 
-        assertEquals(Long.valueOf(13), tableCount.get(tablePrefix + "ACT_GE_PROPERTY"));
+        assertEquals(Long.valueOf(7), tableCount.get(tablePrefix + "ACT_GE_PROPERTY"));
         assertEquals(Long.valueOf(0), tableCount.get(tablePrefix + "ACT_GE_BYTEARRAY"));
         assertEquals(Long.valueOf(0), tableCount.get(tablePrefix + "ACT_RE_DEPLOYMENT"));
         assertEquals(Long.valueOf(0), tableCount.get(tablePrefix + "ACT_RU_EXECUTION"));
diff --git a/modules/flowable5-test/src/test/java/org/activiti/standalone/history/FullHistoryTest.java b/modules/flowable5-test/src/test/java/org/activiti/standalone/history/FullHistoryTest.java
index 978ab3b592f..0b4ba92954a 100644
--- a/modules/flowable5-test/src/test/java/org/activiti/standalone/history/FullHistoryTest.java
+++ b/modules/flowable5-test/src/test/java/org/activiti/standalone/history/FullHistoryTest.java
@@ -888,7 +888,7 @@ public void testDeleteRunningHistoricProcessInstance() {
             fail("Exception expected when deleting process-instance that is still running");
         } catch (FlowableException ae) {
             // Expected exception
-            assertTextPresent("Process instance is still running, cannot delete historic process instance", ae.getMessage());
+            assertTextPresent("Process instance is still running, cannot delete HistoricProcessInstanceEntity", ae.getMessage());
         }
     }