diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase5.kt b/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase5.kt
index 81edbf553fe0..6a219aca8839 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase5.kt
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase5.kt
@@ -16,11 +16,11 @@ import org.junit.jupiter.api.extension.RegisterExtension
  * @see LightJavaCodeInsightFixtureTestCase
  * @see LightJavaCodeInsightFixtureTestCase4
  */
-@TestDataPath("\$CONTENT_ROOT/testData")
-abstract class LightJavaCodeInsightFixtureTestCase5 (projectDescriptor: LightProjectDescriptor? = null) {
+@TestDataPath($$"$CONTENT_ROOT/testData")
+abstract class LightJavaCodeInsightFixtureTestCase5(projectDescriptor: LightProjectDescriptor? = null) {
 
-  protected open fun getRelativePath() : String = JavaTestUtil.getRelativeJavaTestDataPath()
-  protected open fun getTestDataPath() : String? = null
+  protected open fun getRelativePath(): String = JavaTestUtil.getRelativeJavaTestDataPath()
+  protected open fun getTestDataPath(): String? = null
 
   @RegisterExtension
   protected val testNameRule: TestNameExtension = TestNameExtension()
@@ -28,7 +28,7 @@ abstract class LightJavaCodeInsightFixtureTestCase5 (projectDescriptor: LightPro
   protected fun getTestName(lowercaseFirstLetter: Boolean): String {
     return PlatformTestUtil.getTestName(testNameRule.methodName, lowercaseFirstLetter)
   }
-  
+
   @RegisterExtension
   private val testCase = object : LightJavaCodeInsightFixtureTestCase(), BeforeEachCallback, AfterEachCallback {
 
@@ -36,15 +36,11 @@ abstract class LightJavaCodeInsightFixtureTestCase5 (projectDescriptor: LightPro
 
     override fun getTestDataPath(): String = this@LightJavaCodeInsightFixtureTestCase5.getTestDataPath() ?: super.getTestDataPath()
 
-    override fun getBasePath(): String = this@LightJavaCodeInsightFixtureTestCase5.getRelativePath() 
+    override fun getBasePath(): String = this@LightJavaCodeInsightFixtureTestCase5.getRelativePath()
 
-    override fun beforeEach(context: ExtensionContext?) {
-      setUp()
-    }
+    override fun beforeEach(context: ExtensionContext): Unit = setUp()
 
-    override fun afterEach(context: ExtensionContext?) {
-      tearDown()
-    }
+    override fun afterEach(context: ExtensionContext): Unit = tearDown()
 
     val fixture: JavaCodeInsightTestFixture get() = myFixture
   }