diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyCompletionTest.java
index 646eb03f90..ac1030175c 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyCompletionTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalOnPropertyCompletionTest.java
@@ -189,7 +189,7 @@ public void testConditionalOnPropertyCompletionForPrefix() throws Exception {
     }
 
     @Test
-    @Disabled
+    @Disabled // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3260
     public void testConditionalOnPropertyCompletionWithPrefixAndAttributeWithNameAttribute() throws Exception {
         List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(prefix = \"else\", name=<*>)");
         assertEquals(1, completions.size());
@@ -210,7 +210,7 @@ public void testConditionalOnPropertyCompletionWithPrefixAndAttributeWithNameAtt
     }
 
     @Test
-    @Disabled
+    @Disabled // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3419
     public void testConditionalOnPropertyCompletionWithEmptyPrefixAndEmptyNameAttribute() throws Exception {
     	List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(prefix = , name = <*>)");
         assertEquals(3, completions.size());
@@ -221,7 +221,7 @@ public void testConditionalOnPropertyCompletionWithEmptyPrefixAndEmptyNameAttrib
     }
 
     @Test
-    @Disabled
+    @Disabled // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3419
     public void testConditionalOnPropertyCompletionWithEmptyPrefixAndEmptyNameAttributeInQuotes() throws Exception {
     	List<CompletionItem> completions = getCompletions("@ConditionalOnProperty(prefix = , name = \"<*>\")");
         assertEquals(3, completions.size());
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
index 9e14cbf420..6642c84ae4 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
@@ -288,10 +288,8 @@ void testPlainPrefixCompletion() throws Exception {
         assertClasspathCompletions();
     }
 
-// The parser removes the (spring.) piece from the AST in this case, so there is no way
-// to clearly identify this case    
     @Test
-    @Disabled
+    @Disabled // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3420
     void testComplexPrefixCompletionParamNameCursorRightAfterDot() throws Exception {
         prepareCase("@Value(\"onField\")", "@Value(spring.<*>)");
 
@@ -321,19 +319,16 @@ void testPrefixCompletionWithParamName() throws Exception {
         assertClasspathCompletions();
     }
 
-// The parser removes the (spring.) piece from the AST in this case, so there is no way
-// to clearly identify this case
-//
-//    @Test
-//    void testPrefixCompletionWithParamNameCursorRightAfterDot() throws Exception {
-//        prepareCase("@Value(\"onField\")", "@Value(value=spring.<*>)");
-//        prepareDefaultIndexData();
-//
-//        assertPropertyCompletions(
-//                "@Value(value=\"${spring.prop1}\"<*>)");
-//        
-//        assertClasspathCompletions();
-//    }
+    @Test
+    @Disabled // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3421
+    void testPrefixCompletionWithParamNameCursorRightAfterDot() throws Exception {
+        prepareCase("@Value(\"onField\")", "@Value(value=spring.<*>)");
+
+        assertPropertyCompletions(
+                "@Value(value=\"${spring.prop1}\"<*>)");
+        
+        assertClasspathCompletions();
+    }
 
     @Test
     void testComplexPrefixCompletionWithParamName() throws Exception {