diff --git a/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java b/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
index c94dcde9ad94c427916f390cd1b3d6df65bdb1a2..8de7090898e4ce3c0f8bf0435334da994fde594d 100644
--- a/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
+++ b/core/src/test/java/de/fitko/fitconnect/core/events/SecurityEventTokenServiceTest.java
@@ -18,6 +18,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.ParseException;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -46,7 +47,7 @@ public class SecurityEventTokenServiceTest {
         final JWTClaimsSet payload = signedJWT.getJWTClaimsSet();
         final JWSVerifier jwsVerifier = new RSASSAVerifier(jwk.toRSAKey());
 
-        final JSONObject obj = (JSONObject) payload.getClaims().get("events");
+        final Map<String,Object> obj = (Map<String, Object>) payload.getClaims().get("events");
         final Optional<String> first = obj.keySet().stream().findFirst();
 
         assertEquals(jwk.getAlgorithm(), JWSAlgorithm.PS512);
@@ -71,7 +72,7 @@ public class SecurityEventTokenServiceTest {
         assertEquals(jwk.getAlgorithm(), JWSAlgorithm.PS512);
 
         final JWTClaimsSet payload = signedJWT.getJWTClaimsSet();
-        final JSONObject obj = (JSONObject) payload.getClaims().get("events");
+        final Map<String,Object> obj = (Map<String, Object>) payload.getClaims().get("events");
         final Optional<String> first = obj.keySet().stream().findFirst();
         final JWSVerifier jwsVerifier = new RSASSAVerifier(jwk.toRSAKey());