diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
index 575e258ae..49f4316d8 100644
--- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
+++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
@@ -64,6 +64,7 @@ public class BoshEditorTest {
 			LanguageId.BOSH_DEPLOYMENT
 		);
 		harness.intialize(null);
+		System.setProperty("lsp.yaml.completions.errors.disable", "false");
 	}
 
 	@Test public void toplevelV2PropertyNamesKnown() throws Exception {
diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshLanguageServerTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshLanguageServerTest.java
index 4be96d03b..e5870fe86 100644
--- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshLanguageServerTest.java
+++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshLanguageServerTest.java
@@ -52,7 +52,11 @@ public class BoshLanguageServerTest {
 	}
 
 	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);
 	}