diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 47341bbfa346..889d845e73cc 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -103,15 +103,24 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     final OSProcessHandler handler = createHandler(executor);
     consoleView.attachToProcess(handler);
     handler.addProcessListener(new ProcessAdapter() {
+      @Override
+      public void startNotified(ProcessEvent event) {
+        if (getConfiguration().isSaveOutputToFile()) {
+          viewer.getRoot().setOutputFilePath(getConfiguration().getOutputFilePath());
+        }
+      }
+
       @Override
       public void processTerminated(ProcessEvent event) {
         Runnable runnable = new Runnable() {
           public void run() {
+            final AbstractTestProxy viewerRoot = viewer.getRoot();
             if (viewer.hasTestSuites() ||
                 !ResetConfigurationModuleAdapter.tryWithAnotherModule(getConfiguration(), testConsoleProperties.isDebug())) {
-              TestsUIUtil.notifyByBalloon(testConsoleProperties.getProject(), viewer.hasTestSuites(), viewer.getRoot(), testConsoleProperties, null);
+              TestsUIUtil.notifyByBalloon(testConsoleProperties.getProject(), viewer.hasTestSuites(), viewerRoot, testConsoleProperties, null);
             }
 
+            viewerRoot.flush();
             deleteTempFiles();
             clear();
           }