diff --git a/server/src/util/add-test.js b/server/src/util/add-test.js
index dd82258..85d322f 100644
--- a/server/src/util/add-test.js
+++ b/server/src/util/add-test.js
@@ -139,8 +139,8 @@ export async function addTest(request) {
       },
       {
         jobId,
-        removeOnComplete: 3600,
-        removeOnFail: 3600,
+        removeOnComplete: 200,
+        removeOnFail: 400,
         priority
       }
     );
@@ -199,8 +199,8 @@ export async function addTestFromAPI(
 
   const jobConfig = {
     jobId,
-    removeOnComplete: 3600,
-    removeOnFail: 3600,
+    removeOnComplete: 200,
+    removeOnFail: 400,
     priority: priority || 10
   };
 
diff --git a/testrunner/src/testrunners/docker-testrunner.js b/testrunner/src/testrunners/docker-testrunner.js
index 184b301..e35b0a4 100644
--- a/testrunner/src/testrunners/docker-testrunner.js
+++ b/testrunner/src/testrunners/docker-testrunner.js
@@ -95,12 +95,18 @@ export default async function runJob(job) {
       runTime = testResult.result.browsertime[0].info.timestamp;
     }
 
-    resultQueue.add({
-      result: testResult.result,
-      id: job.id,
-      status: testResult.exitCode === 0 ? 'completed' : 'failed',
-      runTime
-    });
+    resultQueue.add(
+      {
+        result: testResult.result,
+        id: job.id,
+        status: testResult.exitCode === 0 ? 'completed' : 'failed',
+        runTime
+      },
+      {
+        removeOnComplete: 200,
+        removeOnFail: 200
+      }
+    );
 
     if (testResult.exitCode > 0) {
       throw new Error(
diff --git a/testrunner/src/testrunners/testrunner.js b/testrunner/src/testrunners/testrunner.js
index 74ac422..ef84836 100644
--- a/testrunner/src/testrunners/testrunner.js
+++ b/testrunner/src/testrunners/testrunner.js
@@ -42,12 +42,18 @@ export default async function runJob(job) {
       // The timestamp from Browsertime is more exact
       runTime = testResult.result.browsertime[0].info.timestamp;
     }
-    resultQueue.add({
-      result: testResult.result,
-      id: job.id,
-      status: testResult.exitCode === 0 ? 'completed' : 'failed',
-      runTime
-    });
+    resultQueue.add(
+      {
+        result: testResult.result,
+        id: job.id,
+        status: testResult.exitCode === 0 ? 'completed' : 'failed',
+        runTime
+      },
+      {
+        removeOnComplete: 200,
+        removeOnFail: 200
+      }
+    );
     if (testResult.exitCode > 0) {
       throw new Error(
         `sitespeed.io exited with a failure exit code ${testResult.exitCode}`