diff --git a/spring-data-mongodb/src/test/resources/geospatial.xml b/spring-data-mongodb/src/test/resources/geospatial.xml
index ed4946287..1f4b53fc9 100644
--- a/spring-data-mongodb/src/test/resources/geospatial.xml
+++ b/spring-data-mongodb/src/test/resources/geospatial.xml
@@ -11,8 +11,8 @@
   
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
     <constructor-arg ref="mongo"/>
-    <constructor-arg value="geospatial"/>
-    <constructor-arg value="newyork"/>
+    <constructor-arg name="databaseName" value="geospatial"/>
+    <constructor-arg name="defaultCollectionName" value="newyork"/>
     <constructor-arg ref="mappingConverter"/>
   </bean>
 
diff --git a/spring-data-mongodb/src/test/resources/mapping.xml b/spring-data-mongodb/src/test/resources/mapping.xml
index 4dff919f5..aba61fa66 100644
--- a/spring-data-mongodb/src/test/resources/mapping.xml
+++ b/spring-data-mongodb/src/test/resources/mapping.xml
@@ -10,8 +10,8 @@
 
   <bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
     <constructor-arg ref="mongo"/>
-    <constructor-arg value="database"/>
-    <constructor-arg value="person"/>
+    <constructor-arg name="databaseName" value="database"/>
+    <constructor-arg name="defaultCollectionName" value="person"/>
     <constructor-arg ref="mappingConverter"/>
   </bean>