diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/core.xml b/compiler/cli/cli-common/resources/META-INF/extensions/core.xml
new file mode 100644
index 00000000000..da66522edb3
--- /dev/null
+++ b/compiler/cli/cli-common/resources/META-INF/extensions/core.xml
@@ -0,0 +1,10 @@
+<idea-plugin>
+    <id>org.jetbrains.kotlin</id>
+    <version>1.2</version>
+
+    <extensionPoints>
+        <extensionPoint qualifiedName="com.intellij.psi.classFileDecompiler"
+                        interface="com.intellij.psi.compiled.ClassFileDecompilers$Decompiler"
+                        dynamic="true"/>
+    </extensionPoints>
+</idea-plugin>
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java
index 26562e4a6be..447e2acd62e 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java
@@ -40,7 +40,6 @@ public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnviron
         registerApplicationExtensionPoint(JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider.class);
 
         registerApplicationExtensionPoint(ContainerProvider.EP_NAME, ContainerProvider.class);
-        registerApplicationExtensionPoint(ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler.class);
 
         registerApplicationExtensionPoint(MetaLanguage.EP_NAME, MetaLanguage.class);
 
@@ -52,4 +51,4 @@ public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnviron
     protected VirtualFileSystem createJrtFileSystem() {
         return new CoreJrtFileSystem();
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index c9c2c34e730..5c1cda1d7cc 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -509,6 +509,7 @@ class KotlinCoreEnvironment private constructor(
             val applicationEnvironment = KotlinCoreApplicationEnvironment.create(parentDisposable, unitTestMode)
 
             registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/compiler.xml")
+            registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/core.xml")
 
             registerApplicationServicesForCLI(applicationEnvironment)
             registerApplicationServices(applicationEnvironment)
@@ -692,4 +693,4 @@ class KotlinCoreEnvironment private constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
index 99db44b9178..af956918e57 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
@@ -50,7 +50,7 @@ public class JUnit3RunnerWithInnersForJPS extends Runner implements Filterable,
     public JUnit3RunnerWithInnersForJPS(Class<?> klass) {
         this.klass = klass;
         requestedRunners.add(klass);
-        ensureCompilerXmlExists();
+        ensureCompilerExtensionFilesExists();
     }
 
     @Override
@@ -86,14 +86,19 @@ public class JUnit3RunnerWithInnersForJPS extends Runner implements Filterable,
      * compiler.xml needs to be in both compiler & ide module for tests execution.
      * To avoid file duplication copy it to the out dir idea module before test execution.
      */
-    private static void ensureCompilerXmlExists() {
-        String compilerXmlSourcePath = "compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml";
+    private static void ensureCompilerExtensionFilesExists() {
+        copyCompilerResourceFile("compiler.xml");
+        copyCompilerResourceFile("core.xml");
+    }
+
+    private static void copyCompilerResourceFile(String fileName) {
+        String compilerXmlSourcePath = "compiler/cli/cli-common/resources/META-INF/extensions/" + fileName;
 
         String jpsTargetDirectory = "out/production/kotlin.idea.main";
         String pillTargetDirectory = "out/production/idea.main";
 
         String baseDir = Files.exists(Paths.get(jpsTargetDirectory)) ? jpsTargetDirectory : pillTargetDirectory;
-        String compilerXmlTargetPath = baseDir + "/META-INF/extensions/compiler.xml";
+        String compilerXmlTargetPath = baseDir + "/META-INF/extensions/" + fileName;
 
         try {
             Path targetPath = Paths.get(compilerXmlTargetPath);
@@ -176,4 +181,4 @@ public class JUnit3RunnerWithInnersForJPS extends Runner implements Filterable,
 
         return false;
     }
-}
\ No newline at end of file
+}