diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
index 26b8f57d0a..e38278ba31 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
@@ -152,8 +152,8 @@ public class MessageBusTests {
 		bus.registerHandler("handler2", handler2, new Subscription(inputChannel));
 		bus.start();
 		inputChannel.send(new StringMessage(1, "testing"));
-		Message<?> message1 = outputChannel1.receive(100);
-		Message<?> message2 = outputChannel2.receive(0);
+		Message<?> message1 = outputChannel1.receive(200);
+		Message<?> message2 = outputChannel2.receive(200);
 		bus.stop();
 		assertTrue("both handlers should have received and replied to the message",
 				(message1 != null && message2 != null));
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java
index db1d6bfedc..2712d97e42 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java
@@ -176,7 +176,7 @@ public class DefaultMessageDispatcherTests {
 		dispatcher.start();
 		latch.await(2000, TimeUnit.MILLISECONDS);
 		assertEquals("messages should have been dispatched within allotted time", 0, latch.getCount());
-		Message<?> errorMessage = errorChannel.receive(500);
+		Message<?> errorMessage = errorChannel.receive(1000);
 		assertNotNull(errorMessage);
 		assertTrue(errorMessage instanceof ErrorMessage);
 		assertEquals(MessageDeliveryException.class, ((ErrorMessage) errorMessage).getPayload().getClass());