diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java
index 138f815f87e4..f8a6a34b6c1c 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogExternalSettingsService.java
@@ -4,6 +4,7 @@ package com.intellij.internal.statistic.eventLog;
 import com.intellij.facet.frameworks.SettingsConnectionService;
 import com.intellij.internal.statistic.persistence.ApprovedGroupsCacheConfigurable;
 import com.intellij.internal.statistic.service.fus.FUStatisticsWhiteListGroupsService;
+import com.intellij.internal.statistic.utils.StatisticsUploadAssistant;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.diagnostic.Logger;
@@ -90,7 +91,7 @@ public class EventLogExternalSettingsService extends SettingsConnectionService i
 
   @Override
   public boolean isInternal() {
-    return false;
+    return StatisticsUploadAssistant.isTestStatisticsEnabled();
   }
 
   @Nullable
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java b/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java
index 717fa7778c53..cd3fef274738 100755
--- a/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java
@@ -21,6 +21,7 @@ import com.intellij.internal.statistic.connect.StatisticsService;
 import com.intellij.internal.statistic.eventLog.EventLogStatisticsService;
 import com.intellij.internal.statistic.persistence.SentUsagesPersistence;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Time;
 
 public class StatisticsUploadAssistant {
@@ -67,7 +68,7 @@ public class StatisticsUploadAssistant {
   }
 
   public static boolean isTestStatisticsEnabled() {
-    return Boolean.getBoolean(ENABLE_LOCAL_STATISTICS_WITHOUT_REPORT);
+    return Boolean.getBoolean(ENABLE_LOCAL_STATISTICS_WITHOUT_REPORT) || StringUtil.isNotEmpty(System.getenv("TEAMCITY_VERSION"));
   }
 
   public static void updateSentTime() {