diff --git a/.idea/libraries/JaCoCo.xml b/.idea/libraries/JaCoCo.xml
deleted file mode 100644
index cbce4794ace4..000000000000
--- a/.idea/libraries/JaCoCo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="JaCoCo">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacocoant.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacocoagent.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/org.jacoco.ant/src" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/org.jacoco.core/src" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/org.jacoco.agent/src" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/org.jacoco.report/src" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/jacoco-maven-plugin/src" />
-      <root url="jar://$PROJECT_DIR$/plugins/coverage/lib/jacoco_src.zip!/v0.5.6/org.jacoco.agent.rt/src" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index a941ff0005f3..bd4a0d11ba9b 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -9,6 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.java.coverage" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.ant" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.boot" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.bootstrap" scope="RUNTIME" />
@@ -117,7 +118,6 @@
     <orderEntry type="module" module-name="intellij.platform.diff.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.updater" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.coverage" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.scriptDebugger.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.terminal" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.images.build" scope="TEST" />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index c6185027f0b4..8ada442a8fbe 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -231,7 +231,6 @@ final class CommunityRepositoryModules {
     },
     plugin("intellij.java.coverage") {
       withModule("intellij.java.coverage.rt")
-      withProjectLibrary("JaCoCo") //todo[nik] convert to module library
     },
     plugin("intellij.java.decompiler") {
       directoryName = "java-decompiler"
diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml
index b8d8716337ea..ab4c9a104bcb 100644
--- a/plugins/coverage/intellij.java.coverage.iml
+++ b/plugins/coverage/intellij.java.coverage.iml
@@ -9,6 +9,32 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="JaCoCo" type="repository">
+        <properties maven-id="org.jacoco:org.jacoco.ant:0.8.6" />
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.6/org.jacoco.ant-0.8.6.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.6/org.jacoco.core-0.8.6.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/8.0.1/asm-8.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.6/org.jacoco.report-0.8.6.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.6/org.jacoco.agent-0.8.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0.8.6/org.jacoco.ant-0.8.6-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0.8.6/org.jacoco.core-0.8.6-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/8.0.1/asm-8.0.1-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0.8.6/org.jacoco.report-0.8.6-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.6/org.jacoco.agent-0.8.6-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="intellij.platform.coverage" exported="" />
     <orderEntry type="module" module-name="intellij.java.execution" exported="" />
     <orderEntry type="module" module-name="intellij.java" exported="" />
@@ -28,7 +54,6 @@
     <orderEntry type="module" module-name="intellij.testng.rt" />
     <orderEntry type="module" module-name="intellij.junit.rt" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
-    <orderEntry type="library" name="JaCoCo" level="project" />
     <orderEntry type="module" module-name="intellij.java.coverage.rt" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/plugins/coverage/lib/jacoco_src.zip b/plugins/coverage/lib/jacoco_src.zip
deleted file mode 100644
index 7615d40086f2..000000000000
Binary files a/plugins/coverage/lib/jacoco_src.zip and /dev/null differ
diff --git a/plugins/coverage/lib/jacocoagent.jar b/plugins/coverage/lib/jacocoagent.jar
deleted file mode 100644
index 3d840bc5466d..000000000000
Binary files a/plugins/coverage/lib/jacocoagent.jar and /dev/null differ
diff --git a/plugins/coverage/lib/jacocoant.jar b/plugins/coverage/lib/jacocoant.jar
deleted file mode 100644
index 6b92fceeb50a..000000000000
Binary files a/plugins/coverage/lib/jacocoant.jar and /dev/null differ
diff --git a/plugins/coverage/src/com/intellij/coverage/JaCoCoCoverageRunner.java b/plugins/coverage/src/com/intellij/coverage/JaCoCoCoverageRunner.java
index ab51cc0cad7e..3b8baba2c99b 100644
--- a/plugins/coverage/src/com/intellij/coverage/JaCoCoCoverageRunner.java
+++ b/plugins/coverage/src/com/intellij/coverage/JaCoCoCoverageRunner.java
@@ -18,8 +18,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.rt.coverage.data.*;
-import com.intellij.util.PathUtil;
-import org.jacoco.agent.rt.RT;
+import org.jacoco.agent.AgentJar;
 import org.jacoco.core.analysis.*;
 import org.jacoco.core.tools.ExecFileLoader;
 import org.jacoco.report.DirectorySourceFileLocator;
@@ -194,7 +193,15 @@ public final class JaCoCoCoverageRunner extends JavaCoverageRunner {
                                      boolean isSampling,
                                      String sourceMapPath) {
     @NonNls StringBuilder argument = new StringBuilder("-javaagent:");
-    final String agentPath = handleSpacesInAgentPath(PathUtil.getJarPathForClass(RT.class));
+
+    String path;
+    try {
+      path = AgentJar.extractToTempLocation().getAbsolutePath();
+    }
+    catch (IOException e) {
+      return;
+    }
+    final String agentPath = handleSpacesInAgentPath(path);
     if (agentPath == null) return;
     argument.append(agentPath);
     argument.append("=");
diff --git a/plugins/coverage/testSrc/com/intellij/coverage/JaCoCoRunnerTest.java b/plugins/coverage/testSrc/com/intellij/coverage/JaCoCoRunnerTest.java
index f211cf7faba1..2e0a776ab993 100644
--- a/plugins/coverage/testSrc/com/intellij/coverage/JaCoCoRunnerTest.java
+++ b/plugins/coverage/testSrc/com/intellij/coverage/JaCoCoRunnerTest.java
@@ -12,6 +12,6 @@ public class JaCoCoRunnerTest {
   public void excludeIncludePatterns() {
     SimpleJavaParameters javaParameters = new SimpleJavaParameters();
     new JaCoCoCoverageRunner().appendCoverageArgument("a", null, new String[] {"org.*", "com.*"}, javaParameters, true, true, null);
-    Assert.assertTrue(Pattern.compile("-javaagent:(.*)jacocoagent.jar=destfile=a,append=false,excludes=org\\.\\*:com\\.\\*").matcher(javaParameters.getVMParametersList().getParametersString()).matches());
+    Assert.assertTrue(Pattern.compile("-javaagent:(.*)jacocoagent(.*).jar=destfile=a,append=false,excludes=org\\.\\*:com\\.\\*").matcher(javaParameters.getVMParametersList().getParametersString()).matches());
   }
 }