diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexViaLSPMethodTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexViaLSPMethodTest.java
index 7a277c1a0..b076a7d24 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexViaLSPMethodTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringIndexViaLSPMethodTest.java
@@ -84,7 +84,7 @@ public class SpringIndexViaLSPMethodTest {
 		List<Bean> beans = result.get(5, TimeUnit.SECONDS);
 
 		assertNotNull(beans);
-		assertEquals(11, beans.size());
+		assertEquals(14, beans.size());
 	}
 
 	@Test
@@ -98,7 +98,7 @@ public class SpringIndexViaLSPMethodTest {
 		List<Bean> beans = result.get(5, TimeUnit.SECONDS);
 
 		assertNotNull(beans);
-		assertEquals(10, beans.size());
+		assertEquals(13, beans.size());
 	}
 
 	@Test
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexerBeansTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexerBeansTest.java
index 6e60c5063..b39e17332 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexerBeansTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexerBeansTest.java
@@ -365,7 +365,7 @@ public class SpringMetamodelIndexerBeansTest {
 		
 		Map<String, String[]> runtimeHintsAttributes = runtimeHintsAnnotation.getAttributes();
 		assertEquals(1, runtimeHintsAttributes.size());
-		assertArrayEquals(new String[] {"org.test.MainClass"}, runtimeHintsAttributes.get("value"));
+		assertArrayEquals(new String[] {"org.test.injections.DummyRuntimeHintsRegistrar"}, runtimeHintsAttributes.get("value"));
 	}
 	
 	@Test
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java
index 3deb66d98..9f1802896 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/index/test/SpringMetamodelIndexingTest.java
@@ -74,7 +74,7 @@ public class SpringMetamodelIndexingTest {
     @Test
     void testDeleteProject() throws Exception {
     	Bean[] beans = springIndex.getBeansOfProject("test-spring-indexing");
-    	assertEquals(11, beans.length);
+    	assertEquals(14, beans.length);
 
     	CompletableFuture<Void> deleteProject = indexer.deleteProject(project);
         deleteProject.get(5, TimeUnit.SECONDS);
@@ -91,13 +91,13 @@ public class SpringMetamodelIndexingTest {
         String deletedDocURI = directory.toPath().resolve("src/main/java/org/test/injections/ConstructorInjectionService.java").toUri().toString();
 
         Bean[] allBeansOfProject = springIndex.getBeansOfProject("test-spring-indexing");
-        assertEquals(11, allBeansOfProject.length);
+        assertEquals(14, allBeansOfProject.length);
 
         Bean[] beans = springIndex.getBeansOfDocument(deletedDocURI);
         assertEquals(1, beans.length);
         
         CompletableFuture<Void> deleteFuture = indexer.deleteDocument(deletedDocURI);
-        deleteFuture.get(5, TimeUnit.HOURS);
+        deleteFuture.get(5, TimeUnit.SECONDS);
 
         // check for updated index per document
         Bean[] noBeansAnymore = springIndex.getBeansOfDocument(deletedDocURI);
@@ -105,7 +105,7 @@ public class SpringMetamodelIndexingTest {
 
         // check for updated index in all symbols
         Bean[] lessBeansOfProject = springIndex.getBeansOfProject("test-spring-indexing");
-        assertEquals(10, lessBeansOfProject.length);
+        assertEquals(allBeansOfProject.length - 1, lessBeansOfProject.length);
         
 		assertEquals(2, harness.getIndexUpdatedCount()); // 1x project created, 1x document deleted
     }