diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index 77642d2c431..e9735284b03 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -249,6 +249,7 @@ private fun getReferenceKind(reference: PsiReference, referencedElement: PsiElem
     element.getParentOfTypeAndBranch<KtCallableReferenceExpression> { callableReference }?.let {
         if (it.receiverExpression != null) return ReferenceKind.IRRELEVANT
         if (referencedElement is KtDeclaration && referencedElement.parent is KtFile) return ReferenceKind.UNQUALIFIABLE
+        if (referencedElement is PsiMember && referencedElement.getContainingClass() == null) return ReferenceKind.UNQUALIFIABLE
     }
 
     return ReferenceKind.QUALIFIABLE
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/baz/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/baz/test.kt
index 6303b306de4..4e4bf41c2fa 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/baz/test.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/baz/test.kt
@@ -2,8 +2,11 @@ package baz
 
 import foo.A
 import foo.J
+import foo.JConstr
 import foo.O
 import foo.O.objectExtensionMember2
+import foo.Y
+import foo.YConstr
 import foo.classExtension
 import foo.companionExtension
 import foo.objectExtension
@@ -39,6 +42,12 @@ fun test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::Y
+    ::YConstr
+    Y::YY
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/Y.kt
new file mode 100644
index 00000000000..5de2d697f92
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/Y.kt
@@ -0,0 +1,7 @@
+package foo
+
+class Y {
+    class YY
+}
+
+class YConstr(n: Int)
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/bar/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/bar/usages.kt
index 113ca1e432c..ae2d398cca5 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/bar/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/bar/usages.kt
@@ -36,6 +36,12 @@ fun <caret>test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::Y
+    ::YConstr
+    Y::YY
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/Y.kt
new file mode 100644
index 00000000000..5de2d697f92
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/Y.kt
@@ -0,0 +1,7 @@
+package foo
+
+class Y {
+    class YY
+}
+
+class YConstr(n: Int)
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/Y.kt
new file mode 100644
index 00000000000..5de2d697f92
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/Y.kt
@@ -0,0 +1,7 @@
+package foo
+
+class Y {
+    class YY
+}
+
+class YConstr(n: Int)
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/test.kt
index 462dc4c55e3..f76e7076606 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/test.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/test.kt
@@ -32,6 +32,12 @@ fun test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::Y
+    ::YConstr
+    Y::YY
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/bar/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/bar/usages.kt
index 113ca1e432c..ae2d398cca5 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/bar/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/bar/usages.kt
@@ -36,6 +36,12 @@ fun <caret>test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::Y
+    ::YConstr
+    Y::YY
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/Y.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/Y.kt
new file mode 100644
index 00000000000..5de2d697f92
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/Y.kt
@@ -0,0 +1,7 @@
+package foo
+
+class Y {
+    class YY
+}
+
+class YConstr(n: Int)
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/bar/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/bar/test.kt
index 68a404e5c47..462c8307330 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/bar/test.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/bar/test.kt
@@ -2,8 +2,11 @@ package bar
 
 import foo.A
 import foo.J
+import foo.JConstr
 import foo.O
 import foo.O.objectExtensionMember2
+import foo.X
+import foo.XConstr
 import foo.classExtension
 import foo.companionExtension
 import foo.objectExtension
@@ -39,6 +42,12 @@ fun test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::X
+    ::XConstr
+    X::XX
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/usages.kt
index 43eba6becb1..e4dfa0fefd3 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/usages.kt
@@ -1,4 +1,7 @@
 package foo
 
-class X
+class X {
+    class XX
+}
+class XConstr(n: Int)
 
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/usages.kt
index 9de2ae9e396..f98d2fb91d9 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/usages.kt
@@ -3,7 +3,10 @@ package foo
 import foo.O.objectMember2
 import foo.O.objectExtensionMember2
 
-class X
+class X {
+    class XX
+}
+class XConstr(n: Int)
 
 fun <caret>test() {
     A().classMember()
@@ -35,6 +38,12 @@ fun <caret>test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::X
+    ::XConstr
+    X::XX
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/bar/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/bar/test.kt
index 68a404e5c47..462c8307330 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/bar/test.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/bar/test.kt
@@ -2,8 +2,11 @@ package bar
 
 import foo.A
 import foo.J
+import foo.JConstr
 import foo.O
 import foo.O.objectExtensionMember2
+import foo.X
+import foo.XConstr
 import foo.classExtension
 import foo.companionExtension
 import foo.objectExtension
@@ -39,6 +42,12 @@ fun test() {
     J::javaClassMember
     J::javaClassStaticMember
     ::topLevel
+    ::X
+    ::XConstr
+    X::XX
+    ::J
+    ::JConstr
+    J::JJ
 
     with(A()) {
         classMember()
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/usages.kt
index 43eba6becb1..e4dfa0fefd3 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/usages.kt
@@ -1,4 +1,7 @@
 package foo
 
-class X
+class X {
+    class XX
+}
+class XConstr(n: Int)
 
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/J.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/J.java
index 55c00a58a84..1ababf57759 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/J.java
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/J.java
@@ -1,6 +1,10 @@
 package foo;
 
 public class J {
+    public static class JJ {
+
+    }
+
     public void javaClassMember() {
 
     }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/JConstr.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/JConstr.java
new file mode 100644
index 00000000000..9df3efddf3f
--- /dev/null
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/JConstr.java
@@ -0,0 +1,7 @@
+package foo;
+
+public class JConstr {
+    public JConstr(int n) {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/usages.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/usages.kt
index 89e3e0dbb16..4a505d312fc 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/usages.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/usages.kt
@@ -2,7 +2,10 @@ package foo
 
 import foo.O.objectExtensionMember2
 
-class X
+class X {
+    class XX
+}
+class XConstr(n: Int)
 
 fun <caret>test() {
     foo.A().classMember()
@@ -34,6 +37,12 @@ fun <caret>test() {
     foo.J::javaClassMember
     foo.J::javaClassStaticMember
     ::topLevel
+    ::X
+    ::XConstr
+    X::XX
+    ::J
+    ::JConstr
+    J::JJ
 
     with(foo.A()) {
         classMember()