diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
index 0691b0d0ae..b64ef9de21 100644
--- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
+++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTest.java
@@ -137,7 +137,8 @@ public class FtpSendingMessageHandlerTest {
 					public Boolean answer(InvocationOnMock invocation)
 							throws Throwable {
 						File file = new File((String) invocation.getArguments()[0]);
-						file.renameTo(new File(file.getParent(), (String) invocation.getArguments()[1]));
+						File renameToFile = new File((String) invocation.getArguments()[1]);
+						file.renameTo(renameToFile);
 						return true;
 					}
 				});
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java
index d2f8586d05..2d4698c198 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java
@@ -126,7 +126,8 @@ public class SftpSendingMessageHandlerTests {
 							throws Throwable {
 						File file = new File((String) invocation.getArguments()[0]);
 						assertTrue(file.getName().endsWith(FileWritingMessageHandler.TEMPORARY_FILE_SUFFIX));
-						file.renameTo(new File(file.getParent(), (String) invocation.getArguments()[1]));
+						File renameToFile = new File((String) invocation.getArguments()[1]);
+						file.renameTo(renameToFile);
 						return null;
 					}