diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
index eb8ec95484..0b6250ffae 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileInboundChannelAdapterParser.java
@@ -40,18 +40,9 @@ public class FileInboundChannelAdapterParser extends AbstractPollingInboundChann
 	@Override
 	protected String parseSource(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-				PACKAGE_NAME + ".FileReadingMessageSource");
-		String comparator = element.getAttribute("comparator");
-		if (StringUtils.hasText(comparator)) {
-			builder.addConstructorArgReference(comparator);
-		}
-		String directory = element.getAttribute("directory");
-		if (StringUtils.hasText(directory)) {
-			if (directory.indexOf(':') == -1) {
-				directory = "file:" + directory;
-			}
-			builder.addPropertyValue("inputDirectory", directory);
-		}
+				PACKAGE_NAME + ".config.FileReadingMessageSourceFactoryBean");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "comparator");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "directory");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "auto-create-directory");
 		String filterBeanName = this.registerFileListFilter(element, parserContext);
 		builder.addPropertyReference("filter", filterBeanName);
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java
new file mode 100644
index 0000000000..0b8d76679d
--- /dev/null
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.file.config;
+
+import java.io.File;
+import java.util.Comparator;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceEditor;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.integration.file.FileListFilter;
+import org.springframework.integration.file.FileReadingMessageSource;
+import org.springframework.util.Assert;
+
+/**
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+public class FileReadingMessageSourceFactoryBean implements FactoryBean, ResourceLoaderAware {
+
+	private volatile FileReadingMessageSource source;
+
+	private volatile ResourceLoader resourceLoader;
+
+	private volatile String directory;
+
+	private volatile FileListFilter filter;
+
+	private volatile Comparator<File> comparator; 
+
+	private volatile Boolean scanEachPoll;
+
+	private volatile Boolean autoCreateDirectory;
+
+	private final Object initializationMonitor = new Object();
+
+
+	public void setResourceLoader(ResourceLoader resourceLoader) {
+		this.resourceLoader = resourceLoader;
+	}
+
+	public void setDirectory(String directory) {
+		Assert.hasText(directory, "directory must not be empty");
+		if (directory.indexOf(':') == -1) {
+			directory = "file:" + directory;
+		}
+		this.directory = directory;
+	}
+
+	public void setComparator(Comparator<File> comparator) {
+		this.comparator = comparator;
+	}
+
+	public void setFilter(FileListFilter filter) {
+		this.filter = filter;
+	}
+
+	public void setScanEachPoll(Boolean scanEachPoll) {
+		this.scanEachPoll = scanEachPoll;
+	}
+
+	public void setAutoCreateDirectory(Boolean autoCreateDirectory) {
+		this.autoCreateDirectory = autoCreateDirectory;
+	}
+
+	public Object getObject() throws Exception {
+		if (this.source == null) {
+			initSource();
+		}
+		return this.source;
+	}
+
+	public Class<?> getObjectType() {
+		return FileReadingMessageSource.class;
+	}
+
+	public boolean isSingleton() {
+		return true;
+	}
+
+	private void initSource() {
+		synchronized (this.initializationMonitor) {
+			if (this.source != null) {
+				return;
+			}
+			this.source = (this.comparator != null) ?
+					new FileReadingMessageSource(this.comparator) : new FileReadingMessageSource();
+			ResourceEditor editor = new ResourceEditor(this.resourceLoader);
+			editor.setAsText(this.directory);
+			this.source.setInputDirectory((Resource) editor.getValue());
+			if (this.filter != null) {
+				this.source.setFilter(this.filter);
+			}
+			if (this.scanEachPoll != null) {
+				this.source.setScanEachPoll(this.scanEachPoll);
+			}
+			if (this.autoCreateDirectory != null) {
+				this.source.setAutoCreateDirectory(this.autoCreateDirectory);
+			}
+			this.source.afterPropertiesSet();
+		}
+	}
+
+}
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java
index 26d31657bc..ba372c2719 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals;
 import java.io.File;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -36,7 +36,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-@Ignore
 public class FileInboundChannelAdapterWithClasspathInPropertiesTests {
 
 	@Autowired(required=true)