diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml
index d72a2763..ecb7e49b 100644
--- a/basic/kafka/pom.xml
+++ b/basic/kafka/pom.xml
@@ -89,6 +89,12 @@
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-kafka</artifactId>
       <version>1.2.2.BUILD-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -110,9 +116,23 @@
       <name>Spring Framework Maven Milestone Repository</name>
       <url>https://repo.spring.io/libs-milestone</url>
     </repository>
+    <repository>
+      <id>repo.spring.io.snapshot</id>
+      <name>Spring Framework Maven Snapshot Repository</name>
+      <url>https://repo.spring.io/libs-snapshot</url>
+    </repository>
   </repositories>
   <build>
     <plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-compiler-plugin</artifactId>
+			<version>2.3.2</version>
+			<configuration>
+				<source>1.8</source>
+				<target>1.8</target>
+			</configuration>
+		</plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/kafka/src/test/java/org/springframework/integration/samples/kafka/ApplicationTests.java
similarity index 90%
rename from basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java
rename to basic/kafka/src/test/java/org/springframework/integration/samples/kafka/ApplicationTests.java
index a7998d69..9aa22b5e 100644
--- a/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java
+++ b/basic/kafka/src/test/java/org/springframework/integration/samples/kafka/ApplicationTests.java
@@ -1,4 +1,4 @@
-package org.springframework.integration.samples.barrier;
+package org.springframework.integration.samples.kafka;
 /*
  * Copyright 2015 the original author or authors.
  *
@@ -20,7 +20,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.integration.samples.kafka.Application;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
diff --git a/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/KafkaRunning.java b/basic/kafka/src/test/java/org/springframework/integration/samples/kafka/KafkaRunning.java
similarity index 98%
rename from basic/kafka/src/test/java/org/springframework/integration/samples/barrier/KafkaRunning.java
rename to basic/kafka/src/test/java/org/springframework/integration/samples/kafka/KafkaRunning.java
index b77d0c43..1153900d 100644
--- a/basic/kafka/src/test/java/org/springframework/integration/samples/barrier/KafkaRunning.java
+++ b/basic/kafka/src/test/java/org/springframework/integration/samples/kafka/KafkaRunning.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.samples.barrier;
+package org.springframework.integration.samples.kafka;
 
 import org.I0Itec.zkclient.ZkClient;
 import org.apache.commons.logging.Log;