diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt
similarity index 97%
rename from compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt
index d0d5d5e8ad9..315a4001d11 100644
--- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt
@@ -30,9 +30,8 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.File
 import java.util.regex.Pattern
-import kotlin.test.assertNotNull
 
-public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() {
+public abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnnotationDescriptorResolveTest() {
 
     // Test directives should look like [// val testedPropertyName: expectedValue]
     fun doConstantTest(path: String) {
diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java
similarity index 96%
rename from compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java
index ce2f40f49e2..3954388e14e 100644
--- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java
@@ -28,11 +28,11 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
-public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest {
+public class CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
     @TestMetadata("compiler/testData/evaluate/constant")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Constant extends AbstractEvaluateExpressionTest {
+    public static class Constant extends AbstractCompileTimeConstantEvaluatorTest {
         public void testAllFilesPresentInConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -161,7 +161,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
     @TestMetadata("compiler/testData/evaluate/isPure")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class IsPure extends AbstractEvaluateExpressionTest {
+    public static class IsPure extends AbstractCompileTimeConstantEvaluatorTest {
         public void testAllFilesPresentInIsPure() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -200,7 +200,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
     @TestMetadata("compiler/testData/evaluate/usesVariableAsConstant")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class UsesVariableAsConstant extends AbstractEvaluateExpressionTest {
+    public static class UsesVariableAsConstant extends AbstractCompileTimeConstantEvaluatorTest {
         public void testAllFilesPresentInUsesVariableAsConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true);
         }
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index fc56f3467a2..92dc2c3d2c1 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -125,7 +125,7 @@ import org.jetbrains.kotlin.resolve.AbstractResolveTest
 import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest
 import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests
-import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest
+import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest
 import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
 import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest
 import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest
@@ -324,7 +324,7 @@ fun main(args: Array<String>) {
             model("resolveAnnotations/parameters")
         }
 
-        testClass<AbstractEvaluateExpressionTest>() {
+        testClass<AbstractCompileTimeConstantEvaluatorTest>() {
             model("evaluate/constant", testMethod = "doConstantTest")
             model("evaluate/isPure", testMethod = "doIsPureTest")
             model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest")