diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java
index b60f5a193..71e6c8d35 100644
--- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java
+++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlLanguageServerTest.java
@@ -78,7 +78,11 @@ public class ManifestYamlLanguageServerTest {
 //	}
 
 	private void assertExpectedInitResult(InitializeResult initResult) {
-		assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isTrue();
+		if (Boolean.getBoolean("lsp.lazy.completions.disable")) {
+			assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isFalse();
+		} else {
+			assertThat(initResult.getCapabilities().getCompletionProvider().getResolveProvider()).isTrue();
+		}
 		assertThat(initResult.getCapabilities().getTextDocumentSync().getLeft()).isEqualTo(TextDocumentSyncKind.Incremental);
 	}