diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinInternalInJavaInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinInternalInJavaInspection.kt
index 2633cf8a488..d9b691ca664 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinInternalInJavaInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinInternalInJavaInspection.kt
@@ -9,7 +9,7 @@ import com.intellij.codeInspection.LocalInspectionTool
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.*
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo
+import org.jetbrains.kotlin.idea.util.module
 import org.jetbrains.kotlin.lexer.KtTokens.INTERNAL_KEYWORD
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 
@@ -39,5 +39,5 @@ class KotlinInternalInJavaInspection : LocalInspectionTool() {
         }
     }
 
-    private fun PsiElement.inSameModule(element: PsiElement) = getNullableModuleInfo()?.equals(element.getNullableModuleInfo()) ?: true
+    private fun PsiElement.inSameModule(element: PsiElement) = module?.equals(element.module) ?: true
 }
diff --git a/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/main/kotlin/Shadow.kt b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/main/kotlin/Shadow.kt
new file mode 100644
index 00000000000..7935d31f96e
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/main/kotlin/Shadow.kt
@@ -0,0 +1,5 @@
+package pack_one.java_package;
+
+internal class Foo {
+    fun bar() = "bar"
+}
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/test/java/pack_one/java_package/Internal.java b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/test/java/pack_one/java_package/Internal.java
new file mode 100644
index 00000000000..7117c2fb7c6
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/test/java/pack_one/java_package/Internal.java
@@ -0,0 +1,8 @@
+package pack_one.java_package;
+
+public class Internal {
+    public static void main(String[] args) {
+        Foo foo = new Foo();
+        foo.bar();
+    }
+}
diff --git a/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/testProject.iml b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/testProject.iml
new file mode 100644
index 00000000000..ab58304633b
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/before/testProject/testProject.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinInternalInJavaTest/expected.xml b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/expected.xml
new file mode 100644
index 00000000000..e79afdd1c43
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/expected.xml
@@ -0,0 +1,2 @@
+<problems>
+</problems>
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinInternalInJavaTest/kotlinInternalInJavaTest.test b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/kotlinInternalInJavaTest.test
new file mode 100644
index 00000000000..3747990dcd0
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinInternalInJavaTest/kotlinInternalInJavaTest.test
@@ -0,0 +1,4 @@
+{
+    "inspectionClass": "org.jetbrains.kotlin.idea.inspections.KotlinInternalInJavaInspection",
+    "isMultiModule": "true"
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
index dff01e5225c..478994ad41b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
@@ -43,6 +43,11 @@ public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectio
         runTest("idea/testData/multiFileInspections/kotlinInternalInJava/kotlinInternalInJava.test");
     }
 
+    @TestMetadata("kotlinInternalInJavaTest/kotlinInternalInJavaTest.test")
+    public void testKotlinInternalInJavaTest_KotlinInternalInJavaTest() throws Exception {
+        runTest("idea/testData/multiFileInspections/kotlinInternalInJavaTest/kotlinInternalInJavaTest.test");
+    }
+
     @TestMetadata("mainInTwoModules/mainInTwoModules.test")
     public void testMainInTwoModules_MainInTwoModules() throws Exception {
         runTest("idea/testData/multiFileInspections/mainInTwoModules/mainInTwoModules.test");