diff --git a/fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TokenServiceIntegrationTest.java b/fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TokenServiceIntegrationTest.java
index 09d2a26554f14bc3b279833936f5ce35275c241e..1a2002e9fac1cb1af9cceb0e00cc27ef36a41574 100644
--- a/fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TokenServiceIntegrationTest.java
+++ b/fda-authentication-service/rest-service/src/test/java/at/tuwien/service/TokenServiceIntegrationTest.java
@@ -4,6 +4,7 @@ import at.tuwien.BaseUnitTest;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.SecretInvalidException;
 import at.tuwien.repositories.TimeSecretRepository;
+import at.tuwien.repositories.UserRepository;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,16 +32,18 @@ public class TokenServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private TimeSecretRepository tokenRepository;
 
+    @Autowired
+    private UserRepository userRepository;
+
     @BeforeEach
     public void beforeEach() {
+        userRepository.save(USER_1);
         tokenRepository.save(TOKEN_1);
     }
 
     @Test
     public void updateVerification_succeeds() throws SecretInvalidException {
 
-        /* mock */
-
         /* test */
         tokenService.invalidate(TOKEN_1_TOKEN);
         assertThrows(SecretInvalidException.class, () -> {
diff --git a/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java b/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
index 04e96620eff1d695426a579d63ac1e03fa54368e..669fceb4501d666c6de3ccb156077de679d46497 100644
--- a/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+++ b/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
@@ -155,6 +155,7 @@ public abstract class BaseUnitTest {
             .id(CONTAINER_1_ID)
             .name(CONTAINER_1_NAME)
             .internalName(CONTAINER_1_INTERNALNAME)
+            .imageId(IMAGE_1_ID)
             .image(CONTAINER_1_IMAGE)
             .hash(CONTAINER_1_HASH)
             .build();
@@ -163,6 +164,7 @@ public abstract class BaseUnitTest {
             .id(CONTAINER_2_ID)
             .name(CONTAINER_2_NAME)
             .internalName(CONTAINER_2_INTERNALNAME)
+            .imageId(IMAGE_1_ID)
             .image(CONTAINER_2_IMAGE)
             .hash(CONTAINER_2_HASH)
             .build();
diff --git a/fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
index 1954c0579eefed77985a8b1d073d9098c1d0942a..9230ab56f119ac9982b5308d371531e5ebdbbb3e 100644
--- a/fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
+++ b/fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
@@ -57,10 +57,14 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    private ImageRepository imageRepository;
+
     @BeforeEach
     @Transactional
     public void beforeEach() {
         userRepository.save(USER_1);
+        imageRepository.save(IMAGE_1);
         containerRepository.save(CONTAINER_1);
         databaseRepository.save(DATABASE_1);
         identifierRepository.save(IDENTIFIER_1);