diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
index 8e184320d61..2a54e89312c 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
@@ -232,7 +232,7 @@ fun hasKotlinFilesInSources(module: Module): Boolean {
 }
 
 fun isEap(version: String): Boolean {
-    return version.contains("rc") || version.contains("eap")
+    return version.contains("rc") || version.contains("eap") || version.contains("-M")
 }
 
 private class LibraryKindSearchScope(val module: Module,
diff --git a/idea/testData/configuration/gradle/m04Version/build_after.gradle b/idea/testData/configuration/gradle/m04Version/build_after.gradle
index 0a19c9c1da7..73854d0069c 100644
--- a/idea/testData/configuration/gradle/m04Version/build_after.gradle
+++ b/idea/testData/configuration/gradle/m04Version/build_after.gradle
@@ -7,7 +7,7 @@ version = '1.0'
 repositories {
   mavenCentral()
     maven {
-        url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
+        url 'http://dl.bintray.com/kotlin/kotlin-eap'
     }
 }
 
@@ -19,7 +19,7 @@ buildscript {
     ext.kotlin_version = '$VERSION$'
     repositories {
         maven {
-            url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
+            url 'http://dl.bintray.com/kotlin/kotlin-eap'
         }
         mavenCentral()
     }
diff --git a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts
index 091bf09f82e..da187007772 100644
--- a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts
+++ b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     kotlin_version = "$VERSION$"
     repositories {
         maven {
-            setUrl("http://dl.bintray.com/kotlin/kotlin-eap-1.1")
+            setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
         }
         mavenCentral()
     }
@@ -30,7 +30,7 @@ application {
 repositories {
     jcenter()
     maven {
-        setUrl("http://dl.bintray.com/kotlin/kotlin-eap-1.1")
+        setUrl("http://dl.bintray.com/kotlin/kotlin-eap")
     }
 }