diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java
index 1c5be5c980..a8d6ae332f 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java
@@ -116,6 +116,16 @@ public class UdpUnicastEndToEndTests implements Runnable {
 	public void run() {
 		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"testIp-in-context.xml", UdpUnicastEndToEndTests.class);
+		UnicastReceivingChannelAdapter inbound = ctx.getBean(UnicastReceivingChannelAdapter.class);
+		int n = 0;
+		try {
+			while (!inbound.isListening()) {
+				Thread.sleep(100);
+				if (n++ > 100) {
+					throw new RuntimeException("Failed to start listening");
+				}
+			}
+		} catch (Exception e) { }
 		while (okToRun) {
 			try {
 				readyToReceive.countDown();
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
index dd203b878d..f0786fde4d 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/testIp-out-context.xml
@@ -35,7 +35,7 @@
 		acknowledge="true"
 		ack-host="localhost"
 		ack-port="22222"
-		ack-timeout="2000"
+		ack-timeout="10000"
 		channel="outputChannel"/>
 
 	<beans:import resource="testIp-common-context.xml" />