diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml
index 26f37fe1bc74..d6fa72ad2a61 100644
--- a/platform/lang-api/intellij.platform.lang.iml
+++ b/platform/lang-api/intellij.platform.lang.iml
@@ -21,7 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
diff --git a/python/python-exec-service/BUILD.bazel b/python/python-exec-service/BUILD.bazel
index ce800a9d800a..13dfa6a8e833 100644
--- a/python/python-exec-service/BUILD.bazel
+++ b/python/python-exec-service/BUILD.bazel
@@ -63,7 +63,7 @@ jvm_library(
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
     "@lib//:junit5",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
     "@lib//:junit5Params",
     "//platform/core-api:core",
     "//platform/eel",
diff --git a/python/python-exec-service/intellij.python.community.execService.iml b/python/python-exec-service/intellij.python.community.execService.iml
index 65ad486edb68..95730dc2c121 100644
--- a/python/python-exec-service/intellij.python.community.execService.iml
+++ b/python/python-exec-service/intellij.python.community.execService.iml
@@ -39,7 +39,7 @@
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.eel" />
diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel
index 09556a279ee6..479fc0699a56 100644
--- a/python/python-terminal/BUILD.bazel
+++ b/python/python-terminal/BUILD.bazel
@@ -54,7 +54,7 @@ jvm_library(
     "//platform/testFramework/junit5:junit5_test_lib",
     "//python/testFramework",
     "//platform/eel-provider",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
     "//python/setup-test-environment:community-testFramework-testEnv",
     "//python/python-venv:community-impl-venv",
     "//python/python-venv:community-impl-venv_test_lib",
diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/python-terminal/intellij.python.terminal.iml
index 36f87922f88f..84e2eebef262 100644
--- a/python/python-terminal/intellij.python.terminal.iml
+++ b/python/python-terminal/intellij.python.terminal.iml
@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.testFramework.testEnv" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework.conda" scope="TEST" />
diff --git a/python/services/internal-impl/BUILD.bazel b/python/services/internal-impl/BUILD.bazel
index ddf6a3e91bc4..0befab1b79c0 100644
--- a/python/services/internal-impl/BUILD.bazel
+++ b/python/services/internal-impl/BUILD.bazel
@@ -50,7 +50,7 @@ jvm_library(
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
     "@lib//:junit5",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
     "//libraries/kotlinx/coroutines/core",
     "//python/python-sdk:sdk",
     "//python/python-sdk:sdk_test_lib",
diff --git a/python/services/internal-impl/intellij.python.community.services.internal.impl.iml b/python/services/internal-impl/intellij.python.community.services.internal.impl.iml
index 5435c3fd6ed8..b7e95ffdeed8 100644
--- a/python/services/internal-impl/intellij.python.community.services.internal.impl.iml
+++ b/python/services/internal-impl/intellij.python.community.services.internal.impl.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.python.community" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.python.sdk" />
     <orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework" scope="TEST" />
diff --git a/python/services/shared/BUILD.bazel b/python/services/shared/BUILD.bazel
index 2927935269f0..a5875000ffa7 100644
--- a/python/services/shared/BUILD.bazel
+++ b/python/services/shared/BUILD.bazel
@@ -46,7 +46,7 @@ jvm_library(
     "//libraries/kotlinx/coroutines/core",
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
     "//python/python-exec-service/execService.python",
     "//python/python-exec-service/execService.python:execService.python_test_lib",
     "//platform/diagnostic",
diff --git a/python/services/shared/intellij.python.community.services.shared.iml b/python/services/shared/intellij.python.community.services.shared.iml
index 50213c20815c..3970e94d0410 100644
--- a/python/services/shared/intellij.python.community.services.shared.iml
+++ b/python/services/shared/intellij.python.community.services.shared.iml
@@ -17,7 +17,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.execService.python" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
     <orderEntry type="module" module-name="intellij.platform.util" />
diff --git a/python/services/system-python/BUILD.bazel b/python/services/system-python/BUILD.bazel
index 59e3316e389f..4b4677258872 100644
--- a/python/services/system-python/BUILD.bazel
+++ b/python/services/system-python/BUILD.bazel
@@ -62,7 +62,7 @@ jvm_library(
     "@lib//:junit5",
     "//platform/projectModel-api:projectModel",
     "//python/testFramework",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
     "//python/services/shared",
     "//python/services/shared:shared_test_lib",
     "//python/services/internal-impl:python-community-services-internal-impl",
diff --git a/python/services/system-python/intellij.python.community.services.systemPython.iml b/python/services/system-python/intellij.python.community.services.systemPython.iml
index edbeb6b9e1ae..78bbd98ac8c7 100644
--- a/python/services/system-python/intellij.python.community.services.systemPython.iml
+++ b/python/services/system-python/intellij.python.community.services.systemPython.iml
@@ -23,7 +23,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.python.community.testFramework" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.services.shared" exported="" />
     <orderEntry type="module" module-name="intellij.python.community.services.internal.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
diff --git a/wintools/BUILD.bazel b/wintools/BUILD.bazel
index fd71698b42cf..00549b89aac6 100644
--- a/wintools/BUILD.bazel
+++ b/wintools/BUILD.bazel
@@ -30,7 +30,7 @@ jvm_library(
     "//platform/util",
     "@lib//:jna",
     "@lib//:junit5",
-    "@lib//:hamcrest",
+    "//libraries/hamcrest",
   ]
 )
 ### auto-generated section `build intellij.community.wintools` end
diff --git a/wintools/intellij.community.wintools.iml b/wintools/intellij.community.wintools.iml
index dcb408cbf770..987abf2fbf67 100644
--- a/wintools/intellij.community.wintools.iml
+++ b/wintools/intellij.community.wintools.iml
@@ -13,6 +13,6 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
   </component>
 </module>
\ No newline at end of file