diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
index 05eba28ac..264d474b5 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
@@ -8,9 +8,12 @@
 		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<mongo:db-factory dbname="repositories" />
-	
+
+	<mongo:mapping-converter auto-index-creation="true" />
+
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg ref="mongoDbFactory" />
+		<constructor-arg ref="mappingConverter" />
 		<property name="writeConcern">
 			<util:constant static-field="com.mongodb.WriteConcern.JOURNALED" />
 		</property>
@@ -29,5 +32,5 @@
 	</bean>
 
 	<bean class="org.springframework.data.mongodb.repository.SampleEvaluationContextExtension" />
-	
+
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
index f335c637f..b70efb607 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
@@ -11,8 +11,11 @@
 
 	<mongo:db-factory dbname="repositories"/>
 
+	<mongo:mapping-converter auto-index-creation="true" />
+
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+		<constructor-arg ref="mappingConverter" />
 		<property name="writeConcern">
 			<util:constant static-field="com.mongodb.WriteConcern.ACKNOWLEDGED" />
 		</property>