diff --git a/org.springframework.integration.ip/ivy.xml b/org.springframework.integration.ip/ivy.xml
index e1568c895c..a01f7108c9 100644
--- a/org.springframework.integration.ip/ivy.xml
+++ b/org.springframework.integration.ip/ivy.xml
@@ -29,6 +29,7 @@
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>                
+        <dependency org="org.springframework.integration" name="org.springframework.integration.stream" rev="latest.integration" conf="test->runtime"/>        
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpMulticastEndToEnd.java b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpMulticastEndToEndTests.java
similarity index 94%
rename from org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpMulticastEndToEnd.java
rename to org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpMulticastEndToEndTests.java
index 0d1bdbf126..c1ff6868dd 100644
--- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpMulticastEndToEnd.java
+++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpMulticastEndToEndTests.java
@@ -47,7 +47,7 @@ import org.springframework.integration.message.StringMessage;
  * @author Gary Russell
  * @since 2.0
  */
-public class TestIpMulticastEndToEnd implements Runnable {
+public class UdpMulticastEndToEndTests implements Runnable {
 
 	private String testingIpText;
 
@@ -67,12 +67,12 @@ public class TestIpMulticastEndToEnd implements Runnable {
 	@Test
 	@Ignore
 	public void runIt() throws Exception {
-		TestIpMulticastEndToEnd launcher = new TestIpMulticastEndToEnd();
+		UdpMulticastEndToEndTests launcher = new UdpMulticastEndToEndTests();
 		Thread t = new Thread(launcher);
 		t.start(); // launch the receiver
 		AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext(
 				"testIp-out-multicast-context.xml",
-				TestIpMulticastEndToEnd.class);	
+				UdpMulticastEndToEndTests.class);	
 		launcher.launchSender(applicationContext);
 		applicationContext.stop();
 	}
@@ -113,7 +113,7 @@ public class TestIpMulticastEndToEnd implements Runnable {
 	public void run() {
 		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"testIp-in-multicast-context.xml",
-				TestIpMulticastEndToEnd.class);
+				UdpMulticastEndToEndTests.class);
 		while (okToRun) {
 			try {
 				sentFirst.await();
@@ -139,7 +139,7 @@ public class TestIpMulticastEndToEnd implements Runnable {
 
 	public static void main(String[] args) throws Exception {
 		hangAroundFor = 120000;
-		new TestIpMulticastEndToEnd().runIt();
+		new UdpMulticastEndToEndTests().runIt();
 	}
 
 }
diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpEndToEnd.java b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpUnicastEndToEndTests.java
similarity index 92%
rename from org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpEndToEnd.java
rename to org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpUnicastEndToEndTests.java
index 0076b5e250..21d4959158 100644
--- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/TestIpEndToEnd.java
+++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/UdpUnicastEndToEndTests.java
@@ -47,7 +47,7 @@ import org.springframework.integration.message.StringMessage;
  * @author Gary Russell
  * @since 2.0
  */
-public class TestIpEndToEnd implements Runnable {
+public class UdpUnicastEndToEndTests implements Runnable {
 
 	private String testingIpText;
 
@@ -66,10 +66,10 @@ public class TestIpEndToEnd implements Runnable {
 
 	@Test
 	public void runIt() throws Exception {
-		TestIpEndToEnd launcher = new TestIpEndToEnd();
+		UdpUnicastEndToEndTests launcher = new UdpUnicastEndToEndTests();
 		Thread t = new Thread(launcher);
 		t.start(); // launch the receiver
-		AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext("testIp-out-context.xml", TestIpEndToEnd.class);	
+		AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext("testIp-out-context.xml", UdpUnicastEndToEndTests.class);	
 		launcher.launchSender(applicationContext);
 		applicationContext.stop();
 	}
@@ -108,7 +108,7 @@ public class TestIpEndToEnd implements Runnable {
 	 * Instantiate the receiving context
 	 */
 	public void run() {
-		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext("testIp-in-context.xml", TestIpEndToEnd.class);
+		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext("testIp-in-context.xml", UdpUnicastEndToEndTests.class);
 		while (okToRun) {
 			try {
 				sentFirst.await();
@@ -134,7 +134,7 @@ public class TestIpEndToEnd implements Runnable {
 
 	public static void main(String[] args) throws Exception {
 		hangAroundFor = 120000;
-		new TestIpEndToEnd().runIt();
+		new UdpUnicastEndToEndTests().runIt();
 	}
 
 }