diff --git a/platform/testFramework/src/com/intellij/testFramework/TestLoggerFactory.java b/platform/testFramework/src/com/intellij/testFramework/TestLoggerFactory.java
index 0722456ec5b1..354a9cad3a5b 100644
--- a/platform/testFramework/src/com/intellij/testFramework/TestLoggerFactory.java
+++ b/platform/testFramework/src/com/intellij/testFramework/TestLoggerFactory.java
@@ -32,6 +32,8 @@ import java.io.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.intellij.openapi.application.PathManager.PROPERTY_LOG_PATH;
+
 @SuppressWarnings({"CallToPrintStackTrace", "UseOfSystemOutOrSystemErr"})
 public class TestLoggerFactory implements Logger.Factory {
   private static final String SYSTEM_MACRO = "$SYSTEM_DIR$";
@@ -100,6 +102,8 @@ public class TestLoggerFactory implements Logger.Factory {
   }
 
   public static String getTestLogDir() {
+    if (System.getProperty(PROPERTY_LOG_PATH) != null) return System.getProperty(PROPERTY_LOG_PATH);
+
     return PathManager.getSystemPath() + "/" + LOG_DIR;
   }