diff --git a/.idea/libraries/JUnit4.xml b/.idea/libraries/JUnit4.xml
index f786872105e0..797c1ca96c1d 100644
--- a/.idea/libraries/JUnit4.xml
+++ b/.idea/libraries/JUnit4.xml
@@ -1,16 +1,16 @@
 <component name="libraryTable">
-  <library name="JUnit4">
+  <library name="JUnit4" type="repository">
+    <properties maven-id="junit:junit:4.12"/>
     <ANNOTATIONS>
       <root url="file://$PROJECT_DIR$/lib/annotations/junit4"/>
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/hamcrest-core-1.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-4.12.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/"/>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/"/>
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC/>
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/hamcrest-1.3-src.zip!/hamcrest-core/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/junit-4.12-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/"/>
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 070f8ce2054b..f89aa369bcc2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # IntelliJ IDEA Community Edition
 ### Building and Running from the IDE
-To develop IntelliJ IDEA, you can use either IntelliJ IDEA Community Edition or IntelliJ IDEA Ultimate not older than 2017.1. To build and run the code:
+To develop IntelliJ IDEA, you can use either IntelliJ IDEA Community Edition or IntelliJ IDEA Ultimate not older than 2017.2.1. To build and run the code:
 * Run **getPlugins.sh** / **getPlugins.bat** from the project root directory to check out additional modules.
 * If this git repository is not on 'master' branch you need to checkout the same branches/tags in android and android/tools-base git repositories.
 * Open the project.
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e3dd3..000000000000
Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
deleted file mode 100644
index 3a7fc266c3e3..000000000000
Binary files a/lib/junit-4.12.jar and /dev/null differ
diff --git a/lib/src/junit-4.12-sources.jar b/lib/src/junit-4.12-sources.jar
deleted file mode 100644
index 884f92f595c9..000000000000
Binary files a/lib/src/junit-4.12-sources.jar and /dev/null differ