diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index b17cdbd7692a..63c3c9fc16d6 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -126,7 +126,7 @@ class BuildMessageDispatcher extends SimpleChannelHandler {
         }
         else {
           if (ApplicationManager.getApplication().isUnitTestMode()) {
-            LOG.info("messageReceived: " + builderMessage);
+            LOG.info("messageReceived: " + builderMessage.getType());
           }
           handler.handleBuildMessage(ctx.getChannel(), sessionId, builderMessage);
         }
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
index add20bda9b65..40be5801ad94 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
@@ -73,6 +73,9 @@ public abstract class DefaultMessageHandler implements BuilderMessageHandler {
         handleBuildEvent(sessionId, msg.getBuildEvent());
         break;
       case COMPILE_MESSAGE:
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+          LOG.info("compiler messageReceived: " + msg.getCompileMessage().getKind() + " this=" + this);
+        }
         handleCompileMessage(sessionId, msg.getCompileMessage());
         break;
       case CONSTANT_SEARCH_TASK:
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
index ed8586b0ea1a..e680665ded5c 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -221,7 +221,7 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase {
       def ideaLog = new File(TestLoggerFactory.testLogDir, "idea.log")
       if (ideaLog.exists()) {
         println "\n\nIdea Log:"
-        def limit = 15000
+        def limit = 20000
         def logText = ideaLog.text
         println(logText.size() < limit ? logText : logText.substring(logText.size() - limit))
       }