diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
index b1993b0cc6c6..6ffda4639c69 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.build;
 
+import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -114,14 +115,27 @@ private void applyJavaConventions(Project project) {
 			project.setProperty("sourceCompatibility", "1.8");
 			project.getTasks().withType(JavaCompile.class, (compile) -> {
 				compile.getOptions().setEncoding("UTF-8");
+				if (hasCustomBuildJavaHome(project)) {
+					String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java");
+					compile.getOptions().getForkOptions().setJavaHome(new File(javaExecutable));
+				}
 				List<String> args = compile.getOptions().getCompilerArgs();
 				if (!args.contains("-parameters")) {
 					args.add("-parameters");
 				}
 			});
-			project.getTasks().withType(Javadoc.class,
-					(javadoc) -> javadoc.getOptions().source("1.8").encoding("UTF-8"));
+			project.getTasks().withType(Javadoc.class, (javadoc) -> {
+				javadoc.getOptions().source("1.8").encoding("UTF-8");
+				if (hasCustomBuildJavaHome(project)) {
+					String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/javadoc");
+					javadoc.setExecutable(javaExecutable);
+				}
+			});
 			project.getTasks().withType(Test.class, (test) -> {
+				if (hasCustomBuildJavaHome(project)) {
+					String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java");
+					test.setExecutable(javaExecutable);
+				}
 				test.useJUnitPlatform();
 				test.setMaxHeapSize("1024M");
 			});
@@ -141,6 +155,14 @@ private void applyJavaConventions(Project project) {
 		});
 	}
 
+	private boolean hasCustomBuildJavaHome(Project project) {
+		return project.hasProperty("buildJavaHome") && !((String) project.property("buildJavaHome")).isEmpty();
+	}
+
+	private String getCustomBuildJavaExecutable(Project project, String executable) {
+		return project.property("buildJavaHome") + executable;
+	}
+
 	private void configureSpringJavaFormat(Project project) {
 		project.getPlugins().apply(SpringJavaFormatPlugin.class);
 		project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));