diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index ce42e3d632..66fbd841a2 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -6,7 +6,7 @@
-
+
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
index fd59753245..fb05fce472 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java
@@ -80,7 +80,8 @@ public class AggregatingMessageHandlerTests {
CountDownLatch latch = new CountDownLatch(1);
AggregatorTestTask task = new AggregatorTestTask(aggregator, message, latch);
executor.execute(task);
- latch.await(1000, TimeUnit.MILLISECONDS);
+ latch.await(2000, TimeUnit.MILLISECONDS);
+ assertEquals("task should have completed within timeout", 0, latch.getCount());
Message reply = replyChannel.receive(0);
assertNull(reply);
Message discardedMessage = discardChannel.receive(1000);