diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt
index 6213d1be11d..5a1050773a6 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt
@@ -44,7 +44,7 @@ public fun isKotlinCompiledFile(file: VirtualFile): Boolean {
         return true
     }
     val header = KotlinBinaryClassCache.getKotlinBinaryClass(file).getClassHeader()
-    return header != null
+    return header != null && header.getKind() != KotlinClassHeader.Kind.TRAIT_IMPL
 }
 
 public fun isKotlinInternalCompiledFile(file: VirtualFile): Boolean {
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
index 1e685fbc0d5..7a31c753325 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
@@ -26,6 +26,10 @@ import com.intellij.psi.PsiManager
 import junit.framework.Assert
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import com.intellij.psi.ClassFileViewProvider
+import com.intellij.psi.impl.compiled.ClsFileImpl
+import com.intellij.psi.PsiCompiledFile
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiJavaFile
 
 //TODO: test for local functions and classes
 public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() {
@@ -44,20 +48,45 @@ public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase()
         ClassFileViewProvider.isInnerClass(this)
     }
 
+    fun testTraitImplClassIsVisibleAsJavaClass() {
+        val project = getProject()!!
+        doTest("trait impl", { getNameWithoutExtension().endsWith(JvmAbi.TRAIT_IMPL_SUFFIX) }) {
+            val psiFile = PsiManager.getInstance(project).findFile(this)
+            Assert.assertTrue("Should not be kotlin file",
+                              psiFile !is JetClsFile)
+            Assert.assertTrue("Should be java file, was ${psiFile!!.getClass().getSimpleName()}",
+                              psiFile is ClsFileImpl)
+
+            val decompiledPsiFile = (psiFile as PsiCompiledFile).getDecompiledPsiFile()!!
+            Assert.assertTrue("Should be java decompiled file, was ${decompiledPsiFile.getClass().getSimpleName()}",
+                              decompiledPsiFile is PsiJavaFile)
+            val classes = (decompiledPsiFile as PsiJavaFile).getClasses()
+            Assert.assertTrue("Should have some decompiled text",
+                              classes.size == 1 && classes[0].getName()!!.endsWith(JvmAbi.TRAIT_IMPL_SUFFIX))
+        }
+    }
+
     override fun getProjectDescriptor(): LightProjectDescriptor {
         return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH, withSources = false)
     }
 
-    private fun doTestNoPsiFilesAreBuiltFor(fileKind: String, condition: VirtualFile.() -> Boolean) {
-        val root = NavigateToDecompiledLibraryTest.findTestLibraryRoot(myModule!!)!!
+    private fun doTestNoPsiFilesAreBuiltFor(fileKind: String, acceptFile: VirtualFile.() -> Boolean) {
         val project = getProject()!!
+        doTest(fileKind, acceptFile) {
+            val psiFile = PsiManager.getInstance(project).findFile(this)
+            Assert.assertNull("PSI files for $fileKind classes should not be build, is was build for: ${this.getPresentableName()}",
+                              psiFile)
+
+        }
+    }
+
+    private fun doTest(fileKind: String, acceptFile: VirtualFile.() -> Boolean, performTest: VirtualFile.() -> Unit) {
+        val root = NavigateToDecompiledLibraryTest.findTestLibraryRoot(myModule!!)!!
         var foundAtLeastOneFile = false
         root.checkRecursively {
-            if (condition()) {
+            if (acceptFile()) {
                 foundAtLeastOneFile = true
-                val psiFile = PsiManager.getInstance(project).findFile(this)
-                Assert.assertNull("PSI files for $fileKind classes should not be build, is was build for: ${this.getPresentableName()}",
-                                  psiFile)
+                performTest()
             }
         }
         Assert.assertTrue("Should find at least one file of kind ($fileKind). This assertion can fail in following scenarios:\n" +