diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
index 190337c56..3003f8b98 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java
@@ -92,9 +92,9 @@ class CreateHistoryEventOnTaskCancelClaimAccTest extends AbstractAccTest {
                   .put("oldValue", oldModified.toString());
           JSONObject expectedState =
               new JSONObject()
-                  .put("newValue", "READY")
+                  .put("newValue", TaskState.READY.name())
                   .put("fieldName", "state")
-                  .put("oldValue", "CLAIMED");
+                  .put("oldValue", TaskState.CLAIMED.name());
           JSONObject expectedOwner =
               new JSONObject()
                   .put("newValue", "")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
index 511b23f45..90fadae28 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java
@@ -88,9 +88,9 @@ class CreateHistoryEventOnTaskClaimAccTest extends AbstractAccTest {
                   .put("oldValue", oldModified.toString());
           JSONObject expectedState =
               new JSONObject()
-                  .put("newValue", "CLAIMED")
+                  .put("newValue", TaskState.CLAIMED.name())
                   .put("fieldName", "state")
-                  .put("oldValue", "READY");
+                  .put("oldValue", TaskState.READY.name());
           JSONObject expectedOwner =
               new JSONObject()
                   .put("newValue", "admin")
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
index 8003a9887..4ecc95675 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestChangesAccTest.java
@@ -67,9 +67,9 @@ class CreateHistoryEventOnTaskRequestChangesAccTest extends AbstractAccTest {
             .put("oldValue", oldModified.toString());
     JSONObject expectedState =
         new JSONObject()
-            .put("newValue", "READY")
+            .put("newValue", TaskState.READY.name())
             .put("fieldName", "state")
-            .put("oldValue", "IN_REVIEW");
+            .put("oldValue", TaskState.IN_REVIEW.name());
     JSONObject expectedOwner =
         new JSONObject().put("newValue", "").put("fieldName", "owner").put("oldValue", "user-1-1");
 
diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
index 997e593b1..2f4872112 100644
--- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
+++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskRequestReviewAccTest.java
@@ -67,9 +67,9 @@ class CreateHistoryEventOnTaskRequestReviewAccTest extends AbstractAccTest {
             .put("oldValue", oldModified.toString());
     JSONObject expectedState =
         new JSONObject()
-            .put("newValue", "READY_FOR_REVIEW")
+            .put("newValue", TaskState.READY_FOR_REVIEW.name())
             .put("fieldName", "state")
-            .put("oldValue", "CLAIMED");
+            .put("oldValue", TaskState.CLAIMED.name());
     JSONObject expectedOwner =
         new JSONObject().put("newValue", "").put("fieldName", "owner").put("oldValue", "user-1-1");