diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
index a3f83d21ab..e4cf8ecb5d 100644
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/BaseMapper.java
@@ -5,12 +5,12 @@ import org.mapstruct.Mapping;
 
 import java.time.Instant;
 
-abstract class BaseMapper<T, D extends HalRepresentation> {
+public abstract class BaseMapper<T, D extends HalRepresentation> {
 
   @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
   public abstract D map(T modelObject);
 
-  Instant mapTime(Long epochMilli) {
+  protected Instant mapTime(Long epochMilli) {
     return epochMilli == null? null: Instant.ofEpochMilli(epochMilli);
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
index 4f8c6a6f3f..523629ce3b 100644
--- a/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
+++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/CollectionToDtoMapper.java
@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
 import static de.otto.edison.hal.Embedded.embeddedBuilder;
 import static de.otto.edison.hal.Links.linkingTo;
 
-abstract class CollectionToDtoMapper<E, D extends HalRepresentation> {
+public abstract class CollectionToDtoMapper<E, D extends HalRepresentation> {
 
   private final String collectionName;
   private final BaseMapper<E, D> mapper;