diff --git a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorCFBasicTest.java b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorCFBasicTest.java
index 78a121dd0..e913530fd 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorCFBasicTest.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorCFBasicTest.java
@@ -59,6 +59,18 @@ public class ManifestYamlEditorCFBasicTest {
 		basicCfClientHarness.addServiceInstances("mysql");
 		assertContainsCompletions("services:\n" + "  - <*>", "mysql");
 	}
+	
+	@Test
+	public void contentAssistDoesNotContainServices() throws Exception {
+		basicCfClientHarness.addServiceInstances("mysql");
+		assertDoesNotContainCompletions("services:\n" + "  - <*>", "wrongsql");
+	}
+	
+	@Test
+	public void contentAssistDoesNotContainServicesEmptyServices() throws Exception {
+		basicCfClientHarness.addServiceInstances(/*no services*/);
+		assertDoesNotContainCompletions("services:\n" + "  - <*>", "mysql");
+	}
 
 	@Test
 	public void reconcileCFService() throws Exception {