diff --git a/README.adoc b/README.adoc
index 57dcfa1cf7..19690adb9f 100755
--- a/README.adoc
+++ b/README.adoc
@@ -131,7 +131,7 @@ available so you need to build that first since it's not generated by default.
 
 [indent=0]
 ----
-	$ ./mvnw clean install -pl spring-boot-tools/spring-boot-maven-plugin -Pdefault,full
+	$ ./mvnw clean install -pl spring-boot-project/spring-boot-tools/spring-boot-maven-plugin -Pdefault,full
 ----
 
 The documentation also includes auto-generated information about the starters. You might
@@ -140,17 +140,17 @@ it:
 
 [indent=0]
 ----
-	$ ./mvnw clean install -f spring-boot-starters
+	$ ./mvnw clean install -f spring-boot-project/spring-boot-starters
 ----
 
 Once this is done, you can build the reference documentation with the command below:
 
 [indent=0]
 ----
-	$ ./mvnw clean prepare-package -pl spring-boot-docs -Pdefault,full
+	$ ./mvnw clean prepare-package -pl spring-boot-project/spring-boot-docs -Pdefault,full
 ----
 
-TIP: The generated documentation is available from `spring-boot-docs/target/contents/reference`
+TIP: The generated documentation is available from `spring-boot-project/spring-boot-docs/target/contents/reference`
 
 
 == Modules
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
index da06cd9760..b8ed9a403e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml
@@ -202,21 +202,52 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
 						<configuration>
-							<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-							<settingsFile>src/it/settings.xml</settingsFile>
 							<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-							<postBuildHookScript>verify</postBuildHookScript>
-							<addTestClassPath>true</addTestClassPath>
-							<skipInvocation>${skipTests}</skipInvocation>
-							<streamLogs>true</streamLogs>
 						</configuration>
 						<executions>
 							<execution>
-								<id>integration-test</id>
+								<id>prepare-integration-test</id>
+								<phase>pre-integration-test</phase>
 								<goals>
 									<goal>install</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>integration-test</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+									<settingsFile>src/it/settings.xml</settingsFile>
+									<postBuildHookScript>verify</postBuildHookScript>
+									<addTestClassPath>true</addTestClassPath>
+									<skipInvocation>${skipTests}</skipInvocation>
+									<streamLogs>true</streamLogs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>cleanup-local-integration-repo</id>
+								<phase>pre-integration-test</phase>
+								<goals>
 									<goal>run</goal>
 								</goals>
+								<configuration>
+									<target>
+										<replaceregexp match="\$\{revision\}" replace="${project.version}"
+													   flags="g" byline="true">
+											<fileset
+													dir="${project.build.directory}/local-repo/org/springframework/boot/"
+													includes="**/*.pom" />
+										</replaceregexp>
+									</target>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>