diff --git a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
index 142570504e9..d16b058406a 100644
--- a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
+++ b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
@@ -1,27 +1,65 @@
 <node text="Annotation (java.lang.annotation)" base="true">
-  <node text="Override (java.lang)"/>
-  <node text="Language (org.intellij.lang.annotations)"/>
-  <node text="SuppressWarnings (java.lang)"/>
+  <node text="AllowSuspendExtensions (kotlin.coroutines)"/>
   <node text="Deprecated (java.lang)"/>
-  <node text="Inherited (java.lang.annotation)"/>
-  <node text="NonNls (org.jetbrains.annotations)"/>
-  <node text="Target (java.lang.annotation)"/>
-  <node text="Mutable (org.jetbrains.annotations)"/>
-  <node text="Subst (org.intellij.lang.annotations)"/>
-  <node text="Retention (java.lang.annotation)"/>
-  <node text="TestOnly (org.jetbrains.annotations)"/>
-  <node text="Nullable (org.jetbrains.annotations)"/>
-  <node text="Nullable (org.jetbrains.annotations)"/>
-  <node text="ReadOnly (org.jetbrains.annotations)"/>
-  <node text="Nls (org.jetbrains.annotations)"/>
-  <node text="Identifier (org.intellij.lang.annotations)"/>
-  <node text="PrintFormat (org.intellij.lang.annotations)"/>
-  <node text="RegExp (org.intellij.lang.annotations)"/>
+  <node text="Deprecated (kotlin)"/>
   <node text="Documented (java.lang.annotation)"/>
-  <node text="Pattern (org.intellij.lang.annotations)"/>
-  <node text="PropertyKey (org.jetbrains.annotations)"/>
-  <node text="NotNull (org.jetbrains.annotations)"/>
-  <node text="NotNull (org.jetbrains.annotations)"/>
+  <node text="DslMarker (kotlin)"/>
+  <node text="Exact (kotlin.internal)"/>
+  <node text="ExtensionFunctionType (kotlin)"/>
+  <node text="HidesMembers (kotlin.internal)"/>
+  <node text="Identifier (org.intellij.lang.annotations)"/>
+  <node text="Inherited (java.lang.annotation)"/>
+  <node text="InlineOnly (kotlin.internal)"/>
+  <node text="JvmField (kotlin.jvm)"/>
+  <node text="JvmMultifileClass (kotlin.jvm)"/>
+  <node text="JvmName (kotlin.jvm)"/>
+  <node text="JvmOverloads (kotlin.jvm)"/>
+  <node text="JvmStatic (kotlin.jvm)"/>
+  <node text="JvmSuppressWildcards (kotlin.jvm)"/>
+  <node text="JvmSynthetic (kotlin.jvm)"/>
+  <node text="JvmVersion (kotlin.jvm)"/>
+  <node text="JvmWildcard (kotlin.jvm)"/>
+  <node text="Language (org.intellij.lang.annotations)"/>
+  <node text="LowPriorityInOverloadResolution (kotlin.internal)"/>
+  <node text="Metadata (kotlin)"/>
+  <node text="MustBeDocumented (kotlin.annotation)"/>
+  <node text="Mutable (org.jetbrains.annotations)"/>
   <node text="MyAnno (a)"/>
   <node text="MyAnno2 (a)"/>
+  <node text="Nls (org.jetbrains.annotations)"/>
+  <node text="NoInfer (kotlin.internal)"/>
+  <node text="NonNls (org.jetbrains.annotations)"/>
+  <node text="NotNull (org.jetbrains.annotations)"/>
+  <node text="NotNull (org.jetbrains.annotations)"/>
+  <node text="Nullable (org.jetbrains.annotations)"/>
+  <node text="Nullable (org.jetbrains.annotations)"/>
+  <node text="OnlyInputTypes (kotlin.internal)"/>
+  <node text="Override (java.lang)"/>
+  <node text="ParameterName (kotlin)"/>
+  <node text="Pattern (org.intellij.lang.annotations)"/>
+  <node text="PlatformDependent (kotlin.internal)"/>
+  <node text="PrintFormat (org.intellij.lang.annotations)"/>
+  <node text="PropertyKey (org.jetbrains.annotations)"/>
+  <node text="PublishedApi (kotlin)"/>
+  <node text="PureReifiable (kotlin.internal)"/>
+  <node text="PurelyImplements (kotlin.jvm)"/>
+  <node text="ReadOnly (org.jetbrains.annotations)"/>
+  <node text="RegExp (org.intellij.lang.annotations)"/>
+  <node text="Repeatable (kotlin.annotation)"/>
+  <node text="ReplaceWith (kotlin)"/>
+  <node text="Retention (java.lang.annotation)"/>
+  <node text="Retention (kotlin.annotation)"/>
+  <node text="SinceKotlin (kotlin)"/>
+  <node text="Strictfp (kotlin.jvm)"/>
+  <node text="Subst (org.intellij.lang.annotations)"/>
+  <node text="Suppress (kotlin)"/>
+  <node text="SuppressWarnings (java.lang)"/>
+  <node text="Synchronized (kotlin.jvm)"/>
+  <node text="Target (java.lang.annotation)"/>
+  <node text="Target (kotlin.annotation)"/>
+  <node text="TestOnly (org.jetbrains.annotations)"/>
+  <node text="Throws (kotlin.jvm)"/>
+  <node text="Transient (kotlin.jvm)"/>
+  <node text="UnsafeVariance (kotlin)"/>
+  <node text="Volatile (kotlin.jvm)"/>
 </node>
diff --git a/idea/testData/hierarchy/withLib/enum/Enum_verification.xml b/idea/testData/hierarchy/withLib/enum/Enum_verification.xml
index 510a55757e1..5d50e13992e 100644
--- a/idea/testData/hierarchy/withLib/enum/Enum_verification.xml
+++ b/idea/testData/hierarchy/withLib/enum/Enum_verification.xml
@@ -10,7 +10,20 @@
     <node text="State in Thread (java.lang)"/>
     <node text="RetentionPolicy (java.lang.annotation)"/>
     <node text="Type in Window (java.awt)"/>
+    <node text="FileWalkDirection (kotlin.io)"/>
+    <node text="OnErrorAction (kotlin.io)"/>
+    <node text="RegexOption (kotlin.text)"/>
+    <node text="CharCategory (kotlin.text)"/>
+    <node text="CharDirectionality (kotlin.text)"/>
+    <node text="KVariance (kotlin.reflect)"/>
+    <node text="KVisibility (kotlin.reflect)"/>
+    <node text="AnnotationTarget (kotlin.annotation)"/>
+    <node text="AnnotationRetention (kotlin.annotation)"/>
+    <node text="State (kotlin.collections)"/>
     <node text="One ()"/>
     <node text="G ()"/>
+    <node text="LazyThreadSafetyMode (kotlin)"/>
+    <node text="DeprecationLevel (kotlin)"/>
+    <node text="Kind in KParameter (kotlin.reflect)"/>
   </node>
 </node>
diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt
index 1b1471f3372..029533b79ae 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt
@@ -50,7 +50,7 @@ abstract class AbstractHierarchyWithLibTest : AbstractHierarchyTest() {
                     TypeHierarchyTreeStructure(
                             project,
                             targetClass,
-                            HierarchyBrowserBaseEx.SCOPE_PROJECT)
+                            HierarchyBrowserBaseEx.SCOPE_ALL)
                 }, *filesToConfigure)
     }