diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 97128572f..ca2a379e2 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -34,13 +34,9 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
@@ -67,12 +63,10 @@ import org.springframework.util.ReflectionUtils.FieldFilter;
  * @author Oliver Gierke
  */
 public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?, P>, P extends PersistentProperty<P>>
-		implements MappingContext<E, P>, ApplicationContextAware, ApplicationEventPublisherAware,
-		ApplicationListener<ContextRefreshedEvent> {
+		implements MappingContext<E, P>, ApplicationEventPublisherAware, InitializingBean {
 
 	private final ConcurrentMap<TypeInformation<?>, E> persistentEntities = new ConcurrentHashMap<TypeInformation<?>, E>();
 
-	private ApplicationContext applicationContext;
 	private ApplicationEventPublisher applicationEventPublisher;
 
 	private Set<? extends Class<?>> initialEntitySet = new HashSet<Class<?>>();
@@ -83,20 +77,6 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	private final Lock read = lock.readLock();
 	private final Lock write = lock.writeLock();
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-	 */
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-
-		this.applicationContext = applicationContext;
-
-		// Default publisher
-		if (this.applicationEventPublisher == null) {
-			this.applicationEventPublisher = applicationContext;
-		}
-	}
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
@@ -324,16 +304,12 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 	protected abstract P createPersistentProperty(Field field, PropertyDescriptor descriptor, E owner,
 			SimpleTypeHolder simpleTypeHolder);
 
-	/*
+	/* 
 	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
-	public void onApplicationEvent(ContextRefreshedEvent event) {
-
-		if (!event.getApplicationContext().equals(applicationContext)) {
-			return;
-		}
-
+	@Override
+	public void afterPropertiesSet() {
 		initialize();
 	}
 
diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
index 777d03412..31d7fe255 100644
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
@@ -90,17 +89,17 @@ public class AbstractMappingContextUnitTests {
 	}
 
 	@Test
-	public void registersEntitiesOnContextRefreshedEvent() {
+	public void registersEntitiesOnInitialization() {
 
 		ApplicationContext context = mock(ApplicationContext.class);
 
 		SampleMappingContext mappingContext = new SampleMappingContext();
 		mappingContext.setInitialEntitySet(Collections.singleton(Person.class));
-		mappingContext.setApplicationContext(context);
+		mappingContext.setApplicationEventPublisher(context);
 
 		verify(context, times(0)).publishEvent(Mockito.any(ApplicationEvent.class));
 
-		mappingContext.onApplicationEvent(new ContextRefreshedEvent(context));
+		mappingContext.afterPropertiesSet();
 		verify(context, times(1)).publishEvent(Mockito.any(ApplicationEvent.class));
 	}