diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 02d34b52c..1e9447baa 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -362,6 +362,15 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			return;
 		}
 
+		initialize();
+	}
+
+	/**
+	 * Initializes the mapping context. Will add the types configured through {@link #setInitialEntitySet(Set)} to the
+	 * context.
+	 */
+	public void initialize() {
+
 		for (Class<?> initialEntity : initialEntitySet) {
 			addPersistentEntity(initialEntity);
 		}