diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
index 529f518f5e94..f64ebc9fe057 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
@@ -19,6 +19,7 @@ import org.intellij.lang.annotations.MagicConstant;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import java.util.Deque;
 import java.util.List;
@@ -448,4 +449,9 @@ public class SuspendManagerImpl implements SuspendManager {
 
     return thread == resumeOneSteppingIn.getThreadReference();
   }
+  
+  @TestOnly
+  public void addExplicitlyResumedThread(@NotNull ThreadReferenceProxyImpl thread) {
+    myExplicitlyResumedThreads.add(thread);
+  }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/AbstractGenerateEqualsWizard.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/AbstractGenerateEqualsWizard.java
index 888b9039b3ca..d419d9cc738f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/AbstractGenerateEqualsWizard.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/AbstractGenerateEqualsWizard.java
@@ -9,15 +9,14 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.classMembers.MemberInfoBase;
 import com.intellij.refactoring.ui.AbstractMemberSelectionPanel;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import java.awt.*;
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Nikolay.Tropin
@@ -161,6 +160,11 @@ public abstract class AbstractGenerateEqualsWizard <C extends PsiElement, M exte
     return true;
   }
 
+  @TestOnly
+  public Set<Map.Entry<M,I>> getFieldsToNonNull() {
+    return new LinkedHashSet<>(myFieldsToNonNull.entrySet());
+  }
+
   @Override
   public JComponent getPreferredFocusedComponent() {
     final Component stepComponent = getCurrentStepComponent();
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFilePathFixTest.kt b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFilePathFixTest.kt
index 604dfbb99f45..6835aace2feb 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFilePathFixTest.kt
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFilePathFixTest.kt
@@ -127,7 +127,7 @@ class CreateFilePathFixTest : CreateFileQuickFixTestCase() {
       assertEquals(expectedFileName, fileReference.fileNameToCreate)
       val intention = fileReference.quickFixes!![0]
 
-      val options = (intention as AbstractCreateFileFix).myDirectories
+      val options = (intention as AbstractCreateFileFix).directories
 
       assertEquals(expectedOptions.size, options.size)
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/generation/ui/GenerateEqualsWizardTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/generation/ui/GenerateEqualsWizardTest.java
index d49a22978ec3..effd7f0b39d5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/generation/ui/GenerateEqualsWizardTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/generation/ui/GenerateEqualsWizardTest.java
@@ -25,7 +25,7 @@ public class GenerateEqualsWizardTest extends LightJavaCodeInsightFixtureTestCas
     GenerateEqualsWizard wizard = new GenerateEqualsWizard(getProject(), aClass, true, true);
     NonBlockingReadActionImpl.waitForAsyncTaskCompletion();
     try {
-      Set<Map.Entry<PsiMember, MemberInfo>> entries = wizard.myFieldsToNonNull.entrySet();
+      Set<Map.Entry<PsiMember, MemberInfo>> entries = wizard.getFieldsToNonNull();
       assertEquals(2, entries.size());
       for (Map.Entry<PsiMember, MemberInfo> entry : entries) {
         PsiMember member = entry.getKey();
diff --git a/java/java-tests/testSrc/com/intellij/ide/todo/ToDoTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/ide/todo/ToDoTreeStructureTest.java
index c1aa1f0b02a5..9a85986eeb03 100644
--- a/java/java-tests/testSrc/com/intellij/ide/todo/ToDoTreeStructureTest.java
+++ b/java/java-tests/testSrc/com/intellij/ide/todo/ToDoTreeStructureTest.java
@@ -45,7 +45,7 @@ public class ToDoTreeStructureTest extends BaseProjectViewTestCase {
     try {
       all.init();
       //second rebuild, e.g. switching scope in scope based t.o.d.o panel
-      CompletableFuture<?> rebuildCache = all.rebuildCache();
+      CompletableFuture<?> rebuildCache = all.rebuildCacheTestAccessor();
       while (!rebuildCache.isDone()) {
         IdeEventQueue.getInstance().flushQueue();
       }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/AbstractCreateFileFix.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/AbstractCreateFileFix.java
index 6f30b3a3389d..3ebe4d3757c6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/AbstractCreateFileFix.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/AbstractCreateFileFix.java
@@ -293,6 +293,12 @@ public abstract class AbstractCreateFileFix extends LocalQuickFixAndIntentionAct
       .showInBestPositionFor(editor);
   }
 
+  @TestOnly
+  @ApiStatus.Internal
+  public List<TargetDirectory> getDirectories() {
+    return myDirectories;
+  }
+
   private static @Unmodifiable @NotNull List<TargetDirectoryListItem> getTargetDirectoryListItems(List<? extends TargetDirectory> directories) {
     return ContainerUtil.map(directories, targetDirectory -> {
       PsiDirectory d = targetDirectory.getDirectory();
diff --git a/platform/todo/src/com/intellij/ide/todo/TodoTreeBuilder.java b/platform/todo/src/com/intellij/ide/todo/TodoTreeBuilder.java
index 2f28d83ea70b..0b58e83340bc 100644
--- a/platform/todo/src/com/intellij/ide/todo/TodoTreeBuilder.java
+++ b/platform/todo/src/com/intellij/ide/todo/TodoTreeBuilder.java
@@ -37,10 +37,7 @@ import com.intellij.util.concurrency.annotations.RequiresEdt;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.VisibleForTesting;
+import org.jetbrains.annotations.*;
 import org.jetbrains.concurrency.Promise;
 import org.jetbrains.concurrency.Promises;
 
@@ -674,6 +671,12 @@ public abstract class TodoTreeBuilder implements Disposable {
     return myFileTree.isDirectoryEmpty(psiDirectory.getVirtualFile());
   }
 
+  @TestOnly
+  @ApiStatus.Internal
+  public @NotNull CompletableFuture<?> rebuildCacheTestAccessor() {
+    return rebuildCache();
+  }
+  
   private final class MyPsiTreeChangeListener extends PsiTreeChangeAdapter {
 
     @Override