diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
index d0e89be8e9f..476f0ab0581 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
@@ -21,10 +21,6 @@ import org.jetbrains.annotations.NotNull;
 import java.io.PrintStream;
 
 public class PrintingMessageCollector implements MessageCollector {
-    @SuppressWarnings("UseOfSystemOutOrSystemErr")
-    public static final MessageCollector PLAIN_TEXT_TO_SYSTEM_ERR =
-            new PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false);
-
     private final boolean verbose;
     private final PrintStream errStream;
     private final MessageRenderer messageRenderer;
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
index d06cfdcbfe2..35916711592 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
@@ -21,6 +21,7 @@ import junit.textui.TestRunner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys;
+import org.jetbrains.kotlin.cli.common.messages.MessageRenderer;
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -57,7 +58,10 @@ public class StdlibTest extends KotlinTestWithEnvironment {
         JvmContentRootsKt.addJvmClasspathRoot(configuration, junitJar);
 
         ContentRootsKt.addKotlinSourceRoot(configuration, KotlinTestUtils.getHomeDirectory() + "/libraries/stdlib/test");
-        configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR);
+        configuration.put(
+                CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY,
+                new PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false)
+        );
 
         return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
index c237c088f0b..aa4ae2b6cde 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult;
 import org.jetbrains.kotlin.cli.AbstractCliTest;
 import org.jetbrains.kotlin.cli.common.ExitCode;
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport;
+import org.jetbrains.kotlin.cli.common.messages.MessageRenderer;
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector;
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
@@ -278,7 +279,10 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
         result.throwIfError();
 
         BindingContext bindingContext = result.getBindingContext();
-        AnalyzerWithCompilerReport.Companion.reportDiagnostics(bindingContext.getDiagnostics(), PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR);
+        AnalyzerWithCompilerReport.Companion.reportDiagnostics(
+                bindingContext.getDiagnostics(),
+                new PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false)
+        );
 
         assertEquals("There should be no diagnostics", 0, Iterables.size(bindingContext.getDiagnostics()));
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
index 5399690b3ec..da4da6bcca4 100644
--- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
@@ -72,7 +72,7 @@ public class ScriptTest {
             @NotNull KotlinScriptDefinition scriptDefinition
     ) {
         KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory();
-        MessageCollector messageCollector = PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR;
+        MessageCollector messageCollector = new PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false);
 
         Disposable rootDisposable = Disposer.newDisposable();
         try {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
index 9e7940ee408..d4c806c5717 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
@@ -20,6 +20,7 @@ import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
+import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully
@@ -28,8 +29,6 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtFile
 import java.io.File
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 
 class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testNoErrors() {
@@ -51,7 +50,7 @@ class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() {
                     if (errors.isNotEmpty()) {
                         System.err.println("${psiFile.getName()}: ${errors.size} errors")
                         AnalyzerWithCompilerReport.reportDiagnostics(
-                                bindingContext.diagnostics, PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR
+                                bindingContext.diagnostics, PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false)
                         )
 
                         totalErrors += errors.size