diff --git a/platform/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java
index 3e6725ea79bf..e0a4be324acd 100644
--- a/platform/util/src/com/intellij/util/EnvironmentUtil.java
+++ b/platform/util/src/com/intellij/util/EnvironmentUtil.java
@@ -41,7 +41,7 @@ import java.util.concurrent.Future;
 public class EnvironmentUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.util.EnvironmentUtil");
 
-  private static final int SHELL_ENV_READING_TIMEOUT = 10000;
+  private static final int SHELL_ENV_READING_TIMEOUT = 20000;
 
   private static final Future<Map<String, String>> ourEnvGetter;
   static {
diff --git a/test-log.xml b/test-log.xml
index 8c8f3b049091..4742eedd90fa 100644
--- a/test-log.xml
+++ b/test-log.xml
@@ -18,9 +18,7 @@
     </layout>
   </appender>
 
-  <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
-    <param name="MaxFileSize" value="1Mb"/>
-    <param name="MaxBackupIndex" value="12"/>
+  <appender name="FILE" class="org.apache.log4j.FileAppender">
     <param name="file" value="$LOG_DIR$/idea.log"/>
     <layout class="org.apache.log4j.PatternLayout">
       <param name="ConversionPattern" value="%d [%7r] %6p - %30.30c - %m \n"/>