diff --git a/.idea/libraries/Rhino.xml b/.idea/libraries/Rhino.xml
new file mode 100644
index 00000000000..45383c9bac2
--- /dev/null
+++ b/.idea/libraries/Rhino.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="Rhino">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/rhino-1.7.6-sources.jar!/rhino1.7.6/src" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/js_test_libs.xml b/.idea/libraries/js_test_libs.xml
deleted file mode 100644
index 5d1eb24a904..00000000000
--- a/.idea/libraries/js_test_libs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="libraryTable">
-  <library name="js-test-libs">
-    <ANNOTATIONS>
-      <root url="file://$PROJECT_DIR$/annotations" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/js/js.tests/testLib/rhino1.7.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/js/js.tests/testLib/rhino1.7.6-sources.zip!/rhino1.7.6/javadoc" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/js/js.tests/testLib/rhino1.7.6-sources.zip!/rhino1.7.6/src" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index 5c6fdb38ccd..fbae8495c0f 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="js-test-libs" level="project" />
+    <orderEntry type="library" name="Rhino" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="frontend" />
diff --git a/js/js.tests/testLib/rhino1.7.6-sources.zip b/js/js.tests/testLib/rhino1.7.6-sources.zip
deleted file mode 100644
index 9131115d011..00000000000
Binary files a/js/js.tests/testLib/rhino1.7.6-sources.zip and /dev/null differ
diff --git a/js/js.tests/testLib/rhino1.7.6.jar b/js/js.tests/testLib/rhino1.7.6.jar
deleted file mode 100644
index e8246130777..00000000000
Binary files a/js/js.tests/testLib/rhino1.7.6.jar and /dev/null differ
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 3e59df30540..19bbe88a836 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -198,6 +198,9 @@
         <!-- CLI Parser -->
         <get-maven-library prefix="com/github/spullara/cli-parser" lib="cli-parser" version="1.1.1"/>
 
+        <!-- Rhino -->
+        <get-maven-library prefix="org/mozilla" lib="rhino" version="1.7.6"/>
+
         <!-- Closure Compiler -->
         <!-- A download url taken from http://code.google.com/p/closure-compiler/wiki/BinaryDownloads -->
         <get src="http://dl.google.com/closure-compiler/compiler-20131014.zip"