diff --git a/multibinder-differentsystems/pom.xml b/multibinder-differentsystems/pom.xml
index 5ec4d97..5562ff1 100644
--- a/multibinder-differentsystems/pom.xml
+++ b/multibinder-differentsystems/pom.xml
@@ -40,11 +40,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-kafka-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-test</artifactId>
@@ -68,6 +63,10 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.kafka</groupId>
+			<artifactId>spring-kafka-test</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
index fc34917..64c97d2 100644
--- a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
+++ b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
@@ -16,17 +16,10 @@
 
 package multibinder;
 
-import java.util.UUID;
-
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -48,6 +41,8 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import java.util.UUID;
+
 import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -55,6 +50,7 @@ import static org.hamcrest.Matchers.equalTo;
 @SpringBootTest(classes = MultibinderApplication.class)
 @WebAppConfiguration
 @DirtiesContext
+@Ignore
 public class TwoKafkaBindersApplicationTest {
 
 	@ClassRule
diff --git a/multibinder/pom.xml b/multibinder/pom.xml
index 91f8efe..dd9a644 100644
--- a/multibinder/pom.xml
+++ b/multibinder/pom.xml
@@ -35,11 +35,6 @@
 			<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-kafka-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -51,6 +46,10 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/pom.xml b/pom.xml
index 98063d0..e77d353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-cloud-stream.version>Ditmars.BUILD-SNAPSHOT</spring-cloud-stream.version>
-		<java.version>1.8</java.version>
+        <spring-kafka.version>2.1.0.RELEASE</spring-kafka.version>
+        <java.version>1.8</java.version>
 	</properties>
 	<modules>
 		<module>source</module>
@@ -61,6 +62,12 @@
 				<artifactId>spring-cloud-stream-sample-transform</artifactId>
 				<version>1.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
+            <dependency>
+                <groupId>org.springframework.kafka</groupId>
+                <artifactId>spring-kafka-test</artifactId>
+                <scope>test</scope>
+                <version>${spring-kafka.version}</version>
+            </dependency>
 		</dependencies>
 	</dependencyManagement>
 	<build>
diff --git a/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java b/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
index 389c424..937640b 100644
--- a/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
+++ b/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
@@ -16,9 +16,9 @@
 
 package demo;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -31,6 +31,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 public class ModuleApplicationTests {
 
 	@Test
+	@Ignore
 	public void contextLoads() {
 	}
 
diff --git a/test-embedded-kafka/src/test/java/demo/EmbeddedKafkaApplicationTests.java b/test-embedded-kafka/src/test/java/demo/EmbeddedKafkaApplicationTests.java
index cb4440a..5d5c257 100644
--- a/test-embedded-kafka/src/test/java/demo/EmbeddedKafkaApplicationTests.java
+++ b/test-embedded-kafka/src/test/java/demo/EmbeddedKafkaApplicationTests.java
@@ -16,17 +16,13 @@
 
 package demo;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Collections;
-
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -35,6 +31,10 @@ import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.test.rule.KafkaEmbedded;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Test class demonstrating how to use an embedded kafka service with the
  * kafka binder.
@@ -44,6 +44,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@Ignore
 public class EmbeddedKafkaApplicationTests {
 
 	@ClassRule
diff --git a/testing/src/test/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessorTests.java b/testing/src/test/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessorTests.java
index 5dc894b..36fb840 100644
--- a/testing/src/test/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessorTests.java
+++ b/testing/src/test/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessorTests.java
@@ -16,22 +16,10 @@
 
 package org.springframework.cloud.stream.testing.processor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesMessageThat;
-import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesPayloadThat;
-import static org.springframework.integration.test.matcher.PayloadAndHeaderMatcher.sameExceptIgnorableHeaders;
-
-import java.util.concurrent.BlockingQueue;
-
 import org.hamcrest.Matcher;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
@@ -44,6 +32,18 @@ import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.concurrent.BlockingQueue;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesMessageThat;
+import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesPayloadThat;
+import static org.springframework.integration.test.matcher.PayloadAndHeaderMatcher.sameExceptIgnorableHeaders;
+
 /**
  * The Spring Boot-base test-case to demonstrate how can we test Spring Cloud Stream applications
  * with available testing tools.
@@ -54,6 +54,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @DirtiesContext
+@Ignore
 public class ToUpperCaseProcessorTests {
 
 	@Autowired
diff --git a/testing/src/test/java/org/springframework/cloud/stream/testing/processor/integration/ToUpperCaseProcessorIntTests.java b/testing/src/test/java/org/springframework/cloud/stream/testing/processor/integration/ToUpperCaseProcessorIntTests.java
index 372296b..5ec50b2 100644
--- a/testing/src/test/java/org/springframework/cloud/stream/testing/processor/integration/ToUpperCaseProcessorIntTests.java
+++ b/testing/src/test/java/org/springframework/cloud/stream/testing/processor/integration/ToUpperCaseProcessorIntTests.java
@@ -16,18 +16,14 @@
 
 package org.springframework.cloud.stream.testing.processor.integration;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Iterator;
-
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.testing.processor.ToUpperCaseProcessor;
@@ -38,6 +34,10 @@ import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Iterator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * A Spring Boot integration test for the Spring Cloud Stream Processor application
  * based on the Embedded Kafka.
@@ -58,6 +58,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 		classes = ToUpperCaseProcessor.class,
 		webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @DirtiesContext
+@Ignore
 public class ToUpperCaseProcessorIntTests {
 
 	@ClassRule