diff --git a/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java b/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
index 445ac0126047..f5199e35a9e9 100644
--- a/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
+++ b/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
@@ -281,6 +281,10 @@ public class GeneralCommandLine implements UserDataHolder {
       environment.putAll(PlatformUtils.isAppCode() ? System.getenv() // Temporarily fix for OC-8606
                                                    : EnvironmentUtil.getEnvironmentMap());
     }
+    
+    if (PlatformUtils.isPyCharm()) { //We test the approach on snakes first. If it won't cause problems then apply for all (IDEA-118946)
+      EncodingEnvironmentUtil.fixDefaultEncodingIfMac(this, null);      
+    }
 
     if (!myEnvParams.isEmpty()) {
       if (SystemInfo.isWindows) {