diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml
index 496456e5..2aa0185e 100644
--- a/spring-cloud-task-integration-tests/pom.xml
+++ b/spring-cloud-task-integration-tests/pom.xml
@@ -135,10 +135,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<artifactId>spring-cloud-stream-test-binder</artifactId>
 			<version>${spring-cloud-stream.version}</version>
-			<type>test-jar</type>
-			<classifier>test-binder</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml
index f7fd96f7..2b974a22 100644
--- a/spring-cloud-task-samples/batch-events/pom.xml
+++ b/spring-cloud-task-samples/batch-events/pom.xml
@@ -87,10 +87,8 @@
 	 	</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<artifactId>spring-cloud-stream-test-binder</artifactId>
 			<version>${spring-cloud-stream.version}</version>
-			<type>test-jar</type>
-			<classifier>test-binder</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml
index 3d78c752..48e6ea8d 100644
--- a/spring-cloud-task-samples/taskprocessor/pom.xml
+++ b/spring-cloud-task-samples/taskprocessor/pom.xml
@@ -64,10 +64,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<artifactId> spring-cloud-stream-test-binder</artifactId>
 			<version>${spring-cloud-stream.version}</version>
-			<type>test-jar</type>
-			<classifier>test-binder</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml
index 2d2ddfe8..291cfeae 100644
--- a/spring-cloud-task-samples/tasksink/pom.xml
+++ b/spring-cloud-task-samples/tasksink/pom.xml
@@ -68,10 +68,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<artifactId>spring-cloud-stream-test-binder</artifactId>
 			<version>${spring-cloud-stream.version}</version>
-			<type>test-jar</type>
-			<classifier>test-binder</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml
index 7d093406..97d250d8 100644
--- a/spring-cloud-task-stream/pom.xml
+++ b/spring-cloud-task-stream/pom.xml
@@ -91,10 +91,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
+			<artifactId> spring-cloud-stream-test-binder</artifactId>
 			<version>${spring-cloud-stream.version}</version>
-			<type>test-jar</type>
-			<classifier>test-binder</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java
index 72cf21aa..2be046d0 100644
--- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java
+++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java
@@ -59,10 +59,10 @@ import org.springframework.context.annotation.Lazy;
  * @author Glenn Renfro
  * @author Ali Shahbour
  */
+// @checkstyle:off
 @AutoConfiguration(after = SimpleTaskAutoConfiguration.class)
 @ConditionalOnClass(Job.class)
 @ConditionalOnBean({ Job.class, TaskLifecycleListener.class })
-// @checkstyle:off
 @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events", name = "enabled", havingValue = "true",
 		matchIfMissing = true)
 // @checkstyle:on