diff --git a/test/driver.js b/test/driver.js
index 7f5aef733..b453c5051 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -66,7 +66,8 @@ function nextTask() {
   cleanup();
 
   if (currentTaskIdx == manifest.length) {
-    return done();
+    done();
+    return;
   }
   var task = manifest[currentTaskIdx];
   task.round = 0;
@@ -86,7 +87,7 @@ function nextTask() {
 }
 
 function isLastPage(task) {
-  return task.pageNum > task.pdfDoc.numPages || task.pageNum > task.pageLimit;
+  return task.pageNum > (task.pageLimit || task.pdfDoc.numPages);
 }
 
 function canvasToDataURL() {