diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh
index 286b87c5b..708d5ed23 100755
--- a/concourse/tasks/atom-language-servers-test.sh
+++ b/concourse/tasks/atom-language-servers-test.sh
@@ -14,7 +14,7 @@ else
 fi
 
 cd ${sources}
-./mvnw clean package
+./mvnw clean package -DargLine="-Dlsp.completions.indentation.enable=true -Dlsp.yaml.completions.errors.disable=true"
 
 timestamp=`date -u +%Y%m%d%H%M`
 for i in `ls *-language-server/target/*.jar`; do
diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
index 6e9f5327e..ff85e255c 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
@@ -141,7 +141,7 @@ public class LanguageServerHarness<S extends SimpleLanguageServerWrapper> {
 		this.defaultLanguageId = defaultLanguageId;
 	}
 
-	public static final Duration HIGHLIGHTS_TIMEOUT = Duration.ofMillis(6_000); //Why so long?
+	public static final Duration HIGHLIGHTS_TIMEOUT = Duration.ofMillis(20_000); //Why so long?
 
 	public LanguageServerHarness(Callable<S> factory) throws Exception {
 		this(factory, LanguageId.PLAINTEXT);