diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml
index 6218f570ed..c09a1d31b2 100644
--- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml
+++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml
@@ -10,24 +10,10 @@
 
 	<mongo:auditing />
 
-	<beans:bean id="mongoConnectionFactory"
-		class="org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory">
-		<beans:constructor-arg>
-			<beans:bean
-				class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
-				<beans:property name="mongoClientSettings">
-					<beans:bean
-						class="org.springframework.data.mongodb.core.MongoClientSettingsFactoryBean" />
-				</beans:property>
-			</beans:bean>
-		</beans:constructor-arg>
-		<beans:constructor-arg value="test" />
-	</beans:bean>
-
 	<beans:bean id="messageStore"
 		class="org.springframework.integration.mongodb.store.ConfigurableMongoDbMessageStore">
 		<beans:constructor-arg
-			ref="mongoConnectionFactory" />
+				value="#{T (org.springframework.integration.mongodb.store.DelayerHandlerRescheduleIntegrationTests).MONGO_DATABASE_FACTORY}"/>
 	</beans:bean>
 
 	<channel id="output">
diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml
index 153a7639f6..8cab01f4b3 100644
--- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml
+++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml
@@ -10,24 +10,10 @@
 
 	<mongo:auditing />
 
-	<beans:bean id="mongoConnectionFactory"
-		class="org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory">
-		<beans:constructor-arg>
-			<beans:bean
-				class="org.springframework.data.mongodb.core.MongoClientFactoryBean">
-				<beans:property name="mongoClientSettings">
-					<beans:bean
-						class="org.springframework.data.mongodb.core.MongoClientSettingsFactoryBean" />
-				</beans:property>
-			</beans:bean>
-		</beans:constructor-arg>
-		<beans:constructor-arg value="test" />
-	</beans:bean>
-
 	<beans:bean id="messageStore"
 		class="org.springframework.integration.mongodb.store.MongoDbMessageStore">
 		<beans:constructor-arg
-			ref="mongoConnectionFactory" />
+				value="#{T (org.springframework.integration.mongodb.store.DelayerHandlerRescheduleIntegrationTests).MONGO_DATABASE_FACTORY}"/>
 	</beans:bean>
 
 	<channel id="output">