diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
index 60f56a4a96c5..5b68a03f362b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java
@@ -40,6 +40,7 @@ import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.codeInspection.htmlInspections.RequiredAttributesInspectionBase;
 import com.intellij.codeInspection.varScopeCanBeNarrowed.FieldCanBeLocalInspection;
 import com.intellij.diagnostic.PerformanceWatcher;
+import com.intellij.diagnostic.ThreadDumper;
 import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
@@ -2118,13 +2119,19 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
   }
 
   private void waitForDaemon() {
-    long deadline = System.currentTimeMillis() + 10000;
+    long deadline = System.currentTimeMillis() + 60_000;
     while (!myDaemonCodeAnalyzer.isRunning()) {
-      if (System.currentTimeMillis() > deadline) fail("Too long waiting for daemon to start");
+      if (System.currentTimeMillis() > deadline) {
+        System.out.println(ThreadDumper.dumpThreadsToString());
+        fail("Too long waiting for daemon to start");
+      }
       UIUtil.dispatchAllInvocationEvents();
     }
     while (myDaemonCodeAnalyzer.isRunning()) {
-      if (System.currentTimeMillis() > deadline) fail("Too long waiting for daemon to finish");
+      if (System.currentTimeMillis() > deadline) {
+        System.out.println(ThreadDumper.dumpThreadsToString());
+        fail("Too long waiting for daemon to finish");
+      }
       UIUtil.dispatchAllInvocationEvents();
     }
   }