diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/invoker.properties b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/invoker.properties
similarity index 100%
rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/invoker.properties
rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/invoker.properties
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/pom.xml
similarity index 95%
rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/pom.xml
rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/pom.xml
index 3e48e4f979..5df67b8b85 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot.maven.it</groupId>
-	<artifactId>repackage-layout-default</artifactId>
+	<artifactId>jar-with-layout-property</artifactId>
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/src/main/java/org/test/SampleApplication.java
similarity index 100%
rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/src/main/java/org/test/SampleApplication.java
rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/src/main/java/org/test/SampleApplication.java
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/verify.groovy b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/verify.groovy
similarity index 100%
rename from spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/verify.groovy
rename to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-layout-property/verify.groovy
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy
index ee90453e49..248bf1acf3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/verify.groovy
@@ -15,4 +15,5 @@ assertTrue 'main artifact should have been installed',
 		file.text.contains ("Installing " + main + " to")
 assertFalse 'backup artifact should not have been installed',
 		file.text.contains ("Installing " + backup + "to")
+assertFalse file.text.contains("Layout:")
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/invoker.properties b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/invoker.properties
deleted file mode 100644
index f6e40a283d..0000000000
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/invoker.properties
+++ /dev/null
@@ -1 +0,0 @@
-invoker.goals=package
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/verify.groovy b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/verify.groovy
deleted file mode 100644
index 7c6bfa8c61..0000000000
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-default/verify.groovy
+++ /dev/null
@@ -1,4 +0,0 @@
-import static org.junit.Assert.assertFalse
-
-def file = new File(basedir, "build.log")
-assertFalse file.text.contains("Layout:")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/pom.xml
deleted file mode 100644
index 3e48e4f979..0000000000
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.boot.maven.it</groupId>
-	<artifactId>repackage-layout-default</artifactId>
-	<version>0.0.1.BUILD-SNAPSHOT</version>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>@java.version@</maven.compiler.source>
-		<maven.compiler.target>@java.version@</maven.compiler.target>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>@project.groupId@</groupId>
-				<artifactId>@project.artifactId@</artifactId>
-				<version>@project.version@</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/src/main/java/org/test/SampleApplication.java
deleted file mode 100644
index 7ff035e400..0000000000
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/repackage-layout-property/src/main/java/org/test/SampleApplication.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-2017 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
- *
- *      https://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.test;
-
-public class SampleApplication {
-
-	public static void main(String[] args) {
-	}
-}