diff --git a/spring-cloud-stream-test-support-internal/pom.xml b/spring-cloud-stream-test-support-internal/pom.xml
index 3c921d8e2..40c551887 100644
--- a/spring-cloud-stream-test-support-internal/pom.xml
+++ b/spring-cloud-stream-test-support-internal/pom.xml
@@ -9,59 +9,19 @@
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
 	spring-cloud-stream itself, and also modules.</description>
-	<properties>
-		<kafka.version>0.8.2.1</kafka.version>
-		<curator.version>2.6.0</curator.version>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
 		</dependency>
-		<!-- External systems supported, each should be marked optional -->
-		<!-- redis -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!-- kafka -->
-		<dependency>
-			<groupId>org.apache.curator</groupId>
-			<artifactId>curator-recipes</artifactId>
-			<version>${curator.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.10</artifactId>
-			<version>${kafka.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.10</artifactId>
-			<classifier>test</classifier>
-			<version>${kafka.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.curator</groupId>
-			<artifactId>curator-test</artifactId>
-			<version>${curator.version}</version>
-			<optional>true</optional>
-		</dependency>
-		<!-- rabbit -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-amqp</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/redis/RedisTestSupport.java b/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/redis/RedisTestSupport.java
deleted file mode 100644
index 8aeab0245..000000000
--- a/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/redis/RedisTestSupport.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.stream.test.junit.redis;
-
-import org.springframework.cloud.stream.test.junit.AbstractExternalResourceTestSupport;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-
-/**
- * JUnit {@link org.junit.Rule} that detects the fact that a Redis server is running on localhost.
- *
- * @author Gary Russell
- * @author Eric Bottard
- */
-public class RedisTestSupport extends AbstractExternalResourceTestSupport<JedisConnectionFactory> {
-
-	public RedisTestSupport() {
-		super("REDIS");
-	}
-
-	@Override
-	protected void obtainResource() throws Exception {
-		resource = new JedisConnectionFactory();
-		resource.afterPropertiesSet();
-		resource.getConnection().close();
-	}
-
-	@Override
-	protected void cleanupResource() throws Exception {
-		resource.destroy();
-	}
-}