diff --git a/spring-integration-smb/build.gradle b/spring-integration-smb/build.gradle
index 2f1dbbb..b2fc023 100644
--- a/spring-integration-smb/build.gradle
+++ b/spring-integration-smb/build.gradle
@@ -44,8 +44,8 @@ ext {
     idPrefix = 'smb'
 
     jcifsVersion = '2.1.29'
-    log4jVersion = '2.13.3'
-    springIntegrationVersion = '5.3.1.RELEASE'
+    log4jVersion = '2.17.2'
+    springIntegrationVersion = '5.3.10.RELEASE'
 
 
     linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java
index 42c1606..41fb8e2 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -37,6 +38,7 @@ import org.springframework.integration.smb.AbstractBaseTests;
 import org.springframework.integration.smb.session.SmbSession;
 import org.springframework.integration.smb.session.SmbSessionFactory;
 import org.springframework.messaging.support.GenericMessage;
+import org.springframework.util.FileSystemUtils;
 
 import jcifs.smb.SmbFile;
 
@@ -64,6 +66,11 @@ public class SmbSendingMessageHandlerTests extends AbstractBaseTests {
 		smbSessionFactory.setShareAndDir("smb-share/");
 	}
 
+	@After
+	public void cleanup() {
+		FileSystemUtils.deleteRecursively(new File("remote-target-dir"));
+	}
+
 	@Test
 	public void testHandleFileContentMessage() {
 		File file = createNewFile("remote-target-dir/handlerContent.test");
@@ -73,7 +80,7 @@ public class SmbSendingMessageHandlerTests extends AbstractBaseTests {
 		handler.setAutoCreateDirectory(true);
 		handler.setBeanFactory(mock(BeanFactory.class));
 		handler.afterPropertiesSet();
-		handler.handleMessage(new GenericMessage<String>("hello"));
+		handler.handleMessage(new GenericMessage<>("hello"));
 		assertFileExists(file);
 	}
 
@@ -83,9 +90,10 @@ public class SmbSendingMessageHandlerTests extends AbstractBaseTests {
 		SmbMessageHandler handler = new SmbMessageHandler(smbSessionFactory);
 		handler.setRemoteDirectoryExpression(new LiteralExpression("remote-target-dir"));
 		handler.setFileNameGenerator(message -> "handlerContent.test");
+		handler.setAutoCreateDirectory(true);
 		handler.setBeanFactory(mock(BeanFactory.class));
 		handler.afterPropertiesSet();
-		handler.handleMessage(new GenericMessage<byte[]>("hello".getBytes()));
+		handler.handleMessage(new GenericMessage<>("hello".getBytes()));
 		assertFileExists(file);
 	}
 
@@ -134,14 +142,9 @@ public class SmbSendingMessageHandlerTests extends AbstractBaseTests {
 				// when(smbSession.write(Mockito.any(byte[].class), Mockito.anyString())).thenReturn(null);
 				// when(smbSession.write(Mockito.any(File.class), Mockito.anyString())).thenReturn(null);
 
-				doAnswer(new Answer<Object>() {
-
-					@Override
-					public Object answer(InvocationOnMock _invocation) {
-						String path = (String) _invocation.getArguments()[0];
-						new File(path).mkdirs();
-						return null;
-					}
+				doAnswer((Answer<Object>) _invocation -> {
+					String path = (String) _invocation.getArguments()[0];
+					return new File(path).mkdirs();
 				}).when(smbSession).mkdir(Mockito.anyString());
 
 				doAnswer(_invocation -> {
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java
index 8c2cb98..db9a748 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java
@@ -27,6 +27,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -38,6 +39,7 @@ import org.springframework.expression.common.LiteralExpression;
 import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler;
 import org.springframework.integration.smb.AbstractBaseTests;
 import org.springframework.messaging.support.GenericMessage;
+import org.springframework.util.FileSystemUtils;
 
 import jcifs.CIFSContext;
 import jcifs.context.SingletonContext;
@@ -45,6 +47,7 @@ import jcifs.smb.SmbFile;
 
 /**
  * @author Gregory Bragg
+ * @author Artem Bilan
  */
 public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests {
 
@@ -67,10 +70,15 @@ public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests {
 		smbSessionFactory.setShareAndDir("smb-share/");
 	}
 
+	@After
+	public void cleanup() {
+		FileSystemUtils.deleteRecursively(new File("remote-target-dir"));
+	}
+
 	@Test
 	public void testHandleFileContentMessage() {
 		File file = createNewFile("remote-target-dir/handlerContent.test");
-		FileTransferringMessageHandler<?> handler = new FileTransferringMessageHandler<SmbFile>(smbSessionFactory);
+		FileTransferringMessageHandler<?> handler = new FileTransferringMessageHandler<>(smbSessionFactory);
 		handler.setRemoteDirectoryExpression(new LiteralExpression("remote-target-dir"));
 		handler.setFileNameGenerator(message -> "handlerContent.test");
 		handler.setAutoCreateDirectory(true);
@@ -81,6 +89,7 @@ public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests {
 	}
 
 	class TestSmbSessionFactory extends SmbSessionFactory {
+
 		private CIFSContext context;
 
 		protected TestSmbSessionFactory(CIFSContext _context) {
@@ -122,14 +131,9 @@ public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests {
 				// when(smbSession.write(Mockito.any(byte[].class), Mockito.anyString())).thenReturn(null);
 				// when(smbSession.write(Mockito.any(File.class), Mockito.anyString())).thenReturn(null);
 
-				doAnswer(new Answer<Object>() {
-
-					@Override
-					public Object answer(InvocationOnMock _invocation) {
-						String path = (String) _invocation.getArguments()[0];
-						new File(path).mkdirs();
-						return null;
-					}
+				doAnswer(_invocation -> {
+					String path = (String) _invocation.getArguments()[0];
+					return new File(path).mkdirs();
 				}).when(smbSession).mkdir(Mockito.anyString());
 
 				doAnswer(_invocation -> {