diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
index bab5800861c..ef8364eca42 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
@@ -81,7 +81,7 @@ abstract class KtLightClassForSourceDeclaration(
 
     override fun getText() = kotlinOrigin.text ?: ""
 
-    override fun getTextRange(): TextRange = kotlinOrigin.textRange ?: TextRange.EMPTY_RANGE
+    override fun getTextRange(): TextRange? = kotlinOrigin.textRange ?: TextRange.EMPTY_RANGE
 
     override fun getTextOffset() = kotlinOrigin.textOffset
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
index e7163eb2b61..30788e3807a 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.asJava.classes
 
+import com.intellij.openapi.util.TextRange
+import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.*
 import com.intellij.psi.impl.InheritanceImplUtil
 import com.intellij.psi.impl.PsiClassImplUtil
@@ -475,4 +477,12 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
     override fun isDeprecated(): Boolean = _deprecated
 
     override fun copy(): KtLightClassImpl = KtUltraLightClass(classOrObject.copy() as KtClassOrObject, support)
+
+    override fun getTextRange(): TextRange? {
+        if (Registry.`is`("kotlin.ultra.light.classes.empty.text.range", true)) {
+            return null
+        }
+
+        return super.getTextRange()
+    }
 }
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt
index add1fc371bc..3020960fd8b 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt
@@ -34,20 +34,20 @@ class GradleTestRunConfigurationCustomTest : GradleImportingTestCase() {
                 val kotlinFile = files.first { it.name == "MyKotlinTest.kt" }
 
                 val javaClassConfiguration = getConfiguration(javaFile, myProject, "MyTest")
-                javaClassConfiguration.isProducedBy(TestClassGradleConfigurationProducer::class.java)
-                assert(javaClassConfiguration.configuration !is KotlinGradleRunConfiguration)
+                assert(javaClassConfiguration.isProducedBy(TestClassGradleConfigurationProducer::class.java))
+                assert(javaClassConfiguration.configuration.name == "MyTest")
 
                 val javaMethodConfiguration = getConfiguration(javaFile, myProject, "testA")
-                javaMethodConfiguration.isProducedBy(TestMethodGradleConfigurationProducer::class.java)
-                assert(javaMethodConfiguration.configuration !is KotlinGradleRunConfiguration)
+                assert(javaMethodConfiguration.isProducedBy(TestMethodGradleConfigurationProducer::class.java))
+                assert(javaMethodConfiguration.configuration.name == "MyTest.testA")
 
                 val kotlinClassConfiguration = getConfiguration(kotlinFile, myProject, "MyKotlinTest")
-                kotlinClassConfiguration.isProducedBy(KotlinJvmTestClassGradleConfigurationProducer::class.java)
-                assert(kotlinClassConfiguration.configuration is KotlinGradleRunConfiguration)
+                assert(kotlinClassConfiguration.isProducedBy(KotlinJvmTestClassGradleConfigurationProducer::class.java))
+                assert(kotlinClassConfiguration.configuration.name == "MyKotlinTest")
 
                 val kotlinFunctionConfiguration = getConfiguration(kotlinFile, myProject, "testA")
-                kotlinFunctionConfiguration.isProducedBy(KotlinJvmTestMethodGradleConfigurationProducer::class.java)
-                assert(kotlinFunctionConfiguration.configuration is KotlinGradleRunConfiguration)
+                assert(kotlinFunctionConfiguration.isProducedBy(KotlinJvmTestMethodGradleConfigurationProducer::class.java))
+                assert(kotlinFunctionConfiguration.configuration.name == "MyKotlinTest.testA")
             }
         }
     }
diff --git a/idea/resources/META-INF/jvm.xml b/idea/resources/META-INF/jvm.xml
index 2095194e196..2f357e7b0a4 100644
--- a/idea/resources/META-INF/jvm.xml
+++ b/idea/resources/META-INF/jvm.xml
@@ -175,6 +175,11 @@
                    defaultValue="true"
                    restartRequired="false"/>
 
+      <registryKey key="kotlin.ultra.light.classes.empty.text.range"
+                   description="Return 'null' text range as in old light class implementation"
+                   defaultValue="true"
+                   restartRequired="false"/>
+
       <registryKey key="kotlin.uast.force.uinjectionhost"
                    description="Whether to convert `KtStringTemplateExpression` to `KotlinStringTemplateUPolyadicExpression` in all cases"
                    defaultValue="true"
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt
index e5d7dbea213..8bc0e614f90 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassFromTextTest.kt
@@ -43,7 +43,7 @@ class LightClassFromTextTest : KotlinLightCodeInsightFixtureTestCase() {
         val classC = classes[0]
         assertEquals("C", classC.qualifiedName)
         assertEquals("class C", classC.text)
-        assertEquals(TextRange(17, 24), classC.textRange)
+        assertEquals(null, classC.textRange)
         assertEquals(23, classC.textOffset)
         assertEquals(17, classC.startOffsetInParent)
         assertTrue(classC.isWritable)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationTest.kt
index 4f4e779aaca..793f2df039e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationTest.kt
@@ -44,20 +44,20 @@ class KotlinJUnitRunConfigurationTest : AbstractRunConfigurationTest() {
             val kotlinFile = testDir.findChild("MyKotlinTest.kt")!!
 
             val javaClassConfiguration = getConfiguration(javaFile, project, "MyTest")
-            javaClassConfiguration.isProducedBy(TestInClassConfigurationProducer::class.java)
-            assert(javaClassConfiguration.configuration !is KotlinJUnitConfiguration)
+            assert(javaClassConfiguration.isProducedBy(TestInClassConfigurationProducer::class.java))
+            assert(javaClassConfiguration.configuration.name == "MyJavaTest")
 
             val javaMethodConfiguration = getConfiguration(javaFile, project, "testA")
-            javaMethodConfiguration.isProducedBy(TestInClassConfigurationProducer::class.java)
-            assert(javaMethodConfiguration.configuration !is KotlinJUnitConfiguration)
+            assert(javaMethodConfiguration.isProducedBy(TestInClassConfigurationProducer::class.java))
+            assert(javaMethodConfiguration.configuration.name == "MyJavaTest.testA")
 
             val kotlinClassConfiguration = getConfiguration(kotlinFile, project, "MyKotlinTest")
-            kotlinClassConfiguration.isProducedBy(KotlinJUnitRunConfigurationProducer::class.java)
-            assert(kotlinClassConfiguration.configuration is KotlinJUnitConfiguration)
+            assert(kotlinClassConfiguration.isProducedBy(KotlinJUnitRunConfigurationProducer::class.java))
+            assert(kotlinClassConfiguration.configuration.name == "MyKotlinTest")
 
             val kotlinFunctionConfiguration = getConfiguration(kotlinFile, project, "testA")
-            kotlinFunctionConfiguration.isProducedBy(KotlinJUnitRunConfigurationProducer::class.java)
-            assert(kotlinFunctionConfiguration.configuration is KotlinJUnitConfiguration)
+            assert(kotlinFunctionConfiguration.isProducedBy(KotlinJUnitRunConfigurationProducer::class.java))
+            assert(kotlinFunctionConfiguration.configuration.name == "MyKotlinTest.testA")
         } finally {
             detachJUnitLibrary()
         }