diff --git a/.idea/libraries/byte_buddy.xml b/.idea/libraries/byte_buddy.xml
new file mode 100644
index 000000000000..01ba15fc3e6c
--- /dev/null
+++ b/.idea/libraries/byte_buddy.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+  <library name="byte-buddy" type="repository">
+    <properties maven-id="net.bytebuddy:byte-buddy:1.17.6">
+      <verification>
+        <artifact url="file://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.6/byte-buddy-1.17.6.jar">
+          <sha256sum>d26382a839cb26d5c62a0b0f04715bcef55a531f96ac6ce40de452a1c0539e70</sha256sum>
+        </artifact>
+      </verification>
+    </properties>
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.6/byte-buddy-1.17.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.6/byte-buddy-1.17.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/mockito.xml b/.idea/libraries/mockito.xml
index 92a481ccfa57..04d0ceee4997 100644
--- a/.idea/libraries/mockito.xml
+++ b/.idea/libraries/mockito.xml
@@ -5,9 +5,6 @@
         <artifact url="file://$MAVEN_REPOSITORY$/org/mockito/mockito-core/5.18.0/mockito-core-5.18.0.jar">
           <sha256sum>a3d4e40f7fe66016fe42c00de4e343777d74132afc85018e0f03ac6334a60f29</sha256sum>
         </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.5/byte-buddy-1.17.5.jar">
-          <sha256sum>71568c9f8396677219f650268fbf6493ded484edcdbdf2dae6129ca5be81e8db</sha256sum>
-        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.5/byte-buddy-agent-1.17.5.jar">
           <sha256sum>c5b9334ad82e632f6af60df22bbbdbbb62cee04877f4f43c38ba04aed9bd9901</sha256sum>
         </artifact>
@@ -15,17 +12,18 @@
           <sha256sum>02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb</sha256sum>
         </artifact>
       </verification>
+      <exclude>
+        <dependency maven-id="net.bytebuddy:byte-buddy" />
+      </exclude>
     </properties>
     <CLASSES>
       <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/5.18.0/mockito-core-5.18.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.5/byte-buddy-1.17.5.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.5/byte-buddy-agent-1.17.5.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.3/objenesis-3.3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/5.18.0/mockito-core-5.18.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.5/byte-buddy-1.17.5-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.5/byte-buddy-agent-1.17.5-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.3/objenesis-3.3-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 23405f2924a1..6c44eabf4413 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -630,6 +630,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" filepath="$PROJECT_DIR$/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" filepath="$PROJECT_DIR$/libraries/lucene.common/intellij.libraries.lucene.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" filepath="$PROJECT_DIR$/libraries/microba/intellij.libraries.microba.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" filepath="$PROJECT_DIR$/libraries/mockito/intellij.libraries.mockito.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" filepath="$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" filepath="$PROJECT_DIR$/libraries/testcontainers/intellij.libraries.testcontainers.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" filepath="$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 712c123604ab..594acb5c9f7f 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -351,6 +351,7 @@ libraries/ktor-client
 libraries/ktor-client-cio
 libraries/lucene.common
 libraries/microba
+libraries/mockito
 libraries/skiko
 libraries/testcontainers
 libraries/testng
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index 18680b3f814d..3f368888fbd1 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -85,7 +85,7 @@ jvm_library(
     "//plugins/groovy:groovy_test_lib",
     "//platform/lang-impl:lang-tests_test_lib",
     "//platform/platform-impl/internal",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:assert_j",
     "//xml/xml-analysis-impl:analysis-impl",
     "//xml/xml-psi-api:psi",
@@ -154,6 +154,7 @@ jvm_library(
     "//platform/lang-impl",
     "//xml/impl",
     "//platform/syntax/syntax-scripts:scripts",
+    "@lib//:byte-buddy",
   ],
   runtime_deps = [
     ":tests_test_resources",
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 554ff0825787..6e254b5bdf84 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -68,7 +68,7 @@
     <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
     <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
@@ -128,5 +128,6 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax.scripts" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="byte-buddy" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel
index 62f35e87a1f4..3d48c76fbe04 100644
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -838,6 +838,13 @@ jvm_import(
   source_jar = "@bcprov-jdk18on-1_81-sources_http//file"
 )
 
+jvm_import(
+  name = "byte-buddy",
+  jar = "@byte-buddy-1_17_6_http//file",
+  source_jar = "@byte-buddy-1_17_6-sources_http//file",
+  visibility = ["//visibility:public"]
+)
+
 jvm_import(
   name = "caffeine",
   jar = "@caffeine-3_2_1_http//file",
@@ -7332,7 +7339,6 @@ java_library(
   name = "mockito",
   exports = [
     ":mockito-core-5_18_0_http_import",
-    ":byte-buddy-1_17_5_http_import",
     ":byte-buddy-agent-1_17_5_http_import",
     ":objenesis-3_3_http_import",
   ],
@@ -8945,8 +8951,6 @@ java_library(
   exports = [
     ":system-stubs-jupiter-2_1_8_http_import",
     ":system-stubs-core-2_1_8_http_import",
-    ":byte-buddy-1_17_4_http_import",
-    ":byte-buddy-agent-1_17_4_http_import",
   ],
   visibility = ["//visibility:public"]
 )
@@ -8963,18 +8967,6 @@ jvm_import(
   source_jar = "@system-stubs-core-2_1_8-sources_http//file"
 )
 
-jvm_import(
-  name = "byte-buddy-1_17_4_http_import",
-  jar = "@byte-buddy-1_17_4_http//file",
-  source_jar = "@byte-buddy-1_17_4-sources_http//file"
-)
-
-jvm_import(
-  name = "byte-buddy-agent-1_17_4_http_import",
-  jar = "@byte-buddy-agent-1_17_4_http//file",
-  source_jar = "@byte-buddy-agent-1_17_4-sources_http//file"
-)
-
 jvm_import(
   name = "python-ml-features-jetbrains-ml-models-python-imports-ranking-model",
   jar = "@python-imports-ranking-model-coral-panda-republished-4_http//file",
diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel
index 238807220a74..a5e10179ccab 100644
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -699,6 +699,20 @@ http_file(
   downloaded_file_path = "bcprov-jdk18on-1.81-sources.jar"
 )
 
+http_file(
+  name = "byte-buddy-1_17_6_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.6/byte-buddy-1.17.6.jar",
+  sha256 = "d26382a839cb26d5c62a0b0f04715bcef55a531f96ac6ce40de452a1c0539e70",
+  downloaded_file_path = "byte-buddy-1.17.6.jar"
+)
+
+http_file(
+  name = "byte-buddy-1_17_6-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.6/byte-buddy-1.17.6-sources.jar",
+  sha256 = "bed458b6ee0df083eb4e1bd2dd171f7d8abe30993b510a9a241ba7bff3653e27",
+  downloaded_file_path = "byte-buddy-1.17.6-sources.jar"
+)
+
 http_file(
   name = "caffeine-3_2_1_http",
   url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/3.2.1/caffeine-3.2.1.jar",
@@ -12816,20 +12830,6 @@ http_file(
   downloaded_file_path = "system-stubs-core-2.1.8.jar"
 )
 
-http_file(
-  name = "byte-buddy-1_17_4_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4.jar",
-  sha256 = "74768731219a5b2e0cc9d2b1c9e2092e0622242e41b1925a6ba7346e160731bc",
-  downloaded_file_path = "byte-buddy-1.17.4.jar"
-)
-
-http_file(
-  name = "byte-buddy-agent-1_17_4_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4.jar",
-  sha256 = "e1dae7efc5562c29ad3b625b90e6864208de69bad5632c3f93a547f17622ac51",
-  downloaded_file_path = "byte-buddy-agent-1.17.4.jar"
-)
-
 http_file(
   name = "system-stubs-jupiter-2_1_8-sources_http",
   url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8-sources.jar",
@@ -12844,20 +12844,6 @@ http_file(
   downloaded_file_path = "system-stubs-core-2.1.8-sources.jar"
 )
 
-http_file(
-  name = "byte-buddy-1_17_4-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4-sources.jar",
-  sha256 = "ea0286512984db5473f6573bc84030a5d1eab4dbaecf3ffde0b8827d967316f8",
-  downloaded_file_path = "byte-buddy-1.17.4-sources.jar"
-)
-
-http_file(
-  name = "byte-buddy-agent-1_17_4-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4-sources.jar",
-  sha256 = "57b0ee93eab8caa3cfc424aa24616462543bb2a7f13848cbb537c225314dffaf",
-  downloaded_file_path = "byte-buddy-agent-1.17.4-sources.jar"
-)
-
 http_file(
   name = "python-imports-ranking-model-coral-panda-republished-4_http",
   url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/ml/models/python-imports-ranking-model/coral-panda-republished-4/python-imports-ranking-model-coral-panda-republished-4.jar",
diff --git a/libraries/mockito/BUILD.bazel b/libraries/mockito/BUILD.bazel
new file mode 100644
index 000000000000..048472567c77
--- /dev/null
+++ b/libraries/mockito/BUILD.bazel
@@ -0,0 +1,14 @@
+### auto-generated section `build intellij.libraries.mockito` start
+load("@rules_jvm//:jvm.bzl", "jvm_library")
+
+jvm_library(
+  name = "mockito",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  exports = ["@lib//:mockito"],
+  runtime_deps = [
+    "@lib//:mockito",
+    "@lib//:byte-buddy",
+  ]
+)
+### auto-generated section `build intellij.libraries.mockito` end
\ No newline at end of file
diff --git a/libraries/mockito/intellij.libraries.mockito.iml b/libraries/mockito/intellij.libraries.mockito.iml
new file mode 100644
index 000000000000..60a49357a1ee
--- /dev/null
+++ b/libraries/mockito/intellij.libraries.mockito.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="mockito" level="project" />
+    <orderEntry type="library" name="byte-buddy" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/LibraryLicensesTester.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/LibraryLicensesTester.kt
index ee8c4e891b8f..738c54578137 100644
--- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/LibraryLicensesTester.kt
+++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/LibraryLicensesTester.kt
@@ -19,6 +19,7 @@ fun reportMissingLicenses(collector: SoftAssertions, project: JpsProject, licens
       !nonPublicModules.contains(it.name)
       && !it.name.contains("guiTests")
       && it.name != "intellij.platform.util.immutableKeyValueStore.benchmark"
+      && it.name != "intellij.libraries.mockito"
       && !it.name.contains("integrationTests", ignoreCase = true)
     }
     .forEach { module ->
diff --git a/platform/build-scripts/tests/BUILD.bazel b/platform/build-scripts/tests/BUILD.bazel
index fad1f66aa4e7..2730097f0cfe 100644
--- a/platform/build-scripts/tests/BUILD.bazel
+++ b/platform/build-scripts/tests/BUILD.bazel
@@ -39,7 +39,7 @@ jvm_library(
     "@lib//:hash4j",
     "@lib//:fastutil-min",
     "@lib//:maven-resolver-provider",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-kotlin",
     "//jps/model-serialization",
     "//jps/model-api:model",
diff --git a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
index fafa39f1174c..680eb1dfd5a2 100644
--- a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
+++ b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
@@ -32,7 +32,7 @@
     <orderEntry type="library" scope="TEST" name="hash4j" level="project" />
     <orderEntry type="library" scope="TEST" name="fastutil-min" level="project" />
     <orderEntry type="library" scope="TEST" name="maven-resolver-provider" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
diff --git a/platform/collaboration-tools/BUILD.bazel b/platform/collaboration-tools/BUILD.bazel
index 4fa254c4a75d..ced068ee95cd 100644
--- a/platform/collaboration-tools/BUILD.bazel
+++ b/platform/collaboration-tools/BUILD.bazel
@@ -103,7 +103,7 @@ jvm_library(
     "//platform/credential-store-impl:credentialStore-impl",
     "//platform/credential-store-impl:credentialStore-impl_test_lib",
     "//platform/dvcs-impl/shared",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:http-client",
     "@lib//:app-cash-turbine-jvm",
     "@lib//:assert_j",
diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
index a1b819d6530f..456d3ca5be0b 100644
--- a/platform/collaboration-tools/intellij.platform.collaborationTools.iml
+++ b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
@@ -49,7 +49,7 @@
     <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs.dvcs.impl.shared" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" name="http-client" level="project" />
     <orderEntry type="library" scope="TEST" name="app.cash.turbine.jvm" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
diff --git a/platform/core-nio-fs/BUILD.bazel b/platform/core-nio-fs/BUILD.bazel
index 4eeb8cff10e5..e1fa34beb48f 100644
--- a/platform/core-nio-fs/BUILD.bazel
+++ b/platform/core-nio-fs/BUILD.bazel
@@ -41,7 +41,7 @@ jvm_library(
     "@lib//:kotlin-reflect",
     "@lib//:kotlin-stdlib",
     "@lib//:kotlin-test-assertions-core-jvm",
-    "@lib//:mockito",
+    "//libraries/mockito",
   ]
 )
 ### auto-generated section `build intellij.platform.core.nio.fs.tests` end
diff --git a/platform/core-nio-fs/intellij.platform.core.nio.fs.tests.iml b/platform/core-nio-fs/intellij.platform.core.nio.fs.tests.iml
index a2e7c7c657f2..32026587b9da 100644
--- a/platform/core-nio-fs/intellij.platform.core.nio.fs.tests.iml
+++ b/platform/core-nio-fs/intellij.platform.core.nio.fs.tests.iml
@@ -15,6 +15,6 @@
     <orderEntry type="library" scope="TEST" name="kotlin-reflect" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/diff-impl/tests/BUILD.bazel b/platform/diff-impl/tests/BUILD.bazel
index 67641a214886..811cf55ebb07 100644
--- a/platform/diff-impl/tests/BUILD.bazel
+++ b/platform/diff-impl/tests/BUILD.bazel
@@ -30,7 +30,7 @@ jvm_library(
     "//platform/vcs-api/vcs-api-core:vcs-core",
     "//platform/vcs-api/vcs-api-core:vcs-core_test_lib",
     "//platform/diff-impl",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-ex:editor-ex",
     "//platform/core-impl",
diff --git a/platform/diff-impl/tests/intellij.platform.diff.tests.iml b/platform/diff-impl/tests/intellij.platform.diff.tests.iml
index 56e12239dd2c..10aae44025c2 100644
--- a/platform/diff-impl/tests/intellij.platform.diff.tests.iml
+++ b/platform/diff-impl/tests/intellij.platform.diff.tests.iml
@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.diff" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.vcs.core" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
diff --git a/platform/dvcs-impl/BUILD.bazel b/platform/dvcs-impl/BUILD.bazel
index 099b0fac298f..eb9abe2c5c57 100644
--- a/platform/dvcs-impl/BUILD.bazel
+++ b/platform/dvcs-impl/BUILD.bazel
@@ -78,7 +78,7 @@ jvm_library(
     "//platform/dvcs-api:vcs-dvcs",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/vcs-tests:vcs-testFramework",
     "@lib//:miglayout-swing",
     "@lib//:stream_ex",
diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
index c73bbe97335e..ab06ab3dea57 100644
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -29,7 +29,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.vcs.testFramework" scope="TEST" />
     <orderEntry type="library" name="miglayout-swing" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
diff --git a/platform/external-system-impl/BUILD.bazel b/platform/external-system-impl/BUILD.bazel
index 86c042b90808..0aabf51b3dc2 100644
--- a/platform/external-system-impl/BUILD.bazel
+++ b/platform/external-system-impl/BUILD.bazel
@@ -100,7 +100,7 @@ jvm_library(
     "//java/openapi:java",
     "@lib//:junit4",
     "@lib//:assert_j",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-kotlin",
     "//platform/lang-impl:lang-tests_test_lib",
     "@lib//:kotlinx-coroutines-core",
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
index d5c699dabc5d..acc0881878d7 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.tests" exported="" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
diff --git a/platform/settings-sync-core/BUILD.bazel b/platform/settings-sync-core/BUILD.bazel
index 74a9de136913..d74e6f0092e7 100644
--- a/platform/settings-sync-core/BUILD.bazel
+++ b/platform/settings-sync-core/BUILD.bazel
@@ -99,7 +99,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/observable",
     "//plugins/git4idea:vcs-git",
     "//plugins/git4idea:vcs-git_test_lib",
diff --git a/platform/settings-sync-core/intellij.settingsSync.core.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml
index d857f9e39406..821cc349c640 100644
--- a/platform/settings-sync-core/intellij.settingsSync.core.iml
+++ b/platform/settings-sync-core/intellij.settingsSync.core.iml
@@ -64,7 +64,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.vcs.git" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
diff --git a/platform/util/BUILD.bazel b/platform/util/BUILD.bazel
index d834f4f882a0..98df7908cab4 100644
--- a/platform/util/BUILD.bazel
+++ b/platform/util/BUILD.bazel
@@ -119,7 +119,7 @@ jvm_library(
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
     "//platform/util/coroutines",
     "@lib//:jetbrains-kotlinx-lincheck-jvm",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-kotlin",
     "@lib//:jimfs",
     "//platform/ijent/buildConstants",
diff --git a/platform/util/intellij.platform.util.tests.iml b/platform/util/intellij.platform.util.tests.iml
index 2f6caacad6a0..0b1538b8f7e4 100644
--- a/platform/util/intellij.platform.util.tests.iml
+++ b/platform/util/intellij.platform.util.tests.iml
@@ -47,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetbrains.kotlinx.lincheck.jvm" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="library" scope="TEST" name="jimfs" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ijent.community.buildConstants" scope="TEST" />
diff --git a/platform/vcs-log/impl/BUILD.bazel b/platform/vcs-log/impl/BUILD.bazel
index 89b6eb1503b3..e56e9e4b80e1 100644
--- a/platform/vcs-log/impl/BUILD.bazel
+++ b/platform/vcs-log/impl/BUILD.bazel
@@ -115,7 +115,7 @@ jvm_library(
     "//platform/util/coroutines",
     "//platform/util/storages",
     "//platform/vcs-impl/shared",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/bookmarks",
   ],
   runtime_deps = [":impl_resources"]
diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
index 8196cf275136..534239af371f 100644
--- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
+++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
@@ -54,7 +54,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.util.io.storages" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.shared" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.bookmarks" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/vcs-tests/BUILD.bazel b/platform/vcs-tests/BUILD.bazel
index 84b9d7fd9b1f..05d0b0e97647 100644
--- a/platform/vcs-tests/BUILD.bazel
+++ b/platform/vcs-tests/BUILD.bazel
@@ -61,7 +61,7 @@ jvm_library(
     "//platform/indexing-impl",
     "//platform/platform-api:ide",
     "//platform/diff-impl/tests:tests_test_lib",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/util:util-tests_test_lib",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
diff --git a/platform/vcs-tests/intellij.platform.vcs.tests.iml b/platform/vcs-tests/intellij.platform.vcs.tests.iml
index 7d2c532c6a37..8b0670052146 100644
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -27,7 +27,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.diff.tests" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
diff --git a/plugins/evaluation-plugin/BUILD.bazel b/plugins/evaluation-plugin/BUILD.bazel
index 216a3e0400d6..a10c1b785aab 100644
--- a/plugins/evaluation-plugin/BUILD.bazel
+++ b/plugins/evaluation-plugin/BUILD.bazel
@@ -59,7 +59,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/platform-impl:ide-impl",
     "//platform/platform-impl:ide-impl_test_lib",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:junit5",
     "@lib//:gson",
     "//plugins/evaluation-plugin/languages",
diff --git a/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml b/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml
index 1366af2666ea..2455dd069586 100644
--- a/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml
+++ b/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.evaluationPlugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="library" scope="TEST" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.evaluationPlugin.languages" scope="TEST" />
diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel
index bb4a6c7be58d..b47f5424db04 100644
--- a/plugins/git4idea/BUILD.bazel
+++ b/plugins/git4idea/BUILD.bazel
@@ -159,7 +159,7 @@ jvm_library(
     "//platform/dvcs-api:vcs-dvcs",
     "//platform/built-in-server:builtInServer-impl",
     "//platform/built-in-server-api:builtInServer",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:kotlin-test",
     "//platform/vcs-tests:vcs-tests_test_lib",
     "//platform/util",
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index 67f4d5a7ce56..ff0f1e5bb0c4 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -71,7 +71,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs.dvcs" exported="" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" />
diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel
index a11865ddfb9c..9b6c1641a47c 100644
--- a/plugins/gradle/BUILD.bazel
+++ b/plugins/gradle/BUILD.bazel
@@ -116,7 +116,7 @@ jvm_library(
     "@lib//:jmock",
     "@lib//:jmock-junit4",
     "@lib//:jmock-legacy",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-kotlin",
     "@lib//:junit4",
     "//plugins/gradle",
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
index 624d0d5d0d34..d5cd1cacf157 100644
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel
index c778ee411bf7..2164b2d8f844 100644
--- a/plugins/gradle/java/BUILD.bazel
+++ b/plugins/gradle/java/BUILD.bazel
@@ -130,7 +130,7 @@ jvm_library(
     "//platform/external-system-api/dependency-updater",
     "//java/debugger/impl",
     "//plugins/maven-server-api:maven-server",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-kotlin",
     "//java/execution/impl",
     "//plugins/groovy",
diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
index e72caa50be6d..b26cc2ccd88d 100644
--- a/plugins/gradle/java/intellij.gradle.java.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven.server" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
diff --git a/plugins/ide-features-trainer/BUILD.bazel b/plugins/ide-features-trainer/BUILD.bazel
index e396cc645317..52399af4964e 100644
--- a/plugins/ide-features-trainer/BUILD.bazel
+++ b/plugins/ide-features-trainer/BUILD.bazel
@@ -103,7 +103,7 @@ jvm_library(
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
     "@lib//:mockito-kotlin",
-    "@lib//:mockito",
+    "//libraries/mockito",
   ],
   runtime_deps = [":featuresTrainer_resources"]
 )
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index 884e5ebb649c..f4ebc7ef5abc 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -67,6 +67,6 @@
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/lombok/BUILD.bazel b/plugins/lombok/BUILD.bazel
index 6dcb7b41aafd..a75a8182b3f9 100644
--- a/plugins/lombok/BUILD.bazel
+++ b/plugins/lombok/BUILD.bazel
@@ -84,7 +84,7 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "//java/testFramework",
     "@lib//:junit4",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//java/java-impl-inspections:impl-inspections",
     "//java/java-impl-refactorings:impl-refactorings",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
diff --git a/plugins/lombok/intellij.lombok.iml b/plugins/lombok/intellij.lombok.iml
index bf4b1d004909..ade6eb8161c2 100644
--- a/plugins/lombok/intellij.lombok.iml
+++ b/plugins/lombok/intellij.lombok.iml
@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.impl.inspections" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel
index 8d6ea2363ab7..447c8322a812 100644
--- a/plugins/maven/src/test/BUILD.bazel
+++ b/plugins/maven/src/test/BUILD.bazel
@@ -55,7 +55,7 @@ jvm_library(
     "//platform/workspace/jps",
     "@lib//:guava",
     "//plugins/maven/artifact-resolver/common",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//plugins/maven/jps-plugin:jps",
     "//plugins/maven/jps-plugin:jps_test_lib",
     "//plugins/maven/maven3-server-common:server-m3-common",
diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml
index 2409d6357926..5f5b8895d400 100644
--- a/plugins/maven/src/test/intellij.maven.tests.iml
+++ b/plugins/maven/src/test/intellij.maven.tests.iml
@@ -40,7 +40,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.maven.artifactResolver.common" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven.jps" scope="TEST" />
     <orderEntry type="module" module-name="intellij.maven.server.m3.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
diff --git a/plugins/settings-sync/jba/BUILD.bazel b/plugins/settings-sync/jba/BUILD.bazel
index d91ab9221731..32a7d7bb4d74 100644
--- a/plugins/settings-sync/jba/BUILD.bazel
+++ b/plugins/settings-sync/jba/BUILD.bazel
@@ -55,7 +55,7 @@ jvm_library(
     "//platform/testFramework:testFramework_test_lib",
     "//plugins/performanceTesting/core:performanceTesting",
     "//plugins/performanceTesting/core:performanceTesting_test_lib",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/util/progress",
     "@lib//:kotlinx-coroutines-test",
   ],
diff --git a/plugins/settings-sync/jba/intellij.settingsSync.iml b/plugins/settings-sync/jba/intellij.settingsSync.iml
index f95ca53790f2..8773ace4d5b2 100644
--- a/plugins/settings-sync/jba/intellij.settingsSync.iml
+++ b/plugins/settings-sync/jba/intellij.settingsSync.iml
@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.performanceTesting" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
   </component>
diff --git a/plugins/stats-collector/BUILD.bazel b/plugins/stats-collector/BUILD.bazel
index 32cad1e4ca6f..c8373d351179 100644
--- a/plugins/stats-collector/BUILD.bazel
+++ b/plugins/stats-collector/BUILD.bazel
@@ -47,7 +47,7 @@ jvm_library(
   srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True),
   deps = [
     "//java/testFramework",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:assert_j",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
diff --git a/plugins/stats-collector/intellij.statsCollector.tests.iml b/plugins/stats-collector/intellij.statsCollector.tests.iml
index 71b2b4320ece..4c637efc23cf 100644
--- a/plugins/stats-collector/intellij.statsCollector.tests.iml
+++ b/plugins/stats-collector/intellij.statsCollector.tests.iml
@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index 526bf9dc562f..f2f4c72234a3 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -460,7 +460,7 @@ jvm_library(
     "//platform/observable",
     "//platform/usageView",
     "@lib//:assert_j",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//java/testFramework",
     "@lib//:easymock",
     "@lib//:objenesis",
diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml
index db7d9932f747..8ae895da8071 100644
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -38,7 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="easymock" level="project" />
     <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
diff --git a/python/junit5Tests-framework/BUILD.bazel b/python/junit5Tests-framework/BUILD.bazel
index 62207cbc7318..26fd1bc6475c 100644
--- a/python/junit5Tests-framework/BUILD.bazel
+++ b/python/junit5Tests-framework/BUILD.bazel
@@ -53,6 +53,7 @@ jvm_library(
     "//python/python-sdk:sdk_test_lib",
     "@lib//:python-community-junit5_tests-framework-uk-webcompere-system-stubs-jupiter",
     "//platform/util/coroutines",
+    "@lib//:byte-buddy",
   ],
   runtime_deps = [
     ":community-junit5Tests-framework_test_resources",
diff --git a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
index 2eb6a862b298..02e89973831d 100644
--- a/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
+++ b/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml
@@ -46,34 +46,24 @@
             <artifact url="file://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8.jar">
               <sha256sum>9c27322cfc7043c75384ad444007b0880ca18fe7231d69bfa69616bc773cafe1</sha256sum>
             </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4.jar">
-              <sha256sum>74768731219a5b2e0cc9d2b1c9e2092e0622242e41b1925a6ba7346e160731bc</sha256sum>
-            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4.jar">
-              <sha256sum>e1dae7efc5562c29ad3b625b90e6864208de69bad5632c3f93a547f17622ac51</sha256sum>
-            </artifact>
           </verification>
+          <exclude>
+            <dependency maven-id="net.bytebuddy:byte-buddy" />
+            <dependency maven-id="net.bytebuddy:byte-buddy-agent" />
+          </exclude>
         </properties>
         <CLASSES>
           <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4.jar!/" />
         </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4-javadoc.jar!/" />
-        </JAVADOC>
+        <JAVADOC />
         <SOURCES>
           <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-jupiter/2.1.8/system-stubs-jupiter-2.1.8-sources.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/uk/org/webcompere/system-stubs-core/2.1.8/system-stubs-core-2.1.8-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.17.4/byte-buddy-1.17.4-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.17.4/byte-buddy-agent-1.17.4-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="byte-buddy" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel
index ced70887187c..118b24de6a4f 100644
--- a/python/python-terminal/BUILD.bazel
+++ b/python/python-terminal/BUILD.bazel
@@ -32,7 +32,7 @@ jvm_library(
   deps = [
     "//python:python-community-impl",
     "//plugins/terminal",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "//platform/core-api:core",
     "//platform/projectModel-api:projectModel",
     "@lib//:kotlin-stdlib",
diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/python-terminal/intellij.python.terminal.iml
index 83e26987960c..effcad1853ac 100644
--- a/python/python-terminal/intellij.python.terminal.iml
+++ b/python/python-terminal/intellij.python.terminal.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.python.community.impl" />
     <orderEntry type="module" module-name="intellij.terminal" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
diff --git a/tools/intellij.tools.ide.metrics.collector/BUILD.bazel b/tools/intellij.tools.ide.metrics.collector/BUILD.bazel
index 117f1e5121f4..177f74e33856 100644
--- a/tools/intellij.tools.ide.metrics.collector/BUILD.bazel
+++ b/tools/intellij.tools.ide.metrics.collector/BUILD.bazel
@@ -52,7 +52,7 @@ jvm_library(
     "@lib//:jackson-module-kotlin",
     "@lib//:kotlin-test-assertions-core-jvm",
     "@lib//:junit5",
-    "@lib//:mockito",
+    "//libraries/mockito",
     "@lib//:mockito-junit-jupiter",
     "//platform/diagnostic/telemetry",
     "//platform/diagnostic/telemetry:telemetry_test_lib",
diff --git a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
index 7ce311dd1663..323e77eddd86 100644
--- a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
+++ b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
@@ -39,7 +39,7 @@
     <orderEntry type="library" name="jackson-module-kotlin" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test-assertions-core-jvm" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-junit-jupiter" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.exporters" />