diff --git a/plugins/junit/junit.iml b/plugins/junit/junit.iml
index 449a28e5be17..d02be10b8110 100644
--- a/plugins/junit/junit.iml
+++ b/plugins/junit/junit.iml
@@ -23,6 +23,7 @@
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="debugger-impl" />
     <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="external-system-api" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index 2da170617857..3bb7ac4ec9ba 100644
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -42,6 +42,7 @@
     <testFramework implementation="com.intellij.execution.junit.JUnit4Framework" id="junit4"/>
     <configurationType implementation="com.intellij.execution.junit.JUnitConfigurationType"/>
     <library.dependencyScopeSuggester implementation="com.intellij.execution.junit.JUnitDependencyScopeSuggester"/>
+    <runConfigurationHandlerExtension implementation="com.intellij.execution.junit.JUnitRunConfigHandler"/>
 
     <stacktrace.fold substring="at org.junit.internal.runners."/>
     <stacktrace.fold substring="at org.junit.runners."/>
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitRunConfigHandler.kt b/plugins/junit/src/com/intellij/execution/junit/JUnitRunConfigHandler.kt
new file mode 100644
index 000000000000..1df21952f02f
--- /dev/null
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitRunConfigHandler.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.junit
+
+import com.intellij.execution.RunManager
+import com.intellij.execution.configurations.ConfigurationTypeUtil
+import com.intellij.openapi.externalSystem.service.project.manage.RunConfigHandlerExtension
+import com.intellij.openapi.module.Module
+import com.intellij.rt.execution.junit.RepeatCount
+import java.util.*
+
+/**
+ * Created by Nikita.Skvortsov
+ * date: 11.09.2017.
+ */
+class JUnitRunConfigHandler: RunConfigHandlerExtension {
+  override fun canHandle(typeName: String): Boolean = "junit" == typeName
+
+  override fun process(module: Module, name: String, cfg: MutableMap<String, *>) {
+    val cfgType = ConfigurationTypeUtil.findConfigurationType<JUnitConfigurationType>(JUnitConfigurationType::class.java)
+    val runManager = RunManager.getInstance(module.project)
+    val runnerAndConfigurationSettings = runManager.createConfiguration(name, cfgType.configurationFactories[0])
+    val junitConfig = runnerAndConfigurationSettings.configuration as JUnitConfiguration
+    junitConfig.setModule(module)
+
+
+    val testKind = cfg.keys.firstOrNull { it in listOf("package", "directory", "pattern", "class", "method", "category") }
+    val testKindValue = cfg[testKind] as? String
+
+    if (testKindValue == null) {
+      return
+    }
+
+    val data = junitConfig.persistentData
+    when (testKind) {
+      "package"   -> { data.TEST_OBJECT = JUnitConfiguration.TEST_PACKAGE; data.PACKAGE_NAME = testKindValue }
+      "directory" -> { data.TEST_OBJECT = JUnitConfiguration.TEST_DIRECTORY; data.dirName = testKindValue  }
+      "pattern"   -> { data.TEST_OBJECT = JUnitConfiguration.TEST_PATTERN; data.setPatterns(LinkedHashSet(testKindValue.split(delimiters = ','))) }
+      "class"     -> {
+        data.TEST_OBJECT = JUnitConfiguration.TEST_CLASS
+        data.MAIN_CLASS_NAME = testKindValue
+      }
+      "method"    -> {
+        data.TEST_OBJECT = JUnitConfiguration.TEST_METHOD
+        val className = testKindValue.substringBefore('#')
+        val methodName = testKindValue.substringAfter('#')
+        data.MAIN_CLASS_NAME = className
+        data.METHOD_NAME = methodName
+      }
+      "category"  -> {
+        data.TEST_OBJECT = JUnitConfiguration.TEST_CATEGORY
+        data.setCategoryName(testKindValue)
+      }
+      null -> return
+    }
+
+    val repeatValue = cfg["repeat"]
+    junitConfig.repeatMode = when {
+      repeatValue == null           -> { RepeatCount.ONCE }
+      repeatValue == "untilStop"    -> { RepeatCount.UNLIMITED }
+      repeatValue == "untilFailure" -> { RepeatCount.UNTIL_FAILURE }
+      repeatValue is Number         -> { junitConfig.repeatCount = repeatValue.toInt(); RepeatCount.N }
+      else                          -> { RepeatCount.ONCE }
+    }
+
+    (cfg["jvmArgs"] as? String)?.let { junitConfig.vmParameters = it }
+
+    runManager.addConfiguration(runnerAndConfigurationSettings)
+  }
+}
\ No newline at end of file