diff --git a/pom.xml b/pom.xml
index fcd4435b2f4..f65fe87bdd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,6 @@
 				<module>spring-boot-dependencies</module>
 				<module>spring-boot-parent</module>
 				<module>spring-boot-tools</module>
-				<module>spring-boot-test-support</module>
 				<module>spring-boot</module>
 				<module>spring-boot-test</module>
 				<module>spring-boot-autoconfigure</module>
@@ -114,7 +113,6 @@
 			<modules>
 				<module>spring-boot-dependencies</module>
 				<module>spring-boot-parent</module>
-				<module>spring-boot-test-support</module>
 				<module>spring-boot-tools</module>
 			</modules>
 			<build>
diff --git a/spring-boot-tools/pom.xml b/spring-boot-tools/pom.xml
index bfdd833c91c..a06af65c3c6 100644
--- a/spring-boot-tools/pom.xml
+++ b/spring-boot-tools/pom.xml
@@ -20,13 +20,14 @@
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
+		<module>spring-boot-antlib</module>
 		<module>spring-boot-autoconfigure-processor</module>
 		<module>spring-boot-configuration-metadata</module>
 		<module>spring-boot-configuration-processor</module>
+		<module>spring-boot-gradle-plugin</module>
 		<module>spring-boot-loader</module>
 		<module>spring-boot-loader-tools</module>
 		<module>spring-boot-maven-plugin</module>
-		<module>spring-boot-gradle-plugin</module>
-		<module>spring-boot-antlib</module>
+		<module>spring-boot-test-support</module>
 	</modules>
 </project>
diff --git a/spring-boot-test-support/pom.xml b/spring-boot-tools/spring-boot-test-support/pom.xml
similarity index 94%
rename from spring-boot-test-support/pom.xml
rename to spring-boot-tools/spring-boot-test-support/pom.xml
index a8816ece234..24059aae563 100644
--- a/spring-boot-test-support/pom.xml
+++ b/spring-boot-tools/spring-boot-test-support/pom.xml
@@ -4,9 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-parent</artifactId>
+		<artifactId>spring-boot-tools</artifactId>
 		<version>1.5.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-test-support</artifactId>
 	<name>Spring Boot Testing Support</name>
@@ -17,7 +16,7 @@
 		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Provided -->
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/TestCompiler.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/TestCompiler.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/TestCompiler.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/TestCompiler.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/package-info.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/package-info.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/package-info.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/package-info.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathExclusions.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ClassPathOverrides.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/package-info.java
diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java b/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
similarity index 100%
rename from spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
rename to spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/package-info.java
diff --git a/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java b/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
similarity index 100%
rename from spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
rename to spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerExclusionsTests.java
diff --git a/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java b/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
similarity index 100%
rename from spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java
rename to spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunnerOverridesTests.java