diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/GeneratedVsManualCoverage.expected b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/GeneratedVsManualCoverage.expected
similarity index 100%
rename from java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/GeneratedVsManualCoverage.expected
rename to java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/GeneratedVsManualCoverage.expected
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/GeneratedVsManualCoverage.qlref b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/GeneratedVsManualCoverage.qlref
similarity index 100%
rename from java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/GeneratedVsManualCoverage.qlref
rename to java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/GeneratedVsManualCoverage.qlref
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/IOUtils.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/IOUtils.java
similarity index 100%
rename from java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/IOUtils.java
rename to java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/ApacheCommonsIoTest/IOUtils.java
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.java
new file mode 100644
index 00000000000..90797502198
--- /dev/null
+++ b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.java
@@ -0,0 +1,45 @@
+import java.awt.Container;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UncheckedIOException;
+import java.lang.AssertionError;
+import java.lang.IllegalStateException;
+import java.lang.IndexOutOfBoundsException;
+import java.lang.NullPointerException;
+import java.lang.Math;
+import java.lang.Runtime;
+import java.lang.System;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.ResultSet;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class TopJdkApisTest { }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.ql b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.ql
new file mode 100644
index 00000000000..340fdd77108
--- /dev/null
+++ b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/TopJdkApisTest.ql
@@ -0,0 +1,13 @@
+import java
+import Metrics.Summaries.GeneratedVsManualCoverageQuery
+
+from
+  string package, int generatedOnly, int both, int manualOnly, int non, int all, float coverage,
+  float generatedCoverage, float manualCoverage, float manualCoveredByGenerated,
+  float generatedCoveredByManual, float match
+where
+  modelCoverageGenVsMan(package, generatedOnly, both, manualOnly, non, all, coverage,
+    generatedCoverage, manualCoverage, manualCoveredByGenerated, generatedCoveredByManual, match,
+    "topJdkApis")
+select package, generatedOnly, both, manualOnly, non, all, coverage, generatedCoverage,
+  manualCoverage, manualCoveredByGenerated, generatedCoveredByManual, match order by package