diff --git a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
index 892b69129..f65c9dda8 100644
--- a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
+++ b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
@@ -25,9 +25,13 @@
     <property name="port" value="27017"/>
   </bean>
 
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="test"/>
+  </bean>
+
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg name="mongo" ref="mongo"/>
-    <constructor-arg name="databaseName" value="test"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
index d2fd3db08..e5f23d707 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
@@ -33,7 +33,7 @@ import com.mongodb.Mongo;
  * @author Thomas Risberg
  * @since 1.0
  */
-public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<DB>, InitializingBean {
+public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<MongoDbFactory>, InitializingBean {
 	//ToDo: add	PersistenceExceptionTranslator ???
 
 	/**
@@ -108,12 +108,12 @@ public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<DB>, Init
 		return this.databaseName;
 	}
 
-	public DB getObject() throws Exception {
-		return getDb();
+	public MongoDbFactory getObject() throws Exception {
+		return this;
 	}
 
-	public Class<? extends DB> getObjectType() {
-		return DB.class;
+	public Class<? extends MongoDbFactory> getObjectType() {
+		return MongoDbFactory.class;
 	}
 
 	public boolean isSingleton() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
index 20c3be316..9b375320c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
@@ -108,7 +108,7 @@ public class MongoTemplate implements MongoOperations, ApplicationEventPublisher
 	 * @param databaseName
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName) {
-		this(mongo, databaseName, null);
+		this(new MongoDbFactoryBean(mongo, databaseName));
 	}
 
 	/**
@@ -174,6 +174,15 @@ public class MongoTemplate implements MongoOperations, ApplicationEventPublisher
 		return this.mongoConverter;
 	}
 
+	/**
+	 * Returns the {@link org.springframework.data.document.mongodb.MongoDbFactory}.
+	 * 
+	 * @return
+	 */
+	public MongoDbFactory getDbFactory() {
+		return this.mongoDbFactory;
+	}
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.document.mongodb.MongoOperations#getDefaultCollectionName()
 	 */
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
index 1cbec252f..855c87495 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java
@@ -87,7 +87,7 @@ public class MongoTemplateTests {
 		MappingMongoConverter converter = new MappingMongoConverter(mappingContext);
 		converter.afterPropertiesSet();
 
-		this.mappingTemplate = new MongoTemplate(mongo, "database", converter);
+		this.mappingTemplate = new MongoTemplate(template.getDbFactory(), converter);
 	}
 
 	@Before
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
index 665fcbf3e..98b3320d9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java
@@ -34,7 +34,7 @@ public class MvcAnalyticsTests {
 	public void setUp() throws Exception {
 		Mongo m = new Mongo();
 		mongoTemplate = new MongoTemplate(m, "mvc");
-		mongoDummyTemplate = new MongoTemplate(m, "mvc", new AbstractMongoConverter() {
+		mongoDummyTemplate = new MongoTemplate(mongoTemplate.getDbFactory(), new AbstractMongoConverter() {
 			public void write(Object t, DBObject dbo) {
 			}
 
diff --git a/spring-data-mongodb/src/test/resources/geospatial.xml b/spring-data-mongodb/src/test/resources/geospatial.xml
index 7ffe709a9..91e1c0e6f 100644
--- a/spring-data-mongodb/src/test/resources/geospatial.xml
+++ b/spring-data-mongodb/src/test/resources/geospatial.xml
@@ -7,12 +7,16 @@
 
   <mongo:mongo host="localhost" port="27017"/>
   
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="geospatial"/>
+  </bean>
+  
   <mongo:mapping-converter base-package="org.springframework.data.document.mongodb"/>
   
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo"/>
-    <constructor-arg name="databaseName" value="geospatial"/>
-    <constructor-arg ref="mappingConverter"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
   <bean class="org.springframework.data.document.mongodb.mapping.event.MappingEventListener"/>
diff --git a/spring-data-mongodb/src/test/resources/infrastructure.xml b/spring-data-mongodb/src/test/resources/infrastructure.xml
index c388bafe2..89bd0e6c6 100644
--- a/spring-data-mongodb/src/test/resources/infrastructure.xml
+++ b/spring-data-mongodb/src/test/resources/infrastructure.xml
@@ -8,10 +8,14 @@
     <property name="port" value="27017"/>
   </bean>
 
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+  
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo"/>
-    <constructor-arg value="database"/>
-	<constructor-arg ref="mongoConverter" />
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+	<constructor-arg name="mongoConverter" ref="mongoConverter" />
   </bean>
   
   <bean id="mongoConverter" class="org.springframework.data.document.mongodb.convert.SimpleMongoConverter" />
diff --git a/spring-data-mongodb/src/test/resources/mapping.xml b/spring-data-mongodb/src/test/resources/mapping.xml
index 7ae5ca87d..600d4b404 100644
--- a/spring-data-mongodb/src/test/resources/mapping.xml
+++ b/spring-data-mongodb/src/test/resources/mapping.xml
@@ -6,12 +6,17 @@
        http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
 
   <mongo:mongo host="localhost" port="27017"/>
+
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+  
   <mongo:mapping-converter base-package="org.springframework.data.document.mongodb.mapping"/>
 
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo"/>
-    <constructor-arg name="databaseName" value="database"/>
-    <constructor-arg ref="mappingConverter"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
   <bean class="org.springframework.data.document.mongodb.mapping.event.LoggingEventListener"/>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
index ad9e6da16..bc5e7c4a0 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
@@ -32,9 +32,13 @@
     
   <bean id="readConverter" class="org.springframework.data.document.mongodb.PersonReadConverter"/>
 
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg name="mongo" ref="mongo"/>
-    <constructor-arg name="databaseName" value="database"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
   </bean>
 
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
index 1f8dc51c9..8cd6df099 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
@@ -5,12 +5,16 @@
 
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
     <constructor-arg>
-      <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
-	    <property name="host" value="localhost"/>
-	    <property name="port" value="27017"/>
+      <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+        <constructor-arg name="mongo">
+          <bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
+            <property name="host" value="localhost"/>
+            <property name="port" value="27017"/>
+          </bean>
+	  	</constructor-arg>
+	  	<constructor-arg name="databaseName" value="repositories"/>
 	  </bean>
     </constructor-arg>
-    <constructor-arg value="repositories" />
 	<constructor-arg>
 	  <bean id="mongoConverter" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
 	  	<constructor-arg ref="mappingContext" />
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
index 9d0ff16a1..acf4c1d3b 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
@@ -8,11 +8,15 @@
 		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd">
   
   <mongo:mongo id="mongo" />
+
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="repositories"/>
+  </bean>
   
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo" />
-    <constructor-arg value="repositories" />
-    <constructor-arg>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
+    <constructor-arg name="mongoConverter">
       <mongo:mapping-converter />
     </constructor-arg>
   </bean>
diff --git a/spring-data-mongodb/src/test/resources/template-mapping.xml b/spring-data-mongodb/src/test/resources/template-mapping.xml
index 7861e6514..9b66c6394 100644
--- a/spring-data-mongodb/src/test/resources/template-mapping.xml
+++ b/spring-data-mongodb/src/test/resources/template-mapping.xml
@@ -9,6 +9,11 @@
   
   <mongo:mongo host="localhost" port="27017"/>
 
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  	<constructor-arg name="mongo" ref="mongo"/>
+  	<constructor-arg name="databaseName" value="database"/>
+  </bean>
+  
   <bean id="mappingConverter1" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
     <constructor-arg ref="mappingContext" />
     <property name="converters">
@@ -22,9 +27,8 @@
   <bean id="mappingContext" class="org.springframework.data.document.mongodb.mapping.MongoMappingContext"/>
 
   <bean id="mongoTemplate1" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo"/>
-    <constructor-arg name="databaseName" value="database"/>
-    <constructor-arg ref="mappingConverter1"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter1"/>
   </bean>
 
   <mongo:mapping-converter id="mappingConverter2" base-package="org.springframework.data.document.mongodb.mapping"
@@ -40,9 +44,8 @@
   </mongo:mapping-converter>      
 
   <bean id="mongoTemplate2" class="org.springframework.data.document.mongodb.MongoTemplate">
-    <constructor-arg ref="mongo"/>
-    <constructor-arg name="databaseName" value="database"/>
-    <constructor-arg ref="mappingConverter2"/>
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter2"/>
   </bean>