diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodController.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodController.java
index aa8b742a6e3a..85e064ee7d4d 100644
--- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodController.java
+++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodController.java
@@ -62,12 +62,10 @@ private static void setTestMethodsImpl(StyledDocument doc, List<TestMethod> meth
             doc.putProperty(TestMethodAnnotation.DOCUMENT_ANNOTATION_LINES_KEY, annotationLines);
         }
 
-        Map<TestMethod, TestMethodAnnotation> removed = new HashMap<>(annotations);
-
-        methods.forEach(tm -> removed.remove(tm));
-
         Set<TestMethod> added = new HashSet<>(methods);
+        Map<TestMethod, TestMethodAnnotation> removed = new HashMap<>(annotations);
 
+        removed.keySet().removeAll(added);
         added.removeAll(annotations.keySet());
 
         for (TestMethod method : added) {
diff --git a/java/java.testrunner.ui/src/org/netbeans/modules/java/testrunner/ui/ComputeTestMethodsImpl.java b/java/java.testrunner.ui/src/org/netbeans/modules/java/testrunner/ui/ComputeTestMethodsImpl.java
index 6236049250e0..847e203f158e 100644
--- a/java/java.testrunner.ui/src/org/netbeans/modules/java/testrunner/ui/ComputeTestMethodsImpl.java
+++ b/java/java.testrunner.ui/src/org/netbeans/modules/java/testrunner/ui/ComputeTestMethodsImpl.java
@@ -103,7 +103,8 @@ public void run(CompilationInfo info) throws Exception {
                 }
 
                 if (!cancel.get()) {
-                    WORKER.post(() -> TestMethodController.setTestMethods(doc, methods));
+                    List<TestMethod> updateMethods = new ArrayList<>(methods);
+                    WORKER.post(() -> TestMethodController.setTestMethods(doc, updateMethods));
                 }
             }
         }