diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml
index b379e685ba..51bcfda7ce 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/gatewayMaintainsReplyChannel.xml
@@ -16,19 +16,21 @@
     </int:gateway>
 		
 	<int:chain input-channel="requests">
-		<int-jms:outbound-gateway request-destination="requestQueue" 
-	                              reply-destination="replyQueue" 
-	                              connection-factory="connectionFactory"/>
+		<int-jms:outbound-gateway request-destination="requestQueueA" 
+	                              reply-destination="replyQueueB" 
+	                              connection-factory="connectionFactory"
+	                              receive-timeout="10000"
+	                              reply-timeout="20000"/>
 	</int:chain>
 	
 	
 	
-	<bean id="requestQueue" class="org.apache.activemq.command.ActiveMQQueue">
-		<constructor-arg value="request.queue"/>
+	<bean id="requestQueueA" class="org.apache.activemq.command.ActiveMQQueue">
+		<constructor-arg value="request.queueA"/>
 	</bean>
 
-	<bean id="replyQueue" class="org.apache.activemq.command.ActiveMQQueue">
-		<constructor-arg value="reply.queue"/>
+	<bean id="replyQueueB" class="org.apache.activemq.command.ActiveMQQueue">
+		<constructor-arg value="reply.queueB"/>
 	</bean>
 	
 
@@ -42,7 +44,7 @@
 		<property name="cacheProducers" value="false"/>
 	</bean>
 	
-	<int-jms:inbound-gateway request-channel="jmsInput" request-destination="requestQueue"/>
+	<int-jms:inbound-gateway request-channel="jmsInput" request-destination="requestQueueA"/>
 	
 	<int:channel id="jmsInput"/>