diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 10495be31ef..9d9f0fe34ac 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -28,6 +28,7 @@
               <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
               <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
             </element>
+            <element id="module-output" name="eval4j" />
           </element>
           <element id="library" level="project" name="javax.inject" />
           <element id="directory" name="jps">
diff --git a/.idea/libraries/junit_4_11.xml b/.idea/libraries/junit_4_11.xml
new file mode 100644
index 00000000000..6456c6a9f80
--- /dev/null
+++ b/.idea/libraries/junit_4_11.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="junit-4.11">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.11.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-1.3-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/junit-4.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5d7708e9726..830d9ea81f9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -16,6 +16,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" filepath="$PROJECT_DIR$/core/descriptor.loader.java/descriptor.loader.java.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
diff --git a/eval4j/eval4j.iml b/eval4j/eval4j.iml
index cc20df994ed..61d8dd7ef7e 100644
--- a/eval4j/eval4j.iml
+++ b/eval4j/eval4j.iml
@@ -4,13 +4,13 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="org.ow2.asm:asm-debug-all:4.1" level="project" />
-    <orderEntry type="library" name="junit:junit:4.11" level="project" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="library" scope="TEST" name="junit-4.11" level="project" />
   </component>
 </module>
 
diff --git a/idea/idea.iml b/idea/idea.iml
index a8709e3d8e9..03e786c0560 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -40,6 +40,7 @@
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="eval4j" />
   </component>
 </module>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index b446cc9ffce..12938e29c5e 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -170,6 +170,10 @@
              dest="dependencies/asm5-src.zip" />
         <!-- <get-asm-sources-and-rename-packages asm.version="5.0.1"/> -->
 
+        <!-- Junit Sources -->
+        <get-maven-library prefix="junit" lib="junit" version="4.11" bin="false"/>
+        <get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" bin="false"/>
+
         <!-- Protocol Buffers -->
         <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="2.5.0" bin="false"/>