diff --git a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.kt
index bfceda40fd6..93eb87256c8 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.kt
@@ -14,6 +14,8 @@ public interface SuperInterface {
 public abstract class SuperClass implements SuperInterface {
     public static class NestedSuperClass { }
 
+    public class InnerSuperClass { }
+
     @Override
     public int getActualRandomNumber() {
         return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
 public class JavaClass extends SuperClass {
     public static class NestedClass { }
 
+    public class InnerClass { }
+
     public static int foo = 1;
 
     public static String bar() {
diff --git a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.pretty.txt
index 385411509b0..94975de918e 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.pretty.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.pretty.txt
@@ -4,6 +4,8 @@ open fun hello()
 
 open var foo: kotlin.Int
 
+open inner class InnerClass
+
 open class NestedClass
 
 constructor()
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.txt
index 8caa6077fec..efadde0977d 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/javaClass.txt
@@ -86,6 +86,35 @@ KtJavaFieldSymbol:
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: JavaClass.InnerClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: true
+  modality: OPEN
+  name: InnerClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
 KtNamedClassOrObjectSymbol:
   annotationsList: []
   classIdIfNonLocal: JavaClass.NestedClass
diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.kt
index bfceda40fd6..93eb87256c8 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.kt
@@ -14,6 +14,8 @@ public interface SuperInterface {
 public abstract class SuperClass implements SuperInterface {
     public static class NestedSuperClass { }
 
+    public class InnerSuperClass { }
+
     @Override
     public int getActualRandomNumber() {
         return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
 public class JavaClass extends SuperClass {
     public static class NestedClass { }
 
+    public class InnerClass { }
+
     public static int foo = 1;
 
     public static String bar() {
diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.pretty.txt
index 82e128c5a13..68aaef885ed 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.pretty.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.pretty.txt
@@ -1,3 +1,5 @@
 open fun hello()
 
+open inner class InnerClass
+
 constructor()
diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.txt
index 17fb6bab7c1..67c1e96feed 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/javaClass.txt
@@ -34,6 +34,35 @@ KtFunctionSymbol:
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: JavaClass.InnerClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: true
+  modality: OPEN
+  name: InnerClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
 KtConstructorSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt
index bfceda40fd6..93eb87256c8 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.kt
@@ -14,6 +14,8 @@ public interface SuperInterface {
 public abstract class SuperClass implements SuperInterface {
     public static class NestedSuperClass { }
 
+    public class InnerSuperClass { }
+
     @Override
     public int getActualRandomNumber() {
         return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
 public class JavaClass extends SuperClass {
     public static class NestedClass { }
 
+    public class InnerClass { }
+
     public static int foo = 1;
 
     public static String bar() {
diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt
index c4aa2a0eef3..953391ce019 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.pretty.txt
@@ -11,6 +11,10 @@ open fun toString(): kotlin.String
 
 open class NestedClass
 
+open inner class InnerClass
+
 open class NestedSuperClass
 
+open inner class InnerSuperClass
+
 constructor()
diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt
index c7f5535949e..1a443949a44 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/javaClass.txt
@@ -233,6 +233,35 @@ KtNamedClassOrObjectSymbol:
   annotationApplicableTargets: null
   deprecationStatus: null
 
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: JavaClass.InnerClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: true
+  modality: OPEN
+  name: InnerClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
 KtNamedClassOrObjectSymbol:
   annotationsList: []
   classIdIfNonLocal: SuperClass.NestedSuperClass
@@ -262,6 +291,35 @@ KtNamedClassOrObjectSymbol:
   annotationApplicableTargets: null
   deprecationStatus: null
 
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: SuperClass.InnerSuperClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: true
+  modality: OPEN
+  name: InnerSuperClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
 KtConstructorSymbol:
   annotationsList: []
   callableIdIfNonLocal: null
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.kt
index bfceda40fd6..93eb87256c8 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.kt
@@ -14,6 +14,8 @@ public interface SuperInterface {
 public abstract class SuperClass implements SuperInterface {
     public static class NestedSuperClass { }
 
+    public class InnerSuperClass { }
+
     @Override
     public int getActualRandomNumber() {
         return getRandomNumber();
@@ -30,6 +32,8 @@ public abstract class SuperClass implements SuperInterface {
 public class JavaClass extends SuperClass {
     public static class NestedClass { }
 
+    public class InnerClass { }
+
     public static int foo = 1;
 
     public static String bar() {
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.pretty.txt
index 656f2493fc3..f7c686168c8 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.pretty.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.pretty.txt
@@ -2,4 +2,6 @@ open fun bar(): kotlin.String!
 
 open var foo: kotlin.Int
 
+open inner class InnerClass
+
 open class NestedClass
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.txt
index 8a18222e4e3..03e1c9ebfd0 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticDeclaredMemberScope/javaClass.txt
@@ -50,6 +50,35 @@ KtJavaFieldSymbol:
   getContainingModule: KtSourceModule "Sources of main"
   deprecationStatus: null
 
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: JavaClass.InnerClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: true
+  modality: OPEN
+  name: InnerClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
 KtNamedClassOrObjectSymbol:
   annotationsList: []
   classIdIfNonLocal: JavaClass.NestedClass
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.kt b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.kt
index 5e37b1879ff..239aac84ea0 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.kt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.kt
@@ -16,8 +16,9 @@ public interface SuperInterface {
 public abstract class SuperClass implements SuperInterface {
     // NestedSuperClass will not be included in JavaClass's static member scope, because Kotlin does not propagate static nested classes
     // defined in super-classes to sub-classes, unlike Java. So `JavaClass.SuperClass` is valid in Java, but an error in Kotlin.
-    class NestedSuperClass {
-    }
+    public static class NestedSuperClass { }
+
+    public class InnerSuperClass { }
 
     @Override
     public int getActualRandomNumber() {
@@ -35,8 +36,9 @@ public abstract class SuperClass implements SuperInterface {
 
 // FILE: JavaClass.java
 public class JavaClass extends SuperClass {
-    class NestedClass {
-    }
+    public static class NestedClass { }
+
+    public class InnerClass { }
 
     public static int foo = 1;
 
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.pretty.txt
index 89848f81b97..218259efd8e 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.pretty.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.pretty.txt
@@ -6,4 +6,6 @@ open fun superBar(): kotlin.String!
 
 open var foo: kotlin.Int
 
-open inner class NestedClass
\ No newline at end of file
+open inner class InnerClass
+
+open class NestedClass
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.txt b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.txt
index 041ae4893fc..7314ace87e9 100644
--- a/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.txt
+++ b/analysis/analysis-api/testData/components/scopeProvider/staticMemberScope/javaClass.txt
@@ -104,7 +104,7 @@ KtJavaFieldSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: []
-  classIdIfNonLocal: JavaClass.NestedClass
+  classIdIfNonLocal: JavaClass.InnerClass
   classKind: CLASS
   companionObject: null
   contextReceivers: []
@@ -116,6 +116,35 @@ KtNamedClassOrObjectSymbol:
   isInline: false
   isInner: true
   modality: OPEN
+  name: InnerClass
+  origin: JAVA
+  superTypes: [
+    KtUsualClassType:
+      annotationsList: []
+      ownTypeArguments: []
+      type: kotlin/Any
+  ]
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  annotationApplicableTargets: null
+  deprecationStatus: null
+
+KtNamedClassOrObjectSymbol:
+  annotationsList: []
+  classIdIfNonLocal: JavaClass.NestedClass
+  classKind: CLASS
+  companionObject: null
+  contextReceivers: []
+  isActual: false
+  isData: false
+  isExpect: false
+  isExternal: false
+  isFun: false
+  isInline: false
+  isInner: false
+  modality: OPEN
   name: NestedClass
   origin: JAVA
   superTypes: [
@@ -126,7 +155,7 @@ KtNamedClassOrObjectSymbol:
   ]
   symbolKind: CLASS_MEMBER
   typeParameters: []
-  visibility: PackageVisibility
+  visibility: Public
   getContainingModule: KtSourceModule "Sources of main"
   annotationApplicableTargets: null
   deprecationStatus: null
\ No newline at end of file