diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
index 676fb5d11b3353f2ac0e49cd8e6711edef868c66..1656d95b62f48a055ba0e1c5cf7f5cbadb7ccbbe 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
@@ -49,13 +49,12 @@ public class ContainerServiceUnitTest extends BaseUnitTest {
         /* mock data */
         userRepository.save(USER_1);
         final ContainerImage tmp = ContainerImage.builder()
-                .id(IMAGE_1_ID)
                 .repository(IMAGE_1_REPOSITORY)
                 .tag(IMAGE_1_TAG)
                 .hash(IMAGE_1_HASH)
-                .jdbcMethod("mariadb")
-                .dialect("org.hibernate.dialect.MariaDBDialect")
-                .driverClass("org.mariadb.jdbc.Driver")
+                .jdbcMethod(IMAGE_1_JDBC)
+                .dialect(IMAGE_1_DIALECT)
+                .driverClass(IMAGE_1_DRIVER)
                 .compiled(IMAGE_1_BUILT)
                 .size(IMAGE_1_SIZE)
                 .environment(IMAGE_1_ENV)
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
index ffcd28642cbe1c2e7e192c53c769c4f6a76de437..400d0827162895472b3daa35594e1d3865342684 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
@@ -49,7 +49,6 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
     public void beforeEach() {
         userRepository.save(USER_1);
         final ContainerImage tmp = ContainerImage.builder()
-                .id(IMAGE_1_ID)
                 .repository(IMAGE_1_REPOSITORY)
                 .tag(IMAGE_1_TAG)
                 .hash(IMAGE_1_HASH)
@@ -140,7 +139,6 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
 
     @Test
     public void delete_noContainer_succeeds() throws ImageNotFoundException, PersistenceException {
-        imageRepository.save(IMAGE_1);
 
         /* test */
         imageService.delete(IMAGE_1_ID);