diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
index 99d4281695..152b4e6774 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.ConversionServiceFactory;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.expression.TypeConverter;
 
 /**
@@ -45,7 +45,7 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware
 	public BeanFactoryTypeConverter() {
 		synchronized (BeanFactoryTypeConverter.class) {
 			if (defaultConversionService == null) {
-				defaultConversionService = ConversionServiceFactory.createDefaultConversionService();
+				defaultConversionService = new DefaultConversionService();
 			}
 		}
 		this.conversionService = defaultConversionService;
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java
index 7815b05eb2..ebee8103a4 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java
@@ -15,16 +15,8 @@
  */
 package org.springframework.integration.file.remote.handler;
 
-import static junit.framework.Assert.assertFalse;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.io.InputStream;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -37,6 +29,13 @@ import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.support.MessageBuilder;
 
+import static junit.framework.Assert.assertFalse;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 
 /**
  * @author Oleg Zhurakousky
@@ -88,30 +87,5 @@ public class FileTransferringMessageHandlerTests {
 		handler.handleMessage(message);
 		verify(session, times(1)).write(Mockito.any(InputStream.class), Mockito.anyString());
 	}
-	
-	@SuppressWarnings("rawtypes")
-	@Test
-	@Ignore
-	public void testWithNonString() throws Exception{
-		SessionFactory sf = mock(SessionFactory.class);
-		Session session = mock(Session.class);
-		
-		when(sf.getSession()).thenReturn(session);
-		doAnswer(new Answer() {
-			public Object answer(InvocationOnMock invocation) throws Throwable {
-				String path =  (String) invocation.getArguments()[1];
-				assertFalse(path.startsWith("/"));
-				return null;
-			}
-		}).when(session).rename(Mockito.anyString(), Mockito.anyString());
-		ExpressionParser parser = new SpelExpressionParser();
-		FileTransferringMessageHandler handler = new FileTransferringMessageHandler(sf);
-		handler.setRemoteDirectoryExpression(parser.parseExpression("headers['path']"));
-		handler.afterPropertiesSet();
-		Message<?> message = MessageBuilder.withPayload("hello").setHeader("path", new Foo()).build();
-		handler.handleMessage(message);
-		verify(session, times(1)).write(Mockito.any(InputStream.class), Mockito.anyString());
-	}
-	
-	private static class Foo{}
+
 }