diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
index 50245ff9983..01fab5e4288 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
@@ -79,11 +79,15 @@ public class ClassBuilderMode {
             /* generateMultiFileFacadePartClasses = */ true,
             /* mightBeIncorrectCode = */ true);
 
-    @TestOnly
-    public final static ClassBuilderMode LIGHT_ANALYSIS_FOR_TESTS = new ClassBuilderMode(
+    private final static ClassBuilderMode LIGHT_ANALYSIS_FOR_TESTS = new ClassBuilderMode(
             /* bodies = */ false,
             /* metadata = */ true,
             /* sourceRetention = */ false,
             /* generateMultiFileFacadePartClasses = */ true,
             /* mightBeIncorrectCode = */ true);
+
+    @TestOnly
+    public static ClassBuilderMode getLightAnalysisForTests() {
+        return LIGHT_ANALYSIS_FOR_TESTS;
+    }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
index 825211b4dda..dbb33593ce7 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
@@ -22,7 +22,7 @@ import java.io.File
 abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
     private companion object {
         var TEST_LIGHT_ANALYSIS: ClassBuilderFactory = object : ClassBuilderFactories.TestClassBuilderFactory() {
-            override fun getClassBuilderMode() = ClassBuilderMode.LIGHT_ANALYSIS_FOR_TESTS
+            override fun getClassBuilderMode() = ClassBuilderMode.getLightAnalysisForTests()
         }
     }
 
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/OptimizedImportsBuilder.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/OptimizedImportsBuilder.kt
index 7119b314286..d43dd9838f2 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/OptimizedImportsBuilder.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/OptimizedImportsBuilder.kt
@@ -49,7 +49,8 @@ class OptimizedImportsBuilder(
         private val options: Options
 ) {
     companion object {
-        @TestOnly
+        @get:TestOnly
+        @set:TestOnly
         var testLog: StringBuilder? = null
     }