diff --git a/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel b/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel
index 14d0c719dc9c..fb2d15bb9705 100644
--- a/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel
+++ b/plugins/devkit/devkit-kotlin-fir-tests/BUILD.bazel
@@ -1,5 +1,11 @@
 ### auto-generated section `build intellij.devkit.kotlin.fir.tests` start
-load("@rules_jvm//:jvm.bzl", "jvm_library")
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "kotlin-fir-tests_test_resources",
+  srcs = glob(["testData/**/*"]),
+  strip_prefix = "testData"
+)
 
 jvm_library(
   name = "kotlin-fir-tests",
@@ -12,6 +18,7 @@ jvm_library(
   module_name = "intellij.devkit.kotlin.fir.tests",
   visibility = ["//visibility:public"],
   srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testSrc/**/*.form"], allow_empty = True),
+  resources = [":kotlin-fir-tests_test_resources"],
   deps = [
     "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
diff --git a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
index 814aa2a0dd2e..77805bac8acb 100644
--- a/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
+++ b/plugins/devkit/devkit-kotlin-fir-tests/intellij.devkit.kotlin.fir.tests.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/AnnotationInChain.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/AnnotationInChain.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/AnnotationInChain.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/AnnotationInChain.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/AssertionInNestedBlock.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/AssertionInNestedBlock.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/AssertionInNestedBlock.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/AssertionInNestedBlock.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/BothAnnotationAndAssertion.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/BothAnnotationAndAssertion.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/BothAnnotationAndAssertion.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/BothAnnotationAndAssertion.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/CompanionDefaultArgs.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/CompanionDefaultArgs.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/CompanionDefaultArgs.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/CompanionDefaultArgs.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/CyclicRecursiveCalls.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/CyclicRecursiveCalls.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/CyclicRecursiveCalls.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/CyclicRecursiveCalls.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/DifferentClassesMethods.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/DifferentClassesMethods.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/DifferentClassesMethods.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/DifferentClassesMethods.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/LambdaWithMethodReference.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/LambdaWithMethodReference.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/LambdaWithMethodReference.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/LambdaWithMethodReference.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/MultipleAssertionsInMethod.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/MultipleAssertionsInMethod.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/MultipleAssertionsInMethod.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/MultipleAssertionsInMethod.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/NoLockRequirements.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/NoLockRequirements.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/NoLockRequirements.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/NoLockRequirements.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/SubtypingPolymorphism.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/SubtypingPolymorphism.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/SubtypingPolymorphism.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/SubtypingPolymorphism.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/SuspendAndProperty.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/SuspendAndProperty.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/SuspendAndProperty.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/SuspendAndProperty.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/TopLevelAndExtension.kt b/plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/TopLevelAndExtension.kt
similarity index 100%
rename from plugins/devkit/devkit-kotlin-tests/testData/threadingModelHelper/TopLevelAndExtension.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testData/threadingModelHelper/TopLevelAndExtension.kt
diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/threadingModelHelper/KtLockReqUnitTest.kt b/plugins/devkit/devkit-kotlin-fir-tests/testSrc/org/jetbrains/idea/devkit/k2/threadingModelHelper/KtLockReqUnitTest.kt
similarity index 94%
rename from plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/threadingModelHelper/KtLockReqUnitTest.kt
rename to plugins/devkit/devkit-kotlin-fir-tests/testSrc/org/jetbrains/idea/devkit/k2/threadingModelHelper/KtLockReqUnitTest.kt
index 48081215605a..c29722213c9c 100644
--- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/threadingModelHelper/KtLockReqUnitTest.kt
+++ b/plugins/devkit/devkit-kotlin-fir-tests/testSrc/org/jetbrains/idea/devkit/k2/threadingModelHelper/KtLockReqUnitTest.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.idea.devkit.kotlin.threadingModelHelper
+package org.jetbrains.idea.devkit.k2.threadingModelHelper
 
-import com.intellij.psi.PsiMethod
+import com.intellij.openapi.application.PluginPathManager
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.SmartPointerManager
 import com.intellij.psi.search.GlobalSearchScope
@@ -15,7 +15,6 @@ import org.jetbrains.idea.devkit.threadingModelHelper.ConstraintType
 import org.jetbrains.idea.devkit.threadingModelHelper.LockReqAnalyzerParallelBFS
 import java.util.EnumSet
 
-
 @TestDataPath($$"$CONTENT_ROOT/testData/threadingModelHelper/")
 class KtLockReqUnitTest : BasePlatformTestCase() {
 
@@ -61,7 +60,7 @@ class KtLockReqUnitTest : BasePlatformTestCase() {
       """.trimIndent())
   }
 
-  override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "threadingModelHelper/"
+  override fun getBasePath() = PluginPathManager.getPluginHomePathRelative("devkit") + "/devkit-kotlin-fir-tests/testData/threadingModelHelper/"
 
   private fun formatResult(result: AnalysisResult): List<String> {
     val actualPaths = result.paths.map { path ->
@@ -77,9 +76,9 @@ class KtLockReqUnitTest : BasePlatformTestCase() {
     val className = relativeFileName.removeSuffix(".kt")
     val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.projectScope(project))
     val method = SmartPointerManager.createPointer(psiClass?.methods?.firstOrNull { m -> m.name == TEST_METHOD_NAME }!!)
-    val config = AnalysisConfig.forProject(project, EnumSet.allOf(ConstraintType::class.java))
+    val config = AnalysisConfig.Companion.forProject(project, EnumSet.allOf(ConstraintType::class.java))
     return runBlocking {
-      analyzerBFS.analyzeMethod(method, config)
+        analyzerBFS.analyzeMethod(method, config)
     }
   }
 
@@ -184,4 +183,4 @@ class KtLockReqUnitTest : BasePlatformTestCase() {
   companion object {
     private const val TEST_METHOD_NAME = "testMethod"
   }
-}
+}
\ No newline at end of file