diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LspCompletionInterpreter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LspCompletionInterpreter.java
index 12a9508a1..aeb8520f8 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LspCompletionInterpreter.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LspCompletionInterpreter.java
@@ -135,6 +135,11 @@ public class LspCompletionInterpreter implements IDocumentState {
 		if (afterEdit!=null) additionalEdits.add(afterEdit);
 		item.setAdditionalTextEdits(additionalEdits.build());
 
+		if (mainEdit!=null && mainEdit.getNewText().equals("")) {
+			//Vscode handles this poorly and adds 'junk' instead.
+			mainEdit.setNewText(" "); // Adding a space. It is still junk but it is at least not immediately visible.
+		}
+
 		if (needsCursorMove) {
 			Position position  = docState.getDocument().toPosition(docState.getCursor());
 			item.setCommand(new Command("Move Cursor", server.MOVE_CURSOR_COMMAND_ID, ImmutableList.of(originalDoc.getUri(), position)));
diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
index 995aac236..8a882147a 100755
--- a/headless-services/spring-boot-language-server/build.sh
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 ../mvnw \
+    -Dmaven.test.skip=true \
     -f ../pom.xml \
     -pl spring-boot-language-server \
     -am \