diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
index 7672d8623ff..4a593a25317 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -56,6 +56,17 @@ gradlePlugin {
 	}
 }
 
+task preparePluginValidationClasses(type: Copy) {
+	destinationDir = file("$buildDir/classes/java/pluginValidation")
+	from(sourceSets.main.output.classesDirs) {
+		exclude "**/CreateBootStartScripts.class"
+	}
+}
+
+validatePlugins {
+	classes.setFrom preparePluginValidationClasses
+}
+
 task dependencyVersions(type: org.springframework.boot.build.constraints.ExtractVersionConstraints) {
 	enforcedPlatform(":spring-boot-project:spring-boot-dependencies")
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java
index b7b3e872ef5..4b5957d0f68 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java
@@ -79,8 +79,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void zipDistributionForJarCanBeBuilt() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistZip")
+				.task(":bootDistZip").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		String name = this.gradleBuild.getProjectDir().getName();
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.zip");
 		assertThat(distribution).isFile();
@@ -91,8 +91,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void tarDistributionForJarCanBeBuilt() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
+				.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		String name = this.gradleBuild.getProjectDir().getName();
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
 		assertThat(distribution).isFile();
@@ -103,8 +103,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void zipDistributionForWarCanBeBuilt() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistZip")
+				.task(":bootDistZip").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		String name = this.gradleBuild.getProjectDir().getName();
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.zip");
 		assertThat(distribution).isFile();
@@ -115,8 +115,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void tarDistributionForWarCanBeBuilt() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
+				.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		String name = this.gradleBuild.getProjectDir().getName();
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
 		assertThat(distribution).isFile();
@@ -127,8 +127,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void applicationNameCanBeUsedToCustomizeDistributionName() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
+				.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/custom-boot.tar");
 		assertThat(distribution).isFile();
 		String name = this.gradleBuild.getProjectDir().getName();
@@ -139,8 +139,8 @@ class ApplicationPluginActionIntegrationTests {
 
 	@TestTemplate
 	void scriptsHaveCorrectPermissions() throws IOException {
-		assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome())
-				.isEqualTo(TaskOutcome.SUCCESS);
+		assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.4").build("bootDistTar")
+				.task(":bootDistTar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		String name = this.gradleBuild.getProjectDir().getName();
 		File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/" + name + "-boot.tar");
 		assertThat(distribution).isFile();