diff --git a/pom.xml b/pom.xml
index 9c8a4e7ae7..68b6e89e88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
 				<module>spring-boot-dependencies</module>
 				<module>spring-boot-parent</module>
 				<module>spring-boot-tools</module>
-				<module>spring-boot-junit-runners</module>
+				<module>spring-boot-test-support</module>
 				<module>spring-boot</module>
 				<module>spring-boot-test</module>
 				<module>spring-boot-autoconfigure</module>
diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
index f845fe9335..75fa518e09 100644
--- a/spring-boot-actuator/pom.xml
+++ b/spring-boot-actuator/pom.xml
@@ -288,7 +288,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index c44e64d2a2..eccdc98acf 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -623,7 +623,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 9cc59d28c0..d0a3669a7c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -206,12 +206,13 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-junit-runners</artifactId>
+				<artifactId>spring-boot-test</artifactId>
 				<version>1.5.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-test</artifactId>
+				<type>test-jar</type>
 				<version>1.5.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
@@ -221,8 +222,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-test</artifactId>
-				<type>test-jar</type>
+				<artifactId>spring-boot-test-support</artifactId>
 				<version>1.5.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
diff --git a/spring-boot-devtools/pom.xml b/spring-boot-devtools/pom.xml
index 55965acc0d..70fd75dc02 100644
--- a/spring-boot-devtools/pom.xml
+++ b/spring-boot-devtools/pom.xml
@@ -94,7 +94,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 3a45312b19..425dd289ea 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -729,7 +729,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml
index f552da11da..c44bf436ae 100644
--- a/spring-boot-full-build/pom.xml
+++ b/spring-boot-full-build/pom.xml
@@ -48,7 +48,7 @@
 		<module>../spring-boot-dependencies</module>
 		<module>../spring-boot-parent</module>
 		<module>../spring-boot-tools</module>
-		<module>../spring-boot-junit-runners</module>
+		<module>../spring-boot-test-support</module>
 		<module>../spring-boot</module>
 		<module>../spring-boot-test</module>
 		<module>../spring-boot-autoconfigure</module>
diff --git a/spring-boot-test-autoconfigure/pom.xml b/spring-boot-test-autoconfigure/pom.xml
index 79a4dbd9e0..d543c50b47 100644
--- a/spring-boot-test-autoconfigure/pom.xml
+++ b/spring-boot-test-autoconfigure/pom.xml
@@ -130,7 +130,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-junit-runners/pom.xml b/spring-boot-test-support/pom.xml
similarity index 93%
rename from spring-boot-junit-runners/pom.xml
rename to spring-boot-test-support/pom.xml
index 4aad59a717..a8816ece23 100644
--- a/spring-boot-junit-runners/pom.xml
+++ b/spring-boot-test-support/pom.xml
@@ -8,9 +8,9 @@
 		<version>1.5.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
-	<artifactId>spring-boot-junit-runners</artifactId>
-	<name>Spring Boot JUnit Runners</name>
-	<description>Spring Boot JUnit Runners</description>
+	<artifactId>spring-boot-test-support</artifactId>
+	<name>Spring Boot Testing Support</name>
+	<description>Spring Boot Testing Support</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
similarity index 100%
rename from spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
rename to spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
similarity index 100%
rename from spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
rename to spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
similarity index 100%
rename from spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
rename to spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
similarity index 100%
rename from spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
rename to spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
diff --git a/spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
similarity index 100%
rename from spring-boot-junit-runners/src/main/java/org/springframework/boot/junit/runner/package-info.java
rename to spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
diff --git a/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java b/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
similarity index 100%
rename from spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
rename to spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
diff --git a/spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java b/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
similarity index 100%
rename from spring-boot-junit-runners/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
rename to spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
diff --git a/spring-boot-test/pom.xml b/spring-boot-test/pom.xml
index 952c9059b6..91dbc4b860 100644
--- a/spring-boot-test/pom.xml
+++ b/spring-boot-test/pom.xml
@@ -120,7 +120,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 16f001da68..fa228203c0 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -248,7 +248,7 @@
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-junit-runners</artifactId>
+			<artifactId>spring-boot-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>