diff --git a/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/C.java b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/C.java
new file mode 100644
index 00000000000..c2f5e29be50
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/C.java
@@ -0,0 +1,3 @@
+import java.util.Map;
+
+public abstract class C<K, V> implements Map.Entry<K, V> { }
diff --git a/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/b.kt b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/b.kt
new file mode 100644
index 00000000000..6e52e8c38c4
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/b.kt
@@ -0,0 +1 @@
+public abstract class B<K, V> : Map.Entry<K, V> { }
diff --git a/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.expected b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.expected
new file mode 100644
index 00000000000..0f01d1aaf5d
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.expected
@@ -0,0 +1,2 @@
+| comparingByKey | K | Comparable<? super K> |
+| comparingByValue | V | Comparable<? super V> |
diff --git a/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.ql b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.ql
new file mode 100644
index 00000000000..29f380e331f
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/kotlin-java-map-entries/test.ql
@@ -0,0 +1,6 @@
+import java
+
+from Method m, TypeVariable param
+where m.getDeclaringType().getQualifiedName() = "java.util.Map$Entry"
+and param = m.(GenericCallable).getATypeParameter()
+select m.toString(), param.toString(), param.getATypeBound().toString()