diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 9a2943b4d4..7eff22205b 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -18,6 +18,18 @@ import './commands';
 
 require('cypress-failed-log');
 
+// Rather than processing all pending jobs at the end of each test which may sometimes lead to timeouts
+// if there are a large number of time consuming jobs queued, we will process 3 before each test
+// and process 3 after each test and each of these 3 will be individually to minimize the chances of
+// server timeouts instead of one single long running process.
+beforeEach(function() {
+	cy.runQueueJobs(null, false, true);
+	cy.runQueueJobs(null, false, true);
+	cy.runQueueJobs(null, false, true);
+});
+
 afterEach(function() {
-	cy.runQueueJobs();
+	cy.runQueueJobs(null, false, true);
+	cy.runQueueJobs(null, false, true);
+	cy.runQueueJobs(null, false, true);
 });
diff --git a/lib/pkp b/lib/pkp
index d166503f4c..f7b81db267 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit d166503f4c4ef695d33e4040e63fc5eaf117d3cb
+Subproject commit f7b81db26728e9f18b6e556b4ca2b398900f7c0c