diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index 1296bfef858f..e67b253adb36 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -45,6 +45,6 @@
     <orderEntry type="module" module-name="RegExpSupport" scope="TEST" />
     <orderEntry type="module" module-name="spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="util-tests" scope="TEST" />
-    <orderEntry type="library" name="Mocks" level="project" />
+    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/lang-impl/lang-tests.iml b/platform/lang-impl/lang-tests.iml
index 5ac8f562afc7..34556a95af19 100644
--- a/platform/lang-impl/lang-tests.iml
+++ b/platform/lang-impl/lang-tests.iml
@@ -30,6 +30,6 @@
     <orderEntry type="module" module-name="structure-view-impl" exported="" />
     <orderEntry type="library" name="commons-logging" level="project" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="library" name="Mocks" level="project" />
+    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/smRunner/smRunner.iml b/platform/smRunner/smRunner.iml
index d9cbbf783553..c36eec744bd7 100644
--- a/platform/smRunner/smRunner.iml
+++ b/platform/smRunner/smRunner.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="library" exported="" name="tcServiceMessages" level="project" />
     <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="library" name="Mocks" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
index be28b3694657..457f958d1de5 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
@@ -19,7 +19,7 @@ import com.intellij.execution.testframework.Filter;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.sm.runner.ui.MockPrinter;
 import com.intellij.psi.search.GlobalSearchScope;
-import org.easymock.EasyMock;
+import org.easymock.classextension.EasyMock;
 
 import static com.intellij.execution.testframework.sm.runner.states.TestStateInfo.Magnitude;
 
diff --git a/platform/testFramework/testFramework.iml b/platform/testFramework/testFramework.iml
index 3afb2a73b99d..da612ae434bc 100644
--- a/platform/testFramework/testFramework.iml
+++ b/platform/testFramework/testFramework.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="lvcs-impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="tests_bootstrap" />
     <orderEntry type="module" module-name="resources-en" scope="RUNTIME" />
+    <orderEntry type="library" exported="" scope="TEST" name="Mocks" level="project" />
     <orderEntry type="module" module-name="java-runtime" exported="" />
     <orderEntry type="library" exported="" name="Groovy" level="project" />
     <orderEntry type="module" module-name="platform-resources" exported="" scope="RUNTIME" />
diff --git a/python/testSrc/python-community-tests.iml b/python/testSrc/python-community-tests.iml
index f978d37c6946..76f778bf6b5c 100644
--- a/python/testSrc/python-community-tests.iml
+++ b/python/testSrc/python-community-tests.iml
@@ -20,6 +20,6 @@
     <orderEntry type="module" module-name="python-pydev" scope="TEST" />
     <orderEntry type="module" module-name="smRunner" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
-    <orderEntry type="library" name="Mocks" level="project" />
+    <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
   </component>
 </module>
\ No newline at end of file