diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
index 13f94e9a2d..f3f6cff17c 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
@@ -169,9 +169,9 @@ private Collection<File> computeCandidateVMs(StandardVMType standardType) {
 		if (jdkHome != null) {
 			directories.add(new File(jdkHome));
 		}
-		System.getenv().entrySet().forEach(entry -> {
-			if (entry.getKey().startsWith("JAVA_HOME_")) { //$NON-NLS-1$
-				directories.add(new File(entry.getValue()));
+		System.getenv().forEach((key, value) -> {
+			if (key.startsWith("JAVA_HOME_") || (key.startsWith("JAVA") && key.endsWith("_HOME"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				directories.add(new File(value));
 			}
 		});
 		// other common/standard lookup strategies can be added here