diff --git a/spring-boot-tests/spring-boot-integration-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/pom.xml
index 27f08c15190..16c814635a7 100644
--- a/spring-boot-tests/spring-boot-integration-tests/pom.xml
+++ b/spring-boot-tests/spring-boot-integration-tests/pom.xml
@@ -18,7 +18,6 @@
 	<modules>
 		<module>spring-boot-configuration-processor-tests</module>
 		<module>spring-boot-devtools-tests</module>
-		<module>spring-boot-hibernate52-tests</module>
 		<module>spring-boot-server-tests</module>
 		<module>spring-boot-launch-script-tests</module>
 	</modules>
diff --git a/spring-boot-tests/spring-boot-smoke-tests/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/pom.xml
index 390f88dbe10..7d08c31aa74 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/pom.xml
@@ -46,6 +46,7 @@
 		<module>spring-boot-smoke-test-devtools</module>
 		<module>spring-boot-smoke-test-flyway</module>
 		<module>spring-boot-smoke-test-hateoas</module>
+		<module>spring-boot-smoke-test-hibernate52</module>
 		<module>spring-boot-smoke-test-integration</module>
 		<module>spring-boot-smoke-test-jersey</module>
 		<module>spring-boot-smoke-test-jetty</module>
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/pom.xml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/pom.xml
similarity index 83%
rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/pom.xml
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/pom.xml
index 20f5841cca3..d79c6692ee5 100755
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/pom.xml
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/pom.xml
@@ -3,12 +3,13 @@
 	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>
 	<parent>
+		<!-- Your own application should inherit from spring-boot-starter-parent -->
+		<artifactId>spring-boot-smoke-tests</artifactId>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-integration-tests</artifactId>
 		<version>${revision}</version>
 	</parent>
-	<artifactId>spring-boot-hibernate52-tests</artifactId>
-	<name>Spring Boot Hibernate 5.2 tests</name>
+	<artifactId>spring-boot-smoke-test-hibernate52</artifactId>
+	<name>Spring Boot Hibernate 5.2 Smoke Tests</name>
 	<description>${project.name}</description>
 	<properties>
 		<main.basedir>${basedir}/../../..</main.basedir>
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/src/main/java/org/springframework/boot/tests/hibernate52/Hibernate52Application.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/src/main/java/org/springframework/boot/tests/hibernate52/Hibernate52Application.java
similarity index 100%
rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/src/main/java/org/springframework/boot/tests/hibernate52/Hibernate52Application.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/src/main/java/org/springframework/boot/tests/hibernate52/Hibernate52Application.java
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/src/test/java/org/springframework/boot/tests/hibernate52/Hibernate52ApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/src/test/java/org/springframework/boot/tests/hibernate52/Hibernate52ApplicationTests.java
similarity index 100%
rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-hibernate52-tests/src/test/java/org/springframework/boot/tests/hibernate52/Hibernate52ApplicationTests.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-hibernate52/src/test/java/org/springframework/boot/tests/hibernate52/Hibernate52ApplicationTests.java