diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5AcceptanceTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5AcceptanceTest.kt
similarity index 90%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5AcceptanceTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5AcceptanceTest.kt
index 54b81ca1bd0f..a8b04dc60606 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5AcceptanceTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5AcceptanceTest.kt
@@ -1,7 +1,8 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin
 
 import com.intellij.codeInsight.TestFrameworks
+import com.intellij.execution.junit.JUnitConfiguration
 import com.intellij.execution.junit.codeInsight.JUnit5TestFrameworkSetupUtil
 import com.intellij.psi.PsiClassOwner
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase5
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5ReferenceContributorTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5ReferenceContributorTest.kt
similarity index 97%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5ReferenceContributorTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5ReferenceContributorTest.kt
index e0285e4d1331..7e6c977ab184 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/KotlinJUnit5ReferenceContributorTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/KotlinJUnit5ReferenceContributorTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit
+package com.intellij.execution.junit.kotlin
 
 import com.intellij.junit.testFramework.JUnit5ReferenceContributorTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt
similarity index 98%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt
index 94fcd2bf4ac6..806ceef67762 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinHamcrestAssertionsConverterInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.HamcrestAssertionsConverterInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt
similarity index 92%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt
index ff485eed8c0c..8d1b94c96662 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit3SuperTearDownInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnit3SuperTearDownInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit4ConverterInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit4ConverterInspectionTest.kt
similarity index 98%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit4ConverterInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit4ConverterInspectionTest.kt
index 59abdea7eac2..6cab0a6d69a5 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit4ConverterInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit4ConverterInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnit4ConverterInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt
similarity index 97%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt
index 48df98208089..5f35e9a995d6 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5AssertionsConverterInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnit5AssertionsConverterInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5ConverterInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5ConverterInspectionTest.kt
similarity index 97%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5ConverterInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5ConverterInspectionTest.kt
index e69b633f4f00..cee39826a45c 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnit5ConverterInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnit5ConverterInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnit5ConverterInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt
similarity index 94%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt
index 7fe42c7233e8..2b6ffd2395bb 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsMayBeAssertSameInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitAssertEqualsMayBeAssertSameInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt
similarity index 92%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt
index ef8796e8ea00..0ce901f5e0ac 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitAssertEqualsOnArrayInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitAssertEqualsOnArrayInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt
similarity index 91%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt
index 4f4e329626f9..06822de2c220 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitIgnoredTestInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitIgnoredTestInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt
similarity index 99%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt
index 198014316f7a..08e52198b181 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMalformedDeclarationInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitMalformedDeclarationInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt
similarity index 98%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt
index 05d23698d8d3..fa7f98c5cf35 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitMixedFrameworkInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitMixedFrameworkInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt
similarity index 97%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt
index 929de34fa97d..5c4b6fb1a23e 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinJUnitParameterizedSourceGoToRelatedTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.JUnitParameterizedSourceGoToRelatedTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt
similarity index 96%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt
index 4dceff93fc85..26eef0383e5c 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/KotlinTestCaseWithMultipleRunnersInspectionTest.kt
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.execution.junit.kotlin.codeInspection
 
 import com.intellij.junit.testFramework.TestCaseWithMultipleRunnersInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
diff --git a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt
similarity index 97%
rename from plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt
rename to plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt
index 55dd28f317d0..befbe033b946 100644
--- a/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt
+++ b/plugins/junit/kotlin-tests/test/com/intellij/execution/junit/kotlin/codeInspection/deadCode/KotlinJUnit5ImplicitUsageProviderTest.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.execution.junit.codeInspection.deadCode
+package com.intellij.execution.junit.kotlin.codeInspection.deadCode
 
 import com.intellij.junit.testFramework.JUnit5ImplicitUsageProviderTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage