diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
index 0771b530fc8..c770cb59406 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java
@@ -6501,7 +6501,8 @@ public static void setOptions(Hashtable<String, String> newOptions) {
 	 * @return the latest Java version support by Java Model
 	 */
 	public static String latestSupportedJavaVersion() {
-		return allVersions.get(allVersions.size() - 1);
+		return System.getProperty(JavaCore.class.getSimpleName() + ".latestSupportedJavaVersion" //$NON-NLS-1$
+				, allVersions.get(allVersions.size() - 1));
 	}
 
 	/**