diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 595aedcf..cae18afb 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -11,8 +11,18 @@
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<activemq.version>5.5.1</activemq.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
@@ -22,13 +32,12 @@
 					<artifactId>spring-context</artifactId>
 					<groupId>org.springframework</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.springframework.integration</groupId> -->
-<!-- 			<artifactId>spring-integration-jms</artifactId> -->
-<!-- 			<version>${spring.integration.version}</version> -->
-<!-- 		</dependency> -->
 	    <dependency>
 	      <groupId>org.springframework</groupId>
 	      <artifactId>spring-jms</artifactId>
@@ -39,12 +48,24 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
 			<version>${spring.integration.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-jms</artifactId>
+            <version>${spring.integration.version}</version>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-stream</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/basic/jms/src/test/resources/log4j.xml b/basic/jms/src/main/resources/log4j.xml
similarity index 81%
rename from basic/jms/src/test/resources/log4j.xml
rename to basic/jms/src/main/resources/log4j.xml
index dc3bb774..f391e2ed 100644
--- a/basic/jms/src/test/resources/log4j.xml
+++ b/basic/jms/src/main/resources/log4j.xml
@@ -19,14 +19,6 @@
 		<level value="debug" />
 	</logger>
 
-	<logger name="org.springframework.integration.jms">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.apache.activemq">
-		<level value="error" />
-	</logger>
-	
 	<!-- Root Logger -->
 	<root>
 		<priority value="warn" />
diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
index fc19ae79..0c53be59 100644
--- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
+++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemo.java
@@ -16,7 +16,18 @@
 
 package org.springframework.integration.samples.jms;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import junit.framework.Assert;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.support.MessageBuilder;
 
 /**
  * A simple bootstrap main() method for starting a pair of JMS Channel
@@ -26,18 +37,17 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * Destination and will echo the result in the console.
  * <p>
  * See the configuration in the three XML files that are referenced below.
- * 
+ *
  * @author Mark Fisher
  */
 public class ChannelAdapterDemo {
 
 	private final static String[] configFiles = {
-		"/META-INF/spring/integration/common.xml", 
-		"/META-INF/spring/integration/inboundChannelAdapter.xml", 
+		"/META-INF/spring/integration/common.xml",
+		"/META-INF/spring/integration/inboundChannelAdapter.xml",
 		"/META-INF/spring/integration/outboundChannelAdapter.xml"
 	};
 
-
 	public static void main(String[] args) {
 		ActiveMqTestUtils.prepare();
 		new ClassPathXmlApplicationContext(configFiles, ChannelAdapterDemo.class);