diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961fd5a..0d4a951687 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bf3de21830..a95009c3b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
index 5cd3f66e63..47b1361577 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java
@@ -41,6 +41,7 @@ import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.channel.MessageChannels;
 import org.springframework.integration.dsl.Pollers;
+import org.springframework.integration.dsl.StandardIntegrationFlow;
 import org.springframework.integration.file.remote.aop.RotatingServerAdvice;
 import org.springframework.integration.file.remote.aop.RotatingServerAdvice.KeyDirectory;
 import org.springframework.integration.file.remote.session.CachingSessionFactory;
@@ -97,6 +98,7 @@ public class RotatingServersTests extends FtpTestSupport {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(StandardConfig.class);
 		StandardConfig config = ctx.getBean(StandardConfig.class);
 		assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue();
+		ctx.getBean(StandardIntegrationFlow.class).stop();
 		List<Integer> sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList());
 		assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1);
 		File f1 = new File(tmpDir + File.separator + "standard" + File.separator + "f1");
@@ -114,6 +116,7 @@ public class RotatingServersTests extends FtpTestSupport {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FairConfig.class);
 		StandardConfig config = ctx.getBean(StandardConfig.class);
 		assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue();
+		ctx.getBean(StandardIntegrationFlow.class).stop();
 		List<Integer> sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList());
 		assertThat(sfCalls).containsExactly(1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3);
 		File f1 = new File(tmpDir + File.separator + "fair" + File.separator + "f1");
@@ -132,6 +135,7 @@ public class RotatingServersTests extends FtpTestSupport {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(VariableLocalConfig.class);
 		StandardConfig config = ctx.getBean(StandardConfig.class);
 		assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue();
+		ctx.getBean(StandardIntegrationFlow.class).stop();
 		List<Integer> sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList());
 		assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1);
 		File f1 = new File(tmpDir + File.separator + "variable" + File.separator + "foo" + File.separator + "f1");
@@ -148,6 +152,7 @@ public class RotatingServersTests extends FtpTestSupport {
 	public void testStreaming() throws Exception {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(StreamingConfig.class);
 		StandardConfig config = ctx.getBean(StandardConfig.class);
+		ctx.getBean(StandardIntegrationFlow.class).stop();
 		assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue();
 		List<Integer> sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList());
 		// there's an extra getSession() with this adapter in listFiles