diff --git a/plugins/groovy/rt/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/plugins/groovy/rt/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
index 130230a4b696..6ef288be4b9a 100644
--- a/plugins/groovy/rt/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/rt/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -58,9 +58,6 @@ public class GroovyBuilder extends ModuleLevelBuilder {
   public ModuleLevelBuilder.ExitCode build(final CompileContext context, ModuleChunk chunk) throws ProjectBuildException {
     try {
       final List<File> toCompile = collectChangedFiles(context, chunk);
-      if (Utils.IS_TEST_MODE) {
-        LOG.info((myForStubs ? "stubs" : "groovyc") + ", toCompile=" + toCompile);
-      }
       if (toCompile.isEmpty()) {
         return ExitCode.NOTHING_DONE;
       }
@@ -120,18 +117,12 @@ public class GroovyBuilder extends ModuleLevelBuilder {
       }
 
       for (CompilerMessage message : handler.getCompilerMessages()) {
-        if (Utils.IS_TEST_MODE) {
-          LOG.info(message.toString());
-        }
         context.processMessage(message);
       }
 
 
       List<GroovycOSProcessHandler.OutputItem> compiled = new ArrayList<GroovycOSProcessHandler.OutputItem>();
       for (GroovycOSProcessHandler.OutputItem item : handler.getSuccessfullyCompiled()) {
-        if (Utils.IS_TEST_MODE) {
-          LOG.info("Compiled " + item);
-        }
         compiled.add(ensureCorrectOutput(context, chunk, item, generationOutputs, compilerOutput));
       }
 
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 22c83c8afc90..a81620b9531e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
@@ -27,9 +27,6 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.VirtualFileManager
-import com.intellij.openapi.vfs.newvfs.BulkFileListener
-import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import com.intellij.psi.PsiFile
 import com.intellij.testFramework.TestLoggerFactory
 import junit.framework.AssertionFailedError
@@ -247,21 +244,9 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase {
 
   public void testMakeInTests() throws Throwable {
     setupTestSources();
-    myFixture.project.messageBus.connect(testRootDisposable).subscribe(VirtualFileManager.VFS_CHANGES, new BulkFileListener() {
-      @Override
-      void before(List<? extends VFileEvent> events) {
-      }
-
-      @Override
-      void after(List<? extends VFileEvent> events) {
-        println ("" + Thread.currentThread() + " " + events)
-      }
-    })
     myFixture.addFileToProject("tests/Super.groovy", "class Super {}");
     assertEmpty(make());
 
-    println 'after first make ' + Thread.currentThread()
-
     def sub = myFixture.addFileToProject("tests/Sub.groovy", "class Sub {\n" +
       "  Super xxx() {}\n" +
       "  static void main(String[] args) {" +
@@ -270,7 +255,6 @@ public abstract class GroovyCompilerTest extends GroovyCompilerTestCase {
       "}");
 
     def javaFile = myFixture.addFileToProject("tests/Java.java", "public class Java {}");
-    edt { println 'before second make' }
 
     assertEmpty(make());
     assertOutput("Sub", "hello");
@@ -646,10 +630,10 @@ class Main {
       assert !findClassFile('FooX', dep)
     }
 
-    println make().join('\n')
+    assertEmpty(make())
     checkClassFiles()
 
-    println make().join('\n')
+    assertEmpty(make())
     checkClassFiles()
 
     assertOutput('Foo', 'Hello from Foo', myModule)