diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
index d6add4d6..6ed11868 100644
--- a/advanced/dynamic-ftp/pom.xml
+++ b/advanced/dynamic-ftp/pom.xml
@@ -8,7 +8,7 @@
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.0.RELEASE</spring.framework.version>
-		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.2.0.M1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
index d19c0bf8..514d732c 100644
--- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
+++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java
@@ -27,6 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.MessageHandlingException;
+import org.springframework.integration.MessagingException;
 import org.springframework.integration.support.MessageBuilder;
 
 /**
@@ -47,14 +48,14 @@ public class FtpOutboundChannelAdapterSample {
 						.build();
 		try {
 			channel.send(message);
-		} catch (MessageHandlingException e) {
+		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
 		}
 		// send another so we can see in the log we don't create the ac again.
 		try {
 			channel.send(message);
-		} catch (MessageHandlingException e) {
+		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
 		}
@@ -63,7 +64,7 @@ public class FtpOutboundChannelAdapterSample {
 				.setHeader("customer", "cust2").build();
 		try {
 			channel.send(message);
-		} catch (MessageHandlingException e) {
+		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust2", e.getCause().getCause().getMessage());
 		}
@@ -74,7 +75,7 @@ public class FtpOutboundChannelAdapterSample {
 				.setHeader("customer", "cust3").build();
 		try {
 			channel.send(message);
-		} catch (MessageHandlingException e) {
+		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust3", e.getCause().getCause().getMessage());
 		}
@@ -85,7 +86,7 @@ public class FtpOutboundChannelAdapterSample {
 				.setHeader("customer", "cust1").build();
 		try {
 			channel.send(message);
-		} catch (MessageHandlingException e) {
+		} catch (MessagingException e) {
 			assertTrue(e.getCause().getCause() instanceof UnknownHostException);
 			assertEquals("host.for.cust1", e.getCause().getCause().getMessage());
 		}