diff --git a/.idea/libraries/jmock.xml b/.idea/libraries/jmock.xml
index bed87500463f..5491371f168b 100644
--- a/.idea/libraries/jmock.xml
+++ b/.idea/libraries/jmock.xml
@@ -1,15 +1,10 @@
 <component name="libraryTable">
-  <library name="jmock">
+  <library name="jmock" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jmock:jmock:2.5.1" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-junit4-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-legacy-2.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.5.1/jmock-2.5.1.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-junit4-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmock-legacy-2.5.1.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/jmock_junit4.xml b/.idea/libraries/jmock_junit4.xml
new file mode 100644
index 000000000000..62c470d708dc
--- /dev/null
+++ b/.idea/libraries/jmock_junit4.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="jmock.junit4" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jmock:jmock-junit4:2.5.1" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jmock_legacy.xml b/.idea/libraries/jmock_legacy.xml
new file mode 100644
index 000000000000..4dab1fd7d09f
--- /dev/null
+++ b/.idea/libraries/jmock_legacy.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="jmock.legacy" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jmock:jmock-legacy:2.5.1" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/lib/dev/jmock-2.5.1.jar b/lib/dev/jmock-2.5.1.jar
deleted file mode 100644
index 4415dfbc94f8..000000000000
Binary files a/lib/dev/jmock-2.5.1.jar and /dev/null differ
diff --git a/lib/dev/jmock-junit4-2.5.1.jar b/lib/dev/jmock-junit4-2.5.1.jar
deleted file mode 100644
index fb3697af4bfa..000000000000
Binary files a/lib/dev/jmock-junit4-2.5.1.jar and /dev/null differ
diff --git a/lib/dev/jmock-legacy-2.5.1.jar b/lib/dev/jmock-legacy-2.5.1.jar
deleted file mode 100644
index c26cc0d25483..000000000000
Binary files a/lib/dev/jmock-legacy-2.5.1.jar and /dev/null differ
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index ed74e999cba8..92aeae750031 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -28,6 +28,8 @@
     <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
+    <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
+    <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
     <orderEntry type="library" scope="TEST" name="flexmark" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" name="jackson" level="project" />
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 6b82fd39a399..d44e969ca10b 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -11,8 +11,8 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
-    <orderEntry type="library" scope="TEST" name="easymock" level="project" />
-    <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
+    <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspaceModel.storage" />
@@ -30,6 +30,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="gson" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="library" scope="TEST" name="easymock" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
@@ -70,5 +71,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="module" module-name="intellij.junit.rt" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Objenesis" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
index ad5887aa7c01..75d6cff3a08d 100644
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -11,6 +11,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <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="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />