diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
index c43997f530f..fcd7c5cab61 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
@@ -67,6 +67,8 @@ fun getDefaultLanguageLevel(
 
 fun String?.toLanguageVersion(): LanguageVersion = when {
     this == null -> VersionView.RELEASED_VERSION
+    startsWith("1.6") -> LanguageVersion.KOTLIN_1_6
+    startsWith("1.5") -> LanguageVersion.KOTLIN_1_5
     startsWith("1.4") -> LanguageVersion.KOTLIN_1_4
     startsWith("1.3") -> LanguageVersion.KOTLIN_1_3
     startsWith("1.2") -> LanguageVersion.KOTLIN_1_2
diff --git a/idea/tests/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderTest.kt
new file mode 100644
index 00000000000..69181f4d1e9
--- /dev/null
+++ b/idea/tests/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderTest.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.facet
+
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.junit.Test
+import kotlin.test.assertSame
+
+class KotlinVersionInfoProviderTest {
+    @Test
+    fun supportedLanguageVersionConsistency() {
+        LanguageVersion.values().forEach { languageVersion ->
+            assertSame(languageVersion, languageVersion.toString().toLanguageVersion())
+        }
+    }
+}
\ No newline at end of file