diff --git a/Jenkinsfile b/Jenkinsfile
index d3496f007c8..fa6e56c1148 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -215,6 +215,24 @@ pipeline {
             ])
           }
         }
+        stage('engine-UNIT-historylevel-none') {
+          when {
+            expression {
+              cambpmWithLabels('default-build')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'h2',
+              runSteps: {
+                cambpmRunMaven('engine/', 'verify -Pcfghistorynone', runtimeStash: true, jdkVersion: 'jdk-17-latest')
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+              }
+            ])
+          }
+        }
         stage('quarkus-UNIT') {
           when {
             expression {
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/ProcessInstanceCommentAuthorizationTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/ProcessInstanceCommentAuthorizationTest.java
index b8d659b4297..b3bf970d633 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/ProcessInstanceCommentAuthorizationTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/ProcessInstanceCommentAuthorizationTest.java
@@ -25,10 +25,13 @@
 import java.util.Collections;
 import java.util.List;
 import org.camunda.bpm.engine.AuthorizationException;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.task.Comment;
 import org.camunda.bpm.engine.test.Deployment;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.junit.Test;
 
+@RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
 public class ProcessInstanceCommentAuthorizationTest extends AuthorizationTest {
   protected static final String ONE_TASK_PROCESS_KEY = "oneTaskProcess";
 
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/TaskCommentAuthorizationTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/TaskCommentAuthorizationTest.java
index 073bbe99a60..da0d4450460 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/TaskCommentAuthorizationTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/authorization/TaskCommentAuthorizationTest.java
@@ -26,12 +26,15 @@
 import java.util.Collections;
 import java.util.List;
 import org.camunda.bpm.engine.AuthorizationException;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.camunda.bpm.engine.task.Comment;
 import org.camunda.bpm.engine.task.Task;
 import org.camunda.bpm.engine.test.Deployment;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.junit.Test;
 
+@RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
 public class TaskCommentAuthorizationTest extends AuthorizationTest {
 
   protected static final String PROCESS_KEY = "oneTaskProcess";
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/encoding/ProcessEngineCharacterEncodingTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/encoding/ProcessEngineCharacterEncodingTest.java
index 95d61e7c1b0..92cf8a85032 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/encoding/ProcessEngineCharacterEncodingTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/encoding/ProcessEngineCharacterEncodingTest.java
@@ -24,10 +24,12 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.TaskService;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.camunda.bpm.engine.task.Comment;
 import org.camunda.bpm.engine.task.Task;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.camunda.bpm.engine.test.util.ProvidedProcessEngineRule;
 import org.junit.After;
 import org.junit.Before;
@@ -38,6 +40,7 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
+@RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
 @RunWith(Parameterized.class)
 public class ProcessEngineCharacterEncodingTest {
 
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/form/FormServiceTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/form/FormServiceTest.java
index 6d46262f4b0..fc6eb75c8cf 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/form/FormServiceTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/form/FormServiceTest.java
@@ -625,7 +625,6 @@ public void testSubmitTaskFormForCmmnHumanTask() {
         .putValueTyped("object", objectValue(serializedValue).create()));
   }
 
-
   @Deployment
   @Test
   public void testSubmitStartFormWithBusinessKey() {
@@ -686,7 +685,6 @@ public void testSubmitStartFormWithExecutionListenerOnStartEvent() {
     assertThat(variableEvents.get(1)).containsExactly(entry("foo", "bar"));
   }
 
-
   @Test
   @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_FULL)
   public void testSubmitStartFormWithAsyncStartEvent() {
@@ -715,7 +713,6 @@ public void testSubmitStartFormWithAsyncStartEvent() {
     assertThat(historicVariable.getValue()).isEqualTo("bar");
   }
 
-
   @Test
   public void testSubmitStartFormWithAsyncStartEventExecuteJob() {
     // given
@@ -1215,8 +1212,6 @@ public Boolean execute(CommandContext commandContext) {
     assertThat(hasLoadedAnyVariables).isFalse();
   }
 
-
-
   @Test
   @Deployment(resources = "org/camunda/bpm/engine/test/api/twoTasksProcess.bpmn20.xml")
   public void testSubmitTaskFormWithVarialbesInReturnShouldDeserializeObjectValue()
@@ -1659,6 +1654,7 @@ public void testGetDeployedTaskFormWithWrongKeyFormat() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = {
       "org/camunda/bpm/engine/test/api/form/FormServiceTest.shouldSubmitStartFormUsingFormKeyAndCamundaFormDefinition.bpmn",
       "org/camunda/bpm/engine/test/api/form/start.form" })
@@ -1679,6 +1675,7 @@ public void shouldSubmitStartFormUsingFormKeyAndCamundaFormDefinition() {
     assertThat(historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstance.getId()).list()).hasSize(1);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = {
       "org/camunda/bpm/engine/test/api/form/FormServiceTest.shouldSubmitTaskFormUsingFormKeyAndCamundaFormDefinition.bpmn",
   "org/camunda/bpm/engine/test/api/form/task.form" })
@@ -1699,6 +1696,7 @@ public void shouldSubmitTaskFormUsingFormKeyAndCamundaFormDefinition() {
     assertThat(taskService.createTaskQuery().list()).hasSize(0);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = {
       "org/camunda/bpm/engine/test/api/form/FormServiceTest.shouldSubmitStartFormUsingFormRefAndCamundaFormDefinition.bpmn",
   "org/camunda/bpm/engine/test/api/form/start.form" })
@@ -1720,6 +1718,7 @@ public void shouldSubmitStartFormUsingFormRefAndCamundaFormDefinition() {
     assertThat(historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstance.getId()).list()).hasSize(1);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = {
       "org/camunda/bpm/engine/test/api/form/FormServiceTest.shouldSubmitTaskFormUsingFormRefAndCamundaFormDefinition.bpmn",
   "org/camunda/bpm/engine/test/api/form/task.form" })
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/CorrelateAllMessageBatchTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/CorrelateAllMessageBatchTest.java
index f33a254de9c..de955cadf27 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/CorrelateAllMessageBatchTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/CorrelateAllMessageBatchTest.java
@@ -190,6 +190,7 @@ public void shouldCorrelateAllWithInstanceQuery() {
     assertThat(taskExecutionQueryInstanceThree.count()).isEqualTo(0L);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldCorrelateAllWithHistoricInstanceQuery() {
     // given
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionAsyncTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionAsyncTest.java
index 183231c10c6..5ae59549441 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionAsyncTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionAsyncTest.java
@@ -858,6 +858,7 @@ public void testBatchExecutionFailureWithMissingProcessInstance() {
     assertThat(failedJob.getExceptionMessage()).contains("Process instance '" + deletedProcessInstanceId + "' cannot be modified");
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testBatchExecutionFailureWithHistoricQueryThatMatchesDeletedInstance() {
     DeploymentWithDefinitions deployment = testRule.deploy(instance);
@@ -913,6 +914,7 @@ public void testBatchExecutionFailureWithHistoricQueryThatMatchesDeletedInstance
     assertThat(failedJob.getExceptionMessage()).contains("Process instance '" + deletedProcessInstanceId + "' cannot be modified");
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/runtime/ProcessInstanceModificationTest.syncAfterOneTaskProcess.bpmn20.xml" })
   public void testBatchExecutionWithHistoricQueryUnfinished() {
@@ -987,6 +989,7 @@ public void testBatchCreationWithProcessInstanceQuery() {
     assertBatchCreated(batch, processInstanceCount);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testBatchCreationWithHistoricProcessInstanceQuery() {
     int processInstanceCount = 15;
@@ -1063,7 +1066,7 @@ public void testBatchExecutionFailureWithFinishedInstanceId() {
     assertThat(failedJob.getExceptionMessage()).contains("Process instance '" + completedProcessInstanceId + "' cannot be modified");
   }
 
-
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/runtime/ProcessInstanceModificationTest.syncAfterOneTaskProcess.bpmn20.xml" })
   public void testBatchExecutionFailureWithHistoricQueryThatMatchesFinishedInstance() {
@@ -1145,6 +1148,7 @@ public void testBatchCreationWithOverlappingProcessInstanceIdsAndQuery() {
     assertBatchCreated(batch, processInstanceCount);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testBatchCreationWithOverlappingProcessInstanceIdsAndHistoricQuery() {
     int processInstanceCount = 15;
@@ -1167,6 +1171,7 @@ public void testBatchCreationWithOverlappingProcessInstanceIdsAndHistoricQuery()
     assertBatchCreated(batch, processInstanceCount);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testBatchCreationWithOverlappingHistoricQueryAndQuery() {
     // given
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionSyncTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionSyncTest.java
index 0e9e531e710..f1789a1c376 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionSyncTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/ModificationExecutionSyncTest.java
@@ -30,6 +30,7 @@
 import java.util.List;
 
 import org.camunda.bpm.engine.HistoryService;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.history.HistoricProcessInstanceQuery;
@@ -41,6 +42,7 @@
 import org.camunda.bpm.engine.runtime.ProcessInstanceQuery;
 import org.camunda.bpm.engine.task.Task;
 import org.camunda.bpm.engine.test.ProcessEngineRule;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.camunda.bpm.engine.test.util.ProcessEngineTestRule;
 import org.camunda.bpm.engine.test.util.ProvidedProcessEngineRule;
 import org.camunda.bpm.model.bpmn.Bpmn;
@@ -102,6 +104,7 @@ public void createSimpleModificationPlan() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void createSimpleModificationPlanWithHistoricQuery() {
     ProcessDefinition processDefinition = testRule.deployAndGetDefinition(instance);
@@ -138,6 +141,7 @@ public void createSimpleModificationPlanWithIdenticalRuntimeAndHistoryQuery() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void createSimpleModificationPlanWithComplementaryRuntimeAndHistoryQueries() {
     ProcessDefinition processDefinition = testRule.deployAndGetDefinition(instance);
@@ -157,6 +161,7 @@ public void createSimpleModificationPlanWithComplementaryRuntimeAndHistoryQuerie
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void createSimpleModificationPlanWithHistoricQueryUnfinished() {
     ProcessDefinition processDefinition = testRule.deployAndGetDefinition(instance);
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/SetVariablesBatchTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/SetVariablesBatchTest.java
index 8349ef29f92..b8b0bdb3fe2 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/SetVariablesBatchTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/SetVariablesBatchTest.java
@@ -770,6 +770,7 @@ public void setVariablesAsyncOnCompletedProcessInstanceWithQuery() {
     batchRule.syncExec(batch);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void setVariablesAsyncOnCompletedProcessInstanceWithHistoricQuery() {
     // given set variables on completed process instance
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskLastUpdatedTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskLastUpdatedTest.java
index 0bb79bdf6e8..513bc15649c 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskLastUpdatedTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskLastUpdatedTest.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.camunda.bpm.engine.OptimisticLockingException;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.TaskService;
 import org.camunda.bpm.engine.impl.db.sql.DbSqlSessionFactory;
@@ -34,6 +35,7 @@
 import org.camunda.bpm.engine.task.Task;
 import org.camunda.bpm.engine.test.Deployment;
 import org.camunda.bpm.engine.test.ProcessEngineRule;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.camunda.bpm.engine.test.util.ProvidedProcessEngineRule;
 import org.junit.After;
 import org.junit.Before;
@@ -180,6 +182,7 @@ public void shouldSetLastUpdatedOnVariableChange() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnCreateAttachment() {
     // given
@@ -196,6 +199,7 @@ public void shouldSetLastUpdatedOnCreateAttachment() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnChangeAttachment() {
     // given
@@ -231,6 +235,7 @@ public void shouldSetLastUpdatedOnDeleteAttachment() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnDeleteTaskAttachment() {
     // given
@@ -248,6 +253,7 @@ public void shouldSetLastUpdatedOnDeleteTaskAttachment() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnComment() {
     // given
@@ -403,6 +409,7 @@ public void shouldSetLastUpdatedOnSubmitTaskForm() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeSubmit);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldNotSaveTaskConcurrentlyUpdatedByDependentEntity() {
     // given
@@ -415,6 +422,7 @@ public void shouldNotSaveTaskConcurrentlyUpdatedByDependentEntity() {
       .isInstanceOf(OptimisticLockingException.class);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnTaskDeleteComment() {
     // given
@@ -433,6 +441,7 @@ public void shouldSetLastUpdatedOnTaskDeleteComment() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnTaskDeleteComments() {
     // given
@@ -452,6 +461,7 @@ public void shouldSetLastUpdatedOnTaskDeleteComments() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnTaskCommentUpdate() {
     // given
@@ -470,6 +480,7 @@ public void shouldSetLastUpdatedOnTaskCommentUpdate() {
     assertThat(taskResult.getLastUpdated()).isAfter(beforeUpdate);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnProcessInstanceDeleteComment() {
     // given
@@ -485,6 +496,7 @@ public void shouldSetLastUpdatedOnProcessInstanceDeleteComment() {
     assertThat(taskResult.getLastUpdated()).isNull();
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnProcessInstanceDeleteComments() {
     // given
@@ -501,6 +513,7 @@ public void shouldSetLastUpdatedOnProcessInstanceDeleteComments() {
     assertThat(taskResult.getLastUpdated()).isNull();
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void shouldSetLastUpdatedOnProcessInstanceCommentUpdate() {
     // given
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskServiceTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskServiceTest.java
index f1cf526dc1f..bfd41ec8ace 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskServiceTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/api/task/TaskServiceTest.java
@@ -302,6 +302,7 @@ public void testDeleteTaskCommentNotExistingTaskId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testDeleteTaskCommentNotExistingCommentId() {
     Task task = taskService.newTask();
@@ -315,6 +316,7 @@ public void testDeleteTaskCommentNotExistingCommentId() {
     taskService.deleteTask(taskId, true);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testDeleteTaskCommentWithoutProcessInstance() {
     Task task = taskService.newTask();
@@ -336,6 +338,7 @@ public void testDeleteTaskCommentWithoutProcessInstance() {
     taskService.deleteTask(taskId, true);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteTaskCommentWithProcessInstance() {
@@ -355,6 +358,7 @@ public void testDeleteTaskCommentWithProcessInstance() {
     assertNull(shouldBeDeleted);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testDeleteTaskCommentsNullTaskId() {
     try {
@@ -375,6 +379,7 @@ public void testDeleteTaskCommentsNonExistingTaskId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testDeleteTaskCommentsNoComments() {
     Task task = taskService.newTask();
@@ -388,6 +393,7 @@ public void testDeleteTaskCommentsNoComments() {
     taskService.deleteTask(taskId, true);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testDeleteTaskComments() {
     Task task = taskService.newTask();
@@ -408,6 +414,7 @@ public void testDeleteTaskComments() {
     taskService.deleteTask(taskId, true);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceTaskComments() {
@@ -442,6 +449,7 @@ public void testUpdateTaskCommentNullCommentId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testUpdateTaskCommentNullTaskId() {
     Task task = taskService.newTask();
@@ -459,6 +467,7 @@ public void testUpdateTaskCommentNullTaskId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testUpdateTaskCommentNullMessage() {
     Task task = taskService.newTask();
@@ -476,6 +485,7 @@ public void testUpdateTaskCommentNullMessage() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testUpdateTaskCommentNotExistingCommentId() {
     Task task = taskService.newTask();
@@ -495,6 +505,7 @@ public void testUpdateTaskCommentNotExistingCommentId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testUpdateTaskComment() {
     Task task = taskService.newTask();
@@ -513,6 +524,7 @@ public void testUpdateTaskComment() {
     taskService.deleteTask(taskId, true);
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessTaskComment() {
@@ -541,6 +553,7 @@ public void testDeleteProcessInstanceCommentNullId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceCommentNotExistingCommentId() {
@@ -550,6 +563,7 @@ public void testDeleteProcessInstanceCommentNotExistingCommentId() {
     taskService.deleteProcessInstanceComment(processInstance.getId(), "notExistingCommentId");
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteTaskProcessInstanceComment() {
@@ -569,6 +583,7 @@ public void testDeleteTaskProcessInstanceComment() {
     assertThat(shouldBeDeletedLst).isEmpty();
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceComment() {
@@ -606,6 +621,7 @@ public void testDeleteProcessInstanceCommentsNonExistingId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceCommentsNoComments() {
@@ -616,6 +632,7 @@ public void testDeleteProcessInstanceCommentsNoComments() {
     taskService.deleteProcessInstanceComments(processInstance.getId());
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceCommentsWithoutTaskComments() {
@@ -634,6 +651,7 @@ public void testDeleteProcessInstanceCommentsWithoutTaskComments() {
     assertThat(shouldBeDeletedLst).isEmpty();
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testDeleteProcessInstanceCommentsWithTask() {
@@ -666,6 +684,7 @@ public void testUpdateProcessInstanceCommentNullCommentId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessInstanceCommentNullProcessInstanceId() {
@@ -681,6 +700,7 @@ public void testUpdateProcessInstanceCommentNullProcessInstanceId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessInstanceCommentNullMessage() {
@@ -697,6 +717,7 @@ public void testUpdateProcessInstanceCommentNullMessage() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessInstanceCommentNotExistingCommentId() {
@@ -716,6 +737,7 @@ public void testUpdateProcessInstanceCommentNotExistingCommentId() {
     }
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessInstanceCommentWithTask() {
@@ -738,6 +760,7 @@ public void testUpdateProcessInstanceCommentWithTask() {
     assertEquals(updatedMessage, actual.getFullMessage());
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   @Test
   public void testUpdateProcessInstanceCommentWithoutTask() {
@@ -2723,6 +2746,7 @@ public void testDeleteTaskAttachmentWithTaskIdEmpty() {
     assertThat(taskService.getAttachment(attachmentId)).isNull();
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_AUDIT)
   @Test
   @Deployment(resources = { "org/camunda/bpm/engine/test/api/oneTaskProcess.bpmn20.xml" })
   public void testDeleteTaskAttachmentWithTaskIdNoLongerExists() {
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/gateway/InclusiveGatewayTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/gateway/InclusiveGatewayTest.java
index fdc32a187fd..748948c1524 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/gateway/InclusiveGatewayTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/gateway/InclusiveGatewayTest.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.assertj.core.api.Assertions;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity;
 import org.camunda.bpm.engine.impl.util.CollectionUtil;
@@ -40,6 +41,7 @@
 import org.camunda.bpm.engine.task.Task;
 import org.camunda.bpm.engine.task.TaskQuery;
 import org.camunda.bpm.engine.test.Deployment;
+import org.camunda.bpm.engine.test.RequiredHistoryLevel;
 import org.camunda.bpm.engine.test.util.PluggableProcessEngineTest;
 import org.camunda.bpm.model.bpmn.Bpmn;
 import org.junit.Test;
@@ -784,6 +786,7 @@ public void testJoinAfterEventBasedGatewayContainedInSubProcess() {
     assertEquals("taskAfterJoin", task.getTaskDefinitionKey());
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = ASYNC_CONCURRENT_PARALLEL_GATEWAY)
   @Test
   public void shouldCompleteWithConcurrentExecution_ParallelGateway() {
@@ -799,6 +802,7 @@ public void shouldCompleteWithConcurrentExecution_ParallelGateway() {
         .isEqualTo("COMPLETED");
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Deployment(resources = ASYNC_CONCURRENT_PARALLEL_INCLUSIVE_GATEWAY)
   @Test
   public void shouldCompleteWithConcurrentExecution_InclusiveGateway() {
diff --git a/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/tasklistener/TaskListenerTest.java b/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/tasklistener/TaskListenerTest.java
index 5fc8cd018fc..57b6e48bad7 100644
--- a/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/tasklistener/TaskListenerTest.java
+++ b/engine/src/test/java/org/camunda/bpm/engine/test/bpmn/tasklistener/TaskListenerTest.java
@@ -636,6 +636,7 @@ public void testUpdateTaskListenerOnAttachmentDelete() {
     assertEquals(2, RecorderTaskListener.getEventCount(TaskListener.EVENTNAME_UPDATE)); // create and delete attachment
   }
 
+  @RequiredHistoryLevel(ProcessEngineConfiguration.HISTORY_ACTIVITY)
   @Test
   public void testUpdateTaskListenerOnAttachmentDeleteWithTaskId() {
     // given