diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MongoMappingContextUnitTests.java
new file mode 100644
index 000000000..656f91134
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MongoMappingContextUnitTests.java
@@ -0,0 +1,26 @@
+package org.springframework.data.document.mongodb.mapping;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link MongoMappingContext}.
+ * 
+ * @author Oliver Gierke
+ */
+public class MongoMappingContextUnitTests {
+
+	@Test
+	public void addsSelfReferencingPersistentEntityCorrectly() {
+		MongoMappingContext context = new MongoMappingContext();
+		context.setInitialEntitySet(Collections.singleton(SampleClass.class));
+		context.afterPropertiesSet();
+	}
+	
+	public class SampleClass {
+		
+		Map<String, SampleClass> children;
+	}
+}