diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
index 51330e69b..0f7f8f7a6 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
@@ -41,7 +41,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
index b636732ea..bfcb46632 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
@@ -62,7 +62,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<!-- Following dependencies are needed to support Kafka 1.1.0 client-->
diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
index 066484872..0ea16528f 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
@@ -57,7 +57,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml
index 52dda0c31..49864bf9d 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml
@@ -53,7 +53,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/binders/kinesis-binder/pom.xml b/binders/kinesis-binder/pom.xml
index 38c244ca6..f209b8998 100644
--- a/binders/kinesis-binder/pom.xml
+++ b/binders/kinesis-binder/pom.xml
@@ -70,7 +70,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
+				<artifactId>spring-cloud-stream-test-support</artifactId>
 				<version>${project.version}</version>
 				<scope>test</scope>
 			</dependency>
diff --git a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
index 3840430d7..241e9fcd4 100644
--- a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
+++ b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
@@ -70,7 +70,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 	
diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml
index 62b56ed65..c7d27a298 100644
--- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml
+++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml
@@ -85,7 +85,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-binder-test</artifactId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/bom/spring-cloud-stream-dependencies/pom.xml b/bom/spring-cloud-stream-dependencies/pom.xml
index 720f60246..abf0b4acb 100644
--- a/bom/spring-cloud-stream-dependencies/pom.xml
+++ b/bom/spring-cloud-stream-dependencies/pom.xml
@@ -28,11 +28,6 @@
 				<artifactId>spring-cloud-stream-test-binder</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-test-support</artifactId>
diff --git a/buildKafkaBinder.sh b/buildKafkaBinder.sh
index fcb4816ed..08050e93b 100755
--- a/buildKafkaBinder.sh
+++ b/buildKafkaBinder.sh
@@ -4,10 +4,10 @@ if [ "$#" -eq 1 ]; then
   ARGVALUE=$1
   if [[ $ARGVALUE == *"skipTest"* ]]; then
     echo "Skippping Tests"
-    ./mvnw clean install -f core/pom.xml -DskipTests
+    ./mvnw clean install -f binders/kafka-binder/pom.xml -DskipTests
   elif [[ $ARGVALUE == *"disable.checks"* ]]; then
     echo "Skippping checkstyle checks"
-    ./mvnw clean install -f core/pom.xml -Ddisable.checks=true
+    ./mvnw clean install -f binders/kafka-binder/pom.xml -Ddisable.checks=true
   fi
 else
   ./mvnw clean install -f binders/kafka-binder/pom.xml
diff --git a/core/pom.xml b/core/pom.xml
index 1d2199f83..db9909bb1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,8 +17,8 @@
 	<modules>
 		<module>spring-cloud-stream</module>
 		<module>spring-cloud-stream-test-binder</module>
-		<module>spring-cloud-stream-binder-test</module>
 		<module>spring-cloud-stream-integration-tests</module>
+		<module>spring-cloud-stream-test-support</module>
 	</modules>
 
 </project>
diff --git a/core/spring-cloud-stream-binder-test/.jdk8 b/core/spring-cloud-stream-test-support/.jdk8
similarity index 100%
rename from core/spring-cloud-stream-binder-test/.jdk8
rename to core/spring-cloud-stream-test-support/.jdk8
diff --git a/core/spring-cloud-stream-binder-test/pom.xml b/core/spring-cloud-stream-test-support/pom.xml
similarity index 80%
rename from core/spring-cloud-stream-binder-test/pom.xml
rename to core/spring-cloud-stream-test-support/pom.xml
index a9db9e2de..6764a9b0e 100644
--- a/core/spring-cloud-stream-binder-test/pom.xml
+++ b/core/spring-cloud-stream-test-support/pom.xml
@@ -4,10 +4,10 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-stream-binder-test</artifactId>
+	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<packaging>jar</packaging>
 
-	<name>spring-cloud-stream-binder-test</name>
+	<name>spring-cloud-stream-test-support</name>
 	<description>Test support for binder implementations</description>
 
 	<parent>
@@ -44,11 +44,5 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>compile</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.cloud</groupId>-->
-<!--			<artifactId>spring-cloud-stream</artifactId>-->
-<!--			<type>test-jar</type>-->
-<!--			<classifier>test-binder</classifier>-->
-<!--		</dependency>-->
 	</dependencies>
 </project>
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractPollableConsumerTestBinder.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractPollableConsumerTestBinder.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractPollableConsumerTestBinder.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractPollableConsumerTestBinder.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestUtils.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/BinderTestUtils.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestUtils.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/BinderTestUtils.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/PartitionCapableBinderTests.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionTestSupport.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/PartitionTestSupport.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/PartitionTestSupport.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/PartitionTestSupport.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/SerializableFoo.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/SerializableFoo.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/SerializableFoo.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/SerializableFoo.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/Spy.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/Spy.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/Spy.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/Spy.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/TestUtils.java b/core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/TestUtils.java
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/TestUtils.java
rename to core/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/binder/TestUtils.java
diff --git a/core/spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories b/core/spring-cloud-stream-test-support/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from core/spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories
rename to core/spring-cloud-stream-test-support/src/main/resources/META-INF/spring.factories