diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 402d7d48af6..2de6c488f24 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -680,8 +680,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
 
     fun testDevKitProject() {
         initProject(JVM_MOCK_RUNTIME)
-        assertEquals(myProject.modules.single().moduleType, JpsPluginModuleType.INSTANCE)
+        val module = myProject.modules.single()
+        assertEquals(module.moduleType, JpsPluginModuleType.INSTANCE)
         buildAllModules().assertSuccessful()
+        assertFilesExistInOutput(module, "TestKt.class")
     }
 
     fun testAccessToInternalInProductionFromTests() {
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt
index 2e81b65791d..b8c9c2a5c5b 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.jps.platforms
 
 import com.intellij.openapi.util.Key
+import org.jetbrains.jps.builders.ModuleBasedBuildTargetType
 import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
 import org.jetbrains.jps.incremental.CompileContext
 import org.jetbrains.jps.incremental.ModuleBuildTarget
@@ -55,7 +56,7 @@ class KotlinBuildTargets internal constructor(val compileContext: CompileContext
     }
 
     operator fun get(target: ModuleBuildTarget): KotlinModuleBuildTarget<*>? {
-        if (target.module.moduleType != JpsJavaModuleType.INSTANCE) return null
+        if (target.targetType !is ModuleBasedBuildTargetType) return null
 
         return byJpsModuleBuildTarget.computeIfAbsent(target) {
             when (target.module.targetPlatform ?: detectTargetPlatform(target)) {