diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
index b6e6d6092..941e0648e 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java
@@ -6,6 +6,7 @@ import acceptance.AbstractAccTest;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -382,14 +383,15 @@ class HistoryCleanupJobAccTest extends AbstractAccTest {
 
     assertThat(jobsToRun).hasSize(30);
 
+    List<ScheduledJob> historyCleanupJobs =
+        jobsToRun.stream()
+            .filter(scheduledJob -> scheduledJob.getType().equals(Type.HISTORYCLEANUPJOB))
+            .collect(Collectors.toList());
+
     HistoryCleanupJob.initializeSchedule(taskanaEngine);
 
     jobsToRun = getJobMapper().findJobsToRun();
 
-    assertThat(jobsToRun).hasSize(20);
-
-    assertThat(jobsToRun)
-        .extracting(ScheduledJob::getType)
-        .containsOnly(Type.CLASSIFICATIONCHANGEDJOB, Type.UPDATETASKSJOB);
+    assertThat(jobsToRun).doesNotContainAnyElementsOf(historyCleanupJobs);
   }
 }
diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
index 4a0d86b3f..ae336c1be 100644
--- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java
@@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import acceptance.AbstractAccTest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -105,15 +106,16 @@ class TaskCleanupJobAccTest extends AbstractAccTest {
 
     assertThat(jobsToRun).hasSize(30);
 
+    List<ScheduledJob> taskCleanupJobs =
+        jobsToRun.stream()
+            .filter(scheduledJob -> scheduledJob.getType().equals(Type.TASKCLEANUPJOB))
+            .collect(Collectors.toList());
+
     TaskCleanupJob.initializeSchedule(taskanaEngine);
 
     jobsToRun = getJobMapper().findJobsToRun();
 
-    assertThat(jobsToRun).hasSize(20);
-
-    assertThat(jobsToRun)
-        .extracting(ScheduledJob::getType)
-        .containsOnly(Type.CLASSIFICATIONCHANGEDJOB, Type.UPDATETASKSJOB);
+    assertThat(jobsToRun).doesNotContainAnyElementsOf(taskCleanupJobs);
   }
 
   private Task createAndCompleteTask() throws Exception {
diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java
index caf3f632b..55e8513ac 100644
--- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java
@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import acceptance.AbstractAccTest;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -105,15 +106,16 @@ class WorkbasketCleanupJobAccTest extends AbstractAccTest {
 
     assertThat(jobsToRun).hasSize(30);
 
+    List<ScheduledJob> workbasketCleanupJobs =
+        jobsToRun.stream()
+            .filter(scheduledJob -> scheduledJob.getType().equals(Type.WORKBASKETCLEANUPJOB))
+            .collect(Collectors.toList());
+
     WorkbasketCleanupJob.initializeSchedule(taskanaEngine);
 
     jobsToRun = getJobMapper().findJobsToRun();
 
-    assertThat(jobsToRun).hasSize(20);
-
-    assertThat(jobsToRun)
-        .extracting(ScheduledJob::getType)
-        .containsOnly(Type.CLASSIFICATIONCHANGEDJOB, Type.UPDATETASKSJOB);
+    assertThat(jobsToRun).doesNotContainAnyElementsOf(workbasketCleanupJobs);
   }
 
   private long getNumberTaskNotCompleted(String workbasketId) {