diff --git a/buildSrc b/buildSrc
index 1a05823b61..2e7df56522 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 1a05823b61c0df2fe7cbe61697f75cde4558b74a
+Subproject commit 2e7df565220081896699549b48ebe102b4ac164e
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java
index c4cee5f7fc..14a7fb4f0f 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
index 97e37340bb..6806edd78d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java
@@ -27,7 +27,6 @@ import java.util.Set;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.junit.Test;
-import org.mockito.Mockito;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationContext;
@@ -35,8 +34,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.file.filters.CompositeFileListFilter;
 import org.springframework.integration.ftp.client.DefaultFtpClientFactory;
-import org.springframework.integration.ftp.client.FtpClientFactory;
-import org.springframework.integration.ftp.client.FtpClientPool;
 import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer;
 import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource;
 import org.springframework.integration.test.util.TestUtils;
@@ -65,15 +62,6 @@ public class FtpInboundChannelAdapterParserTests {
 		assertEquals(2, filters.size());
 		assertTrue(filters.contains(ac.getBean("entryListFilter")));
 		
-		FtpClientPool clientPoll = (FtpClientPool) TestUtils.getPropertyValue(inbound, "clientPool");
-		
-//		FtpClientFactory<?> clientFactory = (FtpClientFactory<?>) TestUtils.getPropertyValue(clientPoll, "factory");
-//		assertEquals("localhost", TestUtils.getPropertyValue(clientFactory, "host"));
-//		assertEquals(22, TestUtils.getPropertyValue(clientFactory, "port"));
-//		assertEquals("user", TestUtils.getPropertyValue(clientFactory, "username"));
-//		assertEquals("password", TestUtils.getPropertyValue(clientFactory, "password"));
-//		assertEquals("foo/bar", TestUtils.getPropertyValue(clientFactory, "remoteWorkingDirectory"));
-//		System.out.println();
 	}
 	
 	@Test
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java
index 7c6f6f45e4..fe2d5fe52b 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests.java
@@ -23,15 +23,12 @@ import static junit.framework.Assert.assertTrue;
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.file.filters.CompositeFileListFilter;
-import org.springframework.integration.ftp.client.FtpClientFactory;
-import org.springframework.integration.ftp.client.FtpClientPool;
 import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizer;
 import org.springframework.integration.ftp.inbound.FtpInboundRemoteFileSystemSynchronizingMessageSource;
 import org.springframework.integration.test.util.TestUtils;
@@ -61,15 +58,6 @@ public class FtpsInboundChannelAdapterParserTests {
 		assertEquals(2, filters.size());
 		assertTrue(filters.contains(ac.getBean("entryListFilter")));
 		
-		FtpClientPool clientPoll = (FtpClientPool) TestUtils.getPropertyValue(inbound, "clientPool");
-		
-//		FtpClientFactory<?> clientFactory = (FtpClientFactory<?>) TestUtils.getPropertyValue(clientPoll, "factory");
-//		assertEquals("localhost", TestUtils.getPropertyValue(clientFactory, "host"));
-//		assertEquals(22, TestUtils.getPropertyValue(clientFactory, "port"));
-//		assertEquals("user", TestUtils.getPropertyValue(clientFactory, "username"));
-//		assertEquals("password", TestUtils.getPropertyValue(clientFactory, "password"));
-//		assertEquals("foo/bar", TestUtils.getPropertyValue(clientFactory, "remoteWorkingDirectory"));
-//		System.out.println();
 	}
 	
 	@Test
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
index 99acbaa3dd..c9613abc68 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests.java
@@ -19,7 +19,6 @@ import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.context.ApplicationContext;
@@ -53,8 +52,5 @@ public class FtpsOutboundChannelAdapterParserTests {
 		FtpClientFactory<?> clientFactory = (FtpClientFactory<?>) TestUtils.getPropertyValue(clientPoll, "factory");
 		assertEquals("localhost", TestUtils.getPropertyValue(clientFactory, "host"));
 		assertEquals(22, TestUtils.getPropertyValue(clientFactory, "port"));
-//		assertEquals("user", TestUtils.getPropertyValue(clientFactory, "username"));
-//		assertEquals("password", TestUtils.getPropertyValue(clientFactory, "password"));
-//		assertEquals("foo/bar", TestUtils.getPropertyValue(clientFactory, "remoteWorkingDirectory"));
 	}
 }
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
index a43e0b95ee..40a870125c 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.OutputStream;
-import java.util.Arrays;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;