diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml
new file mode 100644
index 0000000000..428ff97835
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:int="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+	
+	<bean id="idGenerator" class="org.mockito.Mockito" factory-method="spy">
+		<constructor-arg>
+			<bean class="org.springframework.integration.core.MessageIdGenerationTests.SampleIdGeneratorA"/>
+		</constructor-arg>
+	</bean>
+	
+	<int:channel id="foo"/>
+	
+</beans>