diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml
new file mode 100644
index 0000000000..4a3b551b7f
--- /dev/null
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests-context-fail-autocreate.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:sftp="http://www.springframework.org/schema/integration/sftp"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+						http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+						http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
+
+
+	<channel id="requestChannel"/>
+	
+	<beans:bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.SftpSessionFactory">
+		<beans:property name="host" value="loclahost"/>
+		<beans:property name="knownHosts" value="local, foo.com, bar.foo"/>
+		<beans:property name="privateKey" value="classpath:org/springframework/integration/sftp/config/sftpTest"/>
+		<beans:property name="privateKeyPassphrase" value="ghj"/>
+		<beans:property name="password" value="hello"/>
+		<beans:property name="port" value="2222"/>
+		<beans:property name="user" value="oleg"/>
+	</beans:bean>
+	
+	<sftp:inbound-channel-adapter id="sftpAdapterNoAutoCreate"
+			channel="requestChannel"
+			session-factory="sftpSessionFactory"
+			filter="filter"
+			remote-directory="/foo"
+			local-directory="file:foo"
+			auto-create-directories="false"
+			auto-delete-remote-files-on-sync="false">
+		<poller fixed-rate="1000"/>
+	</sftp:inbound-channel-adapter>
+	
+	<beans:bean id="filter" class="org.springframework.integration.sftp.filters.SftpPatternMatchingFileListFilter">
+		<beans:constructor-arg value="."/>
+	</beans:bean>
+
+</beans:beans>
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java
index 58a75eb6b3..299f8dca09 100644
--- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapaterParserTests.java
@@ -62,7 +62,7 @@ public class InboundChannelAdapaterParserTests {
 
 	@Test(expected=BeanDefinitionStoreException.class)
 	//exactly one of 'filename-pattern' or 'filter' is allowed on SFTP inbound adapter
-	public void testLocalFilesAutoCreationFalse() throws Exception{
+	public void testFailWithFilePatternAndFilter() throws Exception{
 		assertTrue(!new File("target/bar").exists());
 		new ClassPathXmlApplicationContext("InboundChannelAdapaterParserTests-context-fail.xml", this.getClass());
 	}
@@ -81,6 +81,11 @@ public class InboundChannelAdapaterParserTests {
 		assertTrue(new File("foo").exists());
 	}
 	
+	@Test(expected=BeanCreationException.class)
+	public void testLocalDirAutoCreateFailed() throws Exception{
+		new ClassPathXmlApplicationContext("InboundChannelAdapaterParserTests-context-fail-autocreate.xml", this.getClass());
+	}
+	
 	@After
 	public void cleanUp() throws Exception{
 		new File("foo").delete();