diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
index 079c15d756..c7e89ad103 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
@@ -140,8 +140,16 @@ public class JmsOutboundGatewayTests {
 		gateway.setBeanFactory(beanFactory);
 		gateway.afterPropertiesSet();
 		gateway.start();
-		Thread.sleep(1000);
-		assertTrue(count.get() > 4);
-		assertEquals(0, errors.size());
+		try {
+			int n = 0;
+			while (n++ < 100 && count.get() < 5) {
+				Thread.sleep(100);
+			}
+			assertTrue(count.get() > 4);
+			assertEquals(0, errors.size());
+		}
+		finally {
+			gateway.stop();
+		}
 	}
 }