diff --git a/.idea/libraries/jb_jdi.xml b/.idea/libraries/jb_jdi.xml
index 2e99ddf6d2d7..6e7196ad7469 100644
--- a/.idea/libraries/jb_jdi.xml
+++ b/.idea/libraries/jb_jdi.xml
@@ -1,18 +1,18 @@
 <component name="libraryTable">
   <library name="jb-jdi" type="repository">
-    <properties maven-id="org.jetbrains.intellij.deps:jb-jdi:2.32">
+    <properties maven-id="org.jetbrains.intellij.deps:jb-jdi:2.35">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.32/jb-jdi-2.32.jar">
-          <sha256sum>4f7a58341de9da76d431d15f9b6a1fbd48b7a33b84a3e862bbe3614915211713</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.35/jb-jdi-2.35.jar">
+          <sha256sum>218701dd76c28bc4eb9289931341231c8b94a695f51b2ed4c061b1a5a9ed1669</sha256sum>
         </artifact>
       </verification>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.32/jb-jdi-2.32.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.35/jb-jdi-2.35.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.32/jb-jdi-2.32-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2.35/jb-jdi-2.35-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index a38dd2ae47e8..e4dad3b17bc6 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -395,8 +395,9 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
     LOG.debug("*******************VM attached******************");
 
     int mask = getTraceMask();
-    if (mask == 0 && vm instanceof VirtualMachineImpl extendedVM) {
-      if (Registry.is("debugger.log.jdi.in.unit.tests") && ApplicationManager.getApplication().isUnitTestMode()) {
+    if (ApplicationManager.getApplication().isUnitTestMode() && vm instanceof VirtualMachineImpl extendedVM) {
+      extendedVM.disableSoftReferences();
+      if (mask == VirtualMachine.TRACE_NONE && Registry.is("debugger.log.jdi.in.unit.tests")) {
         mask = VirtualMachine.TRACE_ALL;
         extendedVM.setDebugTraceConsumer(string -> LOG.debug("[JDI: " + string + "]"));
       }