diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
index 511fbc48ed..37fbfab335 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-context.xml
@@ -15,7 +15,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="2"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 	</bean>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
index 9513bbb4b2..5d505b0c7a 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests-fail-context.xml
@@ -15,7 +15,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="0"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 	</bean>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
index 3ca5dc92ce..0504712fc3 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserOutboundTests-context.xml
@@ -15,7 +15,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="0"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="temp"/>
 	</bean>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
index bc45e9c582..7cbe392f57 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests-context.xml
@@ -12,7 +12,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="0"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 	</bean>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
index 3da294b65d..17858ffea1 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsInboundChannelAdapterParserTests-context.xml
@@ -12,7 +12,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="0"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 	</bean>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
index 12c4e3519d..593adf783d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpsOutboundChannelAdapterParserTests-context.xml
@@ -19,7 +19,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="0"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 		<property name="useClientMode" value="true"/>
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
index ec0cad255e..bf79fdce9d 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/ftp-message-history-context.xml
@@ -16,7 +16,7 @@
 		<property name="port" value="22"/>
 		<property name="username" value="oleg"/>
 		<property name="password" value="password"/>
-		<property name="clientMode" value="1"/>
+		<property name="clientMode" value="2"/>
 		<property name="fileType" value="2"/>
 		<property name="remoteWorkingDirectory" value="foo/bar"/>
 	</bean>