diff --git a/spring-integration-samples/loan-broker/README.txt b/spring-integration-samples/loan-broker/README.txt
new file mode 100644
index 0000000000..f4dc00622a
--- /dev/null
+++ b/spring-integration-samples/loan-broker/README.txt
@@ -0,0 +1,21 @@
+Loan Broker sample is distributed as valid Eclipse/Maven project, so you can run it in two ways.
+
+Maven (command line):
+1. Execute 'mvn install'
+   You should see the output that looks similar to this:
+    . . . . .
+   	INFO : org.springframework.integration.loanbroker.demo.LoanBrokerDemo - 
+	********* Best Quote: 
+	====== Loan Quote =====
+	Lender: StubBank-11
+	Loan amount: $270,279
+	Quotation Date: Fri Mar 12 02:19:35 EST 2010
+	Expiration Date: Tue Mar 16 02:19:35 EDT 2010
+	Term: 17 years
+	Rate: 5.9092593%
+	=======================
+	. . . . .
+	
+Eclipse/STS (with m2eclipse plug-in)
+1. Import project into Eclipse/STS. If m2eclipse plugin is installed the dependency will be downloaded automatically
+2. Run 'org.springframework.integration.loanbroker.demo.LoanBrokerDemo' class located in 'src/test/java' 
\ No newline at end of file
diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml
index 36b6a73ba6..f7bde072de 100644
--- a/spring-integration-samples/loan-broker/pom.xml
+++ b/spring-integration-samples/loan-broker/pom.xml
@@ -56,9 +56,18 @@
 					<target>1.5</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<includes>
+						<include>**/*Demo.java</include>
+					</includes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-	
+
 
 	<repositories>
 		<repository>
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
similarity index 92%
rename from spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
rename to spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
index f89c5651e7..23095921cb 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
+++ b/spring-integration-samples/loan-broker/src/test/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
@@ -18,6 +18,7 @@ package org.springframework.integration.loanbroker.demo;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.junit.Test;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.loanbroker.LoanBrokerGateway;
@@ -27,30 +28,39 @@ import org.springframework.integration.loanbroker.domain.LoanRequest;
 
 /**
  * @author Oleg Zhurakousky
- *
+ * 
  */
 public class LoanBrokerDemo {
 	private static Logger logger = Logger.getLogger(LoanBrokerDemo.class);
+
 	/**
 	 * @param args
 	 */
 	public static void main(String[] args) {
+		new LoanBrokerDemo().runDemo();
+	}
+	/**
+	 * 
+	 */
+	@Test
+	public void runDemo() {
+
 		ConfigurableApplicationContext ac = 
 						new ClassPathXmlApplicationContext("bootstrap-config/stubed-loan-broker.xml");
+
 		LoanBrokerGateway broker = ac.getBean("loanBrokerGateway", LoanBrokerGateway.class);
 		LoanRequest loanRequest = new LoanRequest();
-		loanRequest.setCustomer(new Customer());   
-		
+		loanRequest.setCustomer(new Customer());
+
 		LoanQuote loan = broker.getLoanQuote(loanRequest);
 		logger.info("\n********* Best Quote: " + loan);
-		
+
 		List<LoanQuote> loanQuotes = broker.getAllLoanQuotes(loanRequest);
 		logger.info("\n********* All Quotes: ");
 		for (LoanQuote loanQuote : loanQuotes) {
 			logger.info(loanQuote);
 		}
-		
+
 		ac.close();
 	}
-
 }