diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index f1d143dc..1f4288f7 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -682,6 +682,7 @@ create index IndexBuildsOnProject on Builds(project);
 create index IndexBuildsOnTimestamp on Builds(timestamp);
 create index IndexBuildsOnFinishedStopTime on Builds(finished, stoptime DESC);
 create index IndexBuildsOnJobFinishedId on builds(project, jobset, job, system, finished, id DESC);
+create index IndexFinishedSuccessfulBuilds on Builds(id DESC, buildstatus, finished, job, jobset_id) where buildstatus = 0 and finished = 1;
 create index IndexBuildsOnDrvPath on Builds(drvPath);
 create index IndexCachedHgInputsOnHash on CachedHgInputs(uri, branch, sha256hash);
 create index IndexCachedGitInputsOnHash on CachedGitInputs(uri, branch, sha256hash);
diff --git a/src/sql/upgrade-65.sql b/src/sql/upgrade-65.sql
new file mode 100644
index 00000000..05986887
--- /dev/null
+++ b/src/sql/upgrade-65.sql
@@ -0,0 +1,4 @@
+-- Index more exactly what the latest-finished query looks for.
+create index IndexFinishedSuccessfulBuilds
+  on Builds(id DESC, buildstatus, finished, job, jobset_id)
+  where buildstatus = 0 and finished = 1;