diff --git a/java/ql/test-kotlin2/library-tests/enum/test.expected b/java/ql/test-kotlin2/library-tests/enum/test.expected
index a8b89662b57..ca8e735fa18 100644
--- a/java/ql/test-kotlin2/library-tests/enum/test.expected
+++ b/java/ql/test-kotlin2/library-tests/enum/test.expected
@@ -1,39 +1,48 @@
 #select
-| addAll |
-| addRange |
-| allOf |
-| asIterator |
-| clone |
-| compareTo |
-| complement |
-| complementOf |
-| copyOf |
-| describeConstable |
-| equals |
-| finalize |
-| forEach |
-| getDeclaringClass |
-| getFirst |
-| getLast |
-| hasMoreElements |
-| hashCode |
-| name |
-| nextElement |
-| noneOf |
-| of |
-| ordinal |
-| parallelStream |
-| range |
-| resolveConstantDesc |
-| reversed |
-| spliterator |
-| stream |
-| toArray |
-| toString |
-| typeCheck |
-| usesEnum |
-| valueOf |
-| writeReplace |
+| EnumUserKt | EnumUserKt | usesEnum |
+| java.lang.Enum | Enum | clone |
+| java.lang.Enum | Enum | compareTo |
+| java.lang.Enum | Enum | describeConstable |
+| java.lang.Enum | Enum | equals |
+| java.lang.Enum | Enum | finalize |
+| java.lang.Enum | Enum | getDeclaringClass |
+| java.lang.Enum | Enum | hashCode |
+| java.lang.Enum | Enum | name |
+| java.lang.Enum | Enum | ordinal |
+| java.lang.Enum | Enum | toString |
+| java.lang.Enum | Enum | valueOf |
+| java.lang.Enum<?> | Enum<?> | clone |
+| java.lang.Enum<?> | Enum<?> | compareTo |
+| java.lang.Enum<?> | Enum<?> | describeConstable |
+| java.lang.Enum<?> | Enum<?> | equals |
+| java.lang.Enum<?> | Enum<?> | finalize |
+| java.lang.Enum<?> | Enum<?> | getDeclaringClass |
+| java.lang.Enum<?> | Enum<?> | hashCode |
+| java.lang.Enum<?> | Enum<?> | name |
+| java.lang.Enum<?> | Enum<?> | ordinal |
+| java.lang.Enum<?> | Enum<?> | toString |
+| java.lang.Enum<?> | Enum<?> | valueOf |
+| java.lang.Enum<E> | Enum<E> | clone |
+| java.lang.Enum<E> | Enum<E> | compareTo |
+| java.lang.Enum<E> | Enum<E> | describeConstable |
+| java.lang.Enum<E> | Enum<E> | equals |
+| java.lang.Enum<E> | Enum<E> | finalize |
+| java.lang.Enum<E> | Enum<E> | getDeclaringClass |
+| java.lang.Enum<E> | Enum<E> | hashCode |
+| java.lang.Enum<E> | Enum<E> | name |
+| java.lang.Enum<E> | Enum<E> | ordinal |
+| java.lang.Enum<E> | Enum<E> | toString |
+| java.lang.Enum<E> | Enum<E> | valueOf |
+| kotlin.Enum | Enum | clone |
+| kotlin.Enum | Enum | compareTo |
+| kotlin.Enum | Enum | describeConstable |
+| kotlin.Enum | Enum | equals |
+| kotlin.Enum | Enum | finalize |
+| kotlin.Enum | Enum | getDeclaringClass |
+| kotlin.Enum | Enum | hashCode |
+| kotlin.Enum | Enum | name |
+| kotlin.Enum | Enum | ordinal |
+| kotlin.Enum | Enum | toString |
 enumConstants
 | enumUser.kt:3:16:3:17 | A |
 | enumUser.kt:3:19:3:20 | B |
diff --git a/java/ql/test-kotlin2/library-tests/enum/test.ql b/java/ql/test-kotlin2/library-tests/enum/test.ql
index 8d83314e5c3..25c325ada4d 100644
--- a/java/ql/test-kotlin2/library-tests/enum/test.ql
+++ b/java/ql/test-kotlin2/library-tests/enum/test.ql
@@ -1,7 +1,9 @@
 import java
 
-from Method m
-where m.getDeclaringType().getName().matches("Enum%")
-select m.getName()
+from Method m, RefType t
+where
+  t = m.getDeclaringType() and
+  t.getName() = ["Enum", "Enum<?>", "Enum<E>", "EnumUserKt"]
+select t.getQualifiedName(), t.getName(), m.getName()
 
 query predicate enumConstants(EnumConstant ec) { ec.fromSource() }