diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts
index bde9bb3a0..17f8e2ecc 100644
--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -23,7 +23,19 @@ export function activate(context: VSCode.ExtensionContext) {
         CONNECT_TO_LS: false,
         extensionId: 'vscode-spring-boot',
         launcher: (context: VSCode.ExtensionContext) => Path.resolve(context.extensionPath, 'jars/language-server.jar'),
-        jvmHeap: "160m",
+        classpath: (context: VSCode.ExtensionContext, jvm: commons.JVM) => {
+            const classpath = [
+                Path.resolve(context.extensionPath, 'jars/language-server.jar')
+            ];
+            if (!jvm.isJdk()) {
+                VSCode.window.showWarningMessage('JAVA_HOME or PATH environment variable seems to point to a JRE. A JDK is required, hence Boot Hints are unavailable.');
+            }
+            const toolsJar = jvm.getToolsJar();
+            if (toolsJar) {
+                classpath.unshift(toolsJar);
+            }
+            return classpath;
+        },
         clientOptions: {
             documentSelector: [ PROPERTIES_LANGUAGE_ID, YAML_LANGUAGE_ID, JAVA_LANGUAGE_ID ]
         }