diff --git a/js/client/modules/@arangodb/testsuites/recovery.js b/js/client/modules/@arangodb/testsuites/recovery.js
index 0a2408c11e..832c87d7ef 100644
--- a/js/client/modules/@arangodb/testsuites/recovery.js
+++ b/js/client/modules/@arangodb/testsuites/recovery.js
@@ -40,6 +40,7 @@ const toArgv = require('internal').toArgv;
 
 const RED = require('internal').COLORS.COLOR_RED;
 const RESET = require('internal').COLORS.COLOR_RESET;
+const BLUE = require('internal').COLORS.COLOR_BLUE;
 
 const testPaths = {
   'recovery': [tu.pathForTesting('server/recovery')]
@@ -50,6 +51,7 @@ const testPaths = {
 // //////////////////////////////////////////////////////////////////////////////
 
 function runArangodRecovery (instanceInfo, options, script, setup, count) {
+  let tmpDir;
   if (!instanceInfo.recoveryArgs) {
     let tempDir = fs.getTempPath();
     let td = fs.join(tempDir, `${count}`);
@@ -62,7 +64,7 @@ function runArangodRecovery (instanceInfo, options, script, setup, count) {
 
     let appDir = fs.join(td, 'app');
     fs.makeDirectoryRecursive(appDir);
-    let tmpDir = fs.join(td, 'tmp');
+    tmpDir = fs.join(td, 'tmp');
     fs.makeDirectoryRecursive(tmpDir);
 
     let args = pu.makeArgs.arangod(options, appDir, '', tmpDir);
@@ -102,6 +104,21 @@ function runArangodRecovery (instanceInfo, options, script, setup, count) {
   let binary = pu.ARANGOD_BIN;
 
   instanceInfo.pid = pu.executeAndWait(binary, argv, options, 'recovery', instanceInfo.rootDir, setup, !setup && options.coreCheck);
+  if (!setup) {
+    let jsonFN = fs.join(tmpDir, 'testresult.json');
+    try {
+      let result = JSON.parse(fs.read(jsonFN));
+      fs.remove(jsonFN);
+      return result;
+    } catch (x) {
+      print(RED + 'failed to read ' + jsonFN + RESET);
+      return {
+        status: false,
+        message: 'failed to read ' + jsonFN + x,
+        duration: -1
+      };
+    }
+  }
 }
 
 function recovery (options) {
@@ -139,17 +156,18 @@ function recovery (options) {
       let instanceInfo = {};
       count += 1;
 
+      print(BLUE + "running setup of " + test + RESET);
       runArangodRecovery(instanceInfo, localOptions, test, true, count);
 
-      runArangodRecovery(instanceInfo, localOptions, test, false, count);
-
-      pu.cleanupLastDirectory(localOptions);
-
-      results[test] = instanceInfo.pid;
+      print(BLUE + "running recovery of " + test + RESET);
+      results[test] = runArangodRecovery(instanceInfo, localOptions, test, false, count);
 
       if (!results[test].status) {
         status = false;
       }
+      else {
+        pu.cleanupLastDirectory(localOptions);
+      }
     } else {
       if (options.extremeVerbosity) {
         print('Skipped ' + test + ' because of ' + filtered.filter);
@@ -167,9 +185,7 @@ function recovery (options) {
   }
   results.status = status;
 
-  return {
-    recovery: results
-  };
+  return results;
 }
 
 exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc, allTestPaths) {
diff --git a/js/common/modules/jsunity.js b/js/common/modules/jsunity.js
index 81b2c6ad23..5615cecd88 100644
--- a/js/common/modules/jsunity.js
+++ b/js/common/modules/jsunity.js
@@ -208,6 +208,17 @@ function Done (suiteName) {
   return ret;
 }
 
+// //////////////////////////////////////////////////////////////////////////////
+// / @brief done with all tests
+// //////////////////////////////////////////////////////////////////////////////
+
+function WriteDone (suiteName) {
+  var ret = Done(suiteName);
+  let outPath = fs.join(require("internal").options()['temp.path'], 'testresult.json');
+  fs.write(outPath, JSON.stringify(ret));
+  return ret;
+}
+
 // //////////////////////////////////////////////////////////////////////////////
 // / @brief runs a JSUnity test file
 // //////////////////////////////////////////////////////////////////////////////
@@ -238,4 +249,5 @@ exports.setTestFilter = setTestFilter;
 exports.jsUnity = jsUnity;
 exports.run = Run;
 exports.done = Done;
+exports.writeDone = WriteDone;
 exports.runTest = RunTest;
diff --git a/tests/js/server/recovery/applier-restart.js b/tests/js/server/recovery/applier-restart.js
index 051b3ef895..b979e3adf8 100644
--- a/tests/js/server/recovery/applier-restart.js
+++ b/tests/js/server/recovery/applier-restart.js
@@ -77,6 +77,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/attributes.js b/tests/js/server/recovery/attributes.js
index b107a0a16d..a7d004d09d 100644
--- a/tests/js/server/recovery/attributes.js
+++ b/tests/js/server/recovery/attributes.js
@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/big-transaction-durability.js b/tests/js/server/recovery/big-transaction-durability.js
index a8057f7071..e3e54a6cec 100644
--- a/tests/js/server/recovery/big-transaction-durability.js
+++ b/tests/js/server/recovery/big-transaction-durability.js
@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-drop-recreate.js b/tests/js/server/recovery/collection-drop-recreate.js
index 8ca41c2b91..191b1091dd 100644
--- a/tests/js/server/recovery/collection-drop-recreate.js
+++ b/tests/js/server/recovery/collection-drop-recreate.js
@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-duplicate-name.js b/tests/js/server/recovery/collection-duplicate-name.js
index 45514756c2..cbab156d4d 100644
--- a/tests/js/server/recovery/collection-duplicate-name.js
+++ b/tests/js/server/recovery/collection-duplicate-name.js
@@ -77,6 +77,6 @@ function main (argv) {
     return runSetup();
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done();
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-duplicate.js b/tests/js/server/recovery/collection-duplicate.js
index 7e4f504875..e6c13c88bb 100644
--- a/tests/js/server/recovery/collection-duplicate.js
+++ b/tests/js/server/recovery/collection-duplicate.js
@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-keygen-rocksdb.js b/tests/js/server/recovery/collection-keygen-rocksdb.js
index 67577de0b6..a67f35e89e 100644
--- a/tests/js/server/recovery/collection-keygen-rocksdb.js
+++ b/tests/js/server/recovery/collection-keygen-rocksdb.js
@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-keygen.js b/tests/js/server/recovery/collection-keygen.js
index 4b7066fc11..e772563605 100644
--- a/tests/js/server/recovery/collection-keygen.js
+++ b/tests/js/server/recovery/collection-keygen.js
@@ -123,6 +123,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-properties.js b/tests/js/server/recovery/collection-properties.js
index fb6ca4ecc4..ecb4f14bf2 100644
--- a/tests/js/server/recovery/collection-properties.js
+++ b/tests/js/server/recovery/collection-properties.js
@@ -129,6 +129,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-recreate.js b/tests/js/server/recovery/collection-recreate.js
index db9779d72f..6233536456 100644
--- a/tests/js/server/recovery/collection-recreate.js
+++ b/tests/js/server/recovery/collection-recreate.js
@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-rename-recreate-flush.js b/tests/js/server/recovery/collection-rename-recreate-flush.js
index 58e8190dd9..9b6e8a0ca5 100644
--- a/tests/js/server/recovery/collection-rename-recreate-flush.js
+++ b/tests/js/server/recovery/collection-rename-recreate-flush.js
@@ -113,6 +113,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-rename-recreate.js b/tests/js/server/recovery/collection-rename-recreate.js
index abeaa90053..802d5e6fe2 100644
--- a/tests/js/server/recovery/collection-rename-recreate.js
+++ b/tests/js/server/recovery/collection-rename-recreate.js
@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-rename-with-data.js b/tests/js/server/recovery/collection-rename-with-data.js
index 21553f1d06..aa5b8f1ab7 100644
--- a/tests/js/server/recovery/collection-rename-with-data.js
+++ b/tests/js/server/recovery/collection-rename-with-data.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-rename.js b/tests/js/server/recovery/collection-rename.js
index 1f4d566dc0..a0c60916ae 100644
--- a/tests/js/server/recovery/collection-rename.js
+++ b/tests/js/server/recovery/collection-rename.js
@@ -126,6 +126,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collection-unload.js b/tests/js/server/recovery/collection-unload.js
index 3d04396784..0bb559dfe4 100644
--- a/tests/js/server/recovery/collection-unload.js
+++ b/tests/js/server/recovery/collection-unload.js
@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collections-different-attributes.js b/tests/js/server/recovery/collections-different-attributes.js
index c181afd65b..575f348566 100644
--- a/tests/js/server/recovery/collections-different-attributes.js
+++ b/tests/js/server/recovery/collections-different-attributes.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collections-reuse.js b/tests/js/server/recovery/collections-reuse.js
index b44d55754f..e755c62b81 100644
--- a/tests/js/server/recovery/collections-reuse.js
+++ b/tests/js/server/recovery/collections-reuse.js
@@ -126,6 +126,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/collector-oom.js b/tests/js/server/recovery/collector-oom.js
index 271dbe26e6..986d6c9990 100644
--- a/tests/js/server/recovery/collector-oom.js
+++ b/tests/js/server/recovery/collector-oom.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/corrupt-wal-marker-multiple.js b/tests/js/server/recovery/corrupt-wal-marker-multiple.js
index d47d2c70fb..6b9fa3debe 100644
--- a/tests/js/server/recovery/corrupt-wal-marker-multiple.js
+++ b/tests/js/server/recovery/corrupt-wal-marker-multiple.js
@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js b/tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js
index 17f6ac32a8..210203f30a 100644
--- a/tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js
+++ b/tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js
@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/corrupted-crc-mmfiles.js b/tests/js/server/recovery/corrupted-crc-mmfiles.js
index a21ae94d8e..89e624c172 100644
--- a/tests/js/server/recovery/corrupted-crc-mmfiles.js
+++ b/tests/js/server/recovery/corrupted-crc-mmfiles.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/countermanager-delay-rocksdb.js b/tests/js/server/recovery/countermanager-delay-rocksdb.js
index a5d200a1ef..f282fc02dc 100644
--- a/tests/js/server/recovery/countermanager-delay-rocksdb.js
+++ b/tests/js/server/recovery/countermanager-delay-rocksdb.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/countermanager-sync-rocksdb.js b/tests/js/server/recovery/countermanager-sync-rocksdb.js
index ccfd12aad9..64b08d743e 100644
--- a/tests/js/server/recovery/countermanager-sync-rocksdb.js
+++ b/tests/js/server/recovery/countermanager-sync-rocksdb.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-and-drop-databases.js b/tests/js/server/recovery/create-and-drop-databases.js
index f18eeb1336..50fa8462be 100644
--- a/tests/js/server/recovery/create-and-drop-databases.js
+++ b/tests/js/server/recovery/create-and-drop-databases.js
@@ -107,6 +107,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-collection-fail.js b/tests/js/server/recovery/create-collection-fail.js
index b3b147c91d..eef398c656 100644
--- a/tests/js/server/recovery/create-collection-fail.js
+++ b/tests/js/server/recovery/create-collection-fail.js
@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-collection-tmpfile-mmfiles.js b/tests/js/server/recovery/create-collection-tmpfile-mmfiles.js
index 3fbfbffadb..d1347224ba 100644
--- a/tests/js/server/recovery/create-collection-tmpfile-mmfiles.js
+++ b/tests/js/server/recovery/create-collection-tmpfile-mmfiles.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-collections.js b/tests/js/server/recovery/create-collections.js
index 223f78909e..a8ad12d735 100644
--- a/tests/js/server/recovery/create-collections.js
+++ b/tests/js/server/recovery/create-collections.js
@@ -178,6 +178,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-database-existing.js b/tests/js/server/recovery/create-database-existing.js
index a410e40335..aa59c8305b 100644
--- a/tests/js/server/recovery/create-database-existing.js
+++ b/tests/js/server/recovery/create-database-existing.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-database-fail-mmfiles.js b/tests/js/server/recovery/create-database-fail-mmfiles.js
index f143563c4b..aa276e2625 100644
--- a/tests/js/server/recovery/create-database-fail-mmfiles.js
+++ b/tests/js/server/recovery/create-database-fail-mmfiles.js
@@ -103,6 +103,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-database-recovery.js b/tests/js/server/recovery/create-database-recovery.js
index 6c04e8c688..b48b2a94a3 100644
--- a/tests/js/server/recovery/create-database-recovery.js
+++ b/tests/js/server/recovery/create-database-recovery.js
@@ -76,6 +76,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-databases.js b/tests/js/server/recovery/create-databases.js
index d6adbd7f68..e7661955fc 100644
--- a/tests/js/server/recovery/create-databases.js
+++ b/tests/js/server/recovery/create-databases.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-indexes.js b/tests/js/server/recovery/create-indexes.js
index 883024e6b8..de285a3abd 100644
--- a/tests/js/server/recovery/create-indexes.js
+++ b/tests/js/server/recovery/create-indexes.js
@@ -115,6 +115,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-with-temp-mmfiles.js b/tests/js/server/recovery/create-with-temp-mmfiles.js
index f55c72e5b4..082e717d8e 100644
--- a/tests/js/server/recovery/create-with-temp-mmfiles.js
+++ b/tests/js/server/recovery/create-with-temp-mmfiles.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/create-with-temp-old-mmfiles.js b/tests/js/server/recovery/create-with-temp-old-mmfiles.js
index 5f1503f953..1d09129880 100644
--- a/tests/js/server/recovery/create-with-temp-old-mmfiles.js
+++ b/tests/js/server/recovery/create-with-temp-old-mmfiles.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/die-during-collector-mmfiles.js b/tests/js/server/recovery/die-during-collector-mmfiles.js
index d4566f5326..b99db6b8b2 100644
--- a/tests/js/server/recovery/die-during-collector-mmfiles.js
+++ b/tests/js/server/recovery/die-during-collector-mmfiles.js
@@ -111,6 +111,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/disk-full-datafile.js b/tests/js/server/recovery/disk-full-datafile.js
index 2996df7b65..ec50355c9e 100644
--- a/tests/js/server/recovery/disk-full-datafile.js
+++ b/tests/js/server/recovery/disk-full-datafile.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/disk-full-logfile-data-mmfiles.js b/tests/js/server/recovery/disk-full-logfile-data-mmfiles.js
index cca828ac40..980b0b6ecb 100644
--- a/tests/js/server/recovery/disk-full-logfile-data-mmfiles.js
+++ b/tests/js/server/recovery/disk-full-logfile-data-mmfiles.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/disk-full-logfile-mmfiles.js b/tests/js/server/recovery/disk-full-logfile-mmfiles.js
index 26b217fc3f..c455334645 100644
--- a/tests/js/server/recovery/disk-full-logfile-mmfiles.js
+++ b/tests/js/server/recovery/disk-full-logfile-mmfiles.js
@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/disk-full-no-collection-journal.js b/tests/js/server/recovery/disk-full-no-collection-journal.js
index 1832f4e68c..afe4e3e91c 100644
--- a/tests/js/server/recovery/disk-full-no-collection-journal.js
+++ b/tests/js/server/recovery/disk-full-no-collection-journal.js
@@ -112,6 +112,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/documents.js b/tests/js/server/recovery/documents.js
index 5a32454701..e0c76c8477 100644
--- a/tests/js/server/recovery/documents.js
+++ b/tests/js/server/recovery/documents.js
@@ -76,6 +76,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-collections.js b/tests/js/server/recovery/drop-collections.js
index e650b7c356..65b0fff10b 100644
--- a/tests/js/server/recovery/drop-collections.js
+++ b/tests/js/server/recovery/drop-collections.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-database-and-fail.js b/tests/js/server/recovery/drop-database-and-fail.js
index b426000cb5..5849103c28 100644
--- a/tests/js/server/recovery/drop-database-and-fail.js
+++ b/tests/js/server/recovery/drop-database-and-fail.js
@@ -99,6 +99,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-database-flush-and-fail.js b/tests/js/server/recovery/drop-database-flush-and-fail.js
index 8b2eaedc80..3ac375fb56 100644
--- a/tests/js/server/recovery/drop-database-flush-and-fail.js
+++ b/tests/js/server/recovery/drop-database-flush-and-fail.js
@@ -93,6 +93,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-database-only-tmp-mmfiles.js b/tests/js/server/recovery/drop-database-only-tmp-mmfiles.js
index 6bf11a92a4..c8ce7f9252 100644
--- a/tests/js/server/recovery/drop-database-only-tmp-mmfiles.js
+++ b/tests/js/server/recovery/drop-database-only-tmp-mmfiles.js
@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-databases.js b/tests/js/server/recovery/drop-databases.js
index 5bc7ca6e4c..3d3f88ae24 100644
--- a/tests/js/server/recovery/drop-databases.js
+++ b/tests/js/server/recovery/drop-databases.js
@@ -108,6 +108,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-index-shutdown.js b/tests/js/server/recovery/drop-index-shutdown.js
index db39e11686..30f21cc62e 100644
--- a/tests/js/server/recovery/drop-index-shutdown.js
+++ b/tests/js/server/recovery/drop-index-shutdown.js
@@ -78,6 +78,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-index.js b/tests/js/server/recovery/drop-index.js
index f7b2b533b0..42aed8b189 100644
--- a/tests/js/server/recovery/drop-index.js
+++ b/tests/js/server/recovery/drop-index.js
@@ -82,6 +82,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-indexes.js b/tests/js/server/recovery/drop-indexes.js
index 9ca053dc0a..2366eb2f99 100644
--- a/tests/js/server/recovery/drop-indexes.js
+++ b/tests/js/server/recovery/drop-indexes.js
@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/drop-single-collection.js b/tests/js/server/recovery/drop-single-collection.js
index da1e3c6c21..fb555aac39 100644
--- a/tests/js/server/recovery/drop-single-collection.js
+++ b/tests/js/server/recovery/drop-single-collection.js
@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/edges.js b/tests/js/server/recovery/edges.js
index b9a75b8677..273bc34a24 100644
--- a/tests/js/server/recovery/edges.js
+++ b/tests/js/server/recovery/edges.js
@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/empty-datafiles-mmfiles.js b/tests/js/server/recovery/empty-datafiles-mmfiles.js
index 89fa2ac05f..7b7d19348a 100644
--- a/tests/js/server/recovery/empty-datafiles-mmfiles.js
+++ b/tests/js/server/recovery/empty-datafiles-mmfiles.js
@@ -62,6 +62,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/empty-logfiles-mmfiles.js b/tests/js/server/recovery/empty-logfiles-mmfiles.js
index 19fa4b1c99..cbd971adc7 100644
--- a/tests/js/server/recovery/empty-logfiles-mmfiles.js
+++ b/tests/js/server/recovery/empty-logfiles-mmfiles.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/flush-drop-database-and-fail.js b/tests/js/server/recovery/flush-drop-database-and-fail.js
index df1fecde20..5161e6b7d2 100644
--- a/tests/js/server/recovery/flush-drop-database-and-fail.js
+++ b/tests/js/server/recovery/flush-drop-database-and-fail.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/foxx-directories.js b/tests/js/server/recovery/foxx-directories.js
index 389ebf7773..29a592b9e0 100644
--- a/tests/js/server/recovery/foxx-directories.js
+++ b/tests/js/server/recovery/foxx-directories.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-after-flush.js b/tests/js/server/recovery/indexes-after-flush.js
index 55283f91f3..c4c66867a0 100644
--- a/tests/js/server/recovery/indexes-after-flush.js
+++ b/tests/js/server/recovery/indexes-after-flush.js
@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-geo-potslot.js b/tests/js/server/recovery/indexes-geo-potslot.js
index f0b49d7423..70294fa398 100644
--- a/tests/js/server/recovery/indexes-geo-potslot.js
+++ b/tests/js/server/recovery/indexes-geo-potslot.js
@@ -94,6 +94,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-geo.js b/tests/js/server/recovery/indexes-geo.js
index d3326e5729..a5eeabf293 100644
--- a/tests/js/server/recovery/indexes-geo.js
+++ b/tests/js/server/recovery/indexes-geo.js
@@ -149,6 +149,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-hash.js b/tests/js/server/recovery/indexes-hash.js
index 775a6ce1bf..2db00d2d47 100644
--- a/tests/js/server/recovery/indexes-hash.js
+++ b/tests/js/server/recovery/indexes-hash.js
@@ -183,6 +183,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-persistent-nosync.js b/tests/js/server/recovery/indexes-persistent-nosync.js
index d84547243d..391938408a 100644
--- a/tests/js/server/recovery/indexes-persistent-nosync.js
+++ b/tests/js/server/recovery/indexes-persistent-nosync.js
@@ -97,6 +97,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-persistent-restore.js b/tests/js/server/recovery/indexes-persistent-restore.js
index 3262beee5a..421ea535d3 100644
--- a/tests/js/server/recovery/indexes-persistent-restore.js
+++ b/tests/js/server/recovery/indexes-persistent-restore.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-persistent.js b/tests/js/server/recovery/indexes-persistent.js
index a501b34257..2450b28f9b 100644
--- a/tests/js/server/recovery/indexes-persistent.js
+++ b/tests/js/server/recovery/indexes-persistent.js
@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-skiplist.js b/tests/js/server/recovery/indexes-skiplist.js
index f02645ec6e..4c8ec60f32 100644
--- a/tests/js/server/recovery/indexes-skiplist.js
+++ b/tests/js/server/recovery/indexes-skiplist.js
@@ -131,6 +131,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-sparse-hash.js b/tests/js/server/recovery/indexes-sparse-hash.js
index 6840dea446..e812f03ab2 100644
--- a/tests/js/server/recovery/indexes-sparse-hash.js
+++ b/tests/js/server/recovery/indexes-sparse-hash.js
@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes-sparse-skiplist.js b/tests/js/server/recovery/indexes-sparse-skiplist.js
index e6cea6ca51..6e983ea20d 100644
--- a/tests/js/server/recovery/indexes-sparse-skiplist.js
+++ b/tests/js/server/recovery/indexes-sparse-skiplist.js
@@ -128,6 +128,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/indexes.js b/tests/js/server/recovery/indexes.js
index a936ebac47..15c3ccba26 100644
--- a/tests/js/server/recovery/indexes.js
+++ b/tests/js/server/recovery/indexes.js
@@ -129,6 +129,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/insert-update-remove-distance.js b/tests/js/server/recovery/insert-update-remove-distance.js
index ff1e8411e4..0a67a37fac 100644
--- a/tests/js/server/recovery/insert-update-remove-distance.js
+++ b/tests/js/server/recovery/insert-update-remove-distance.js
@@ -114,6 +114,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/insert-update-remove.js b/tests/js/server/recovery/insert-update-remove.js
index 1e8a35c5da..956d191e38 100644
--- a/tests/js/server/recovery/insert-update-remove.js
+++ b/tests/js/server/recovery/insert-update-remove.js
@@ -117,6 +117,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/insert-update-replace.js b/tests/js/server/recovery/insert-update-replace.js
index bd20652e76..fb67d4ef03 100644
--- a/tests/js/server/recovery/insert-update-replace.js
+++ b/tests/js/server/recovery/insert-update-replace.js
@@ -94,6 +94,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-abort-rocksdb.js
index 7b0de18d5e..6fc197d292 100644
--- a/tests/js/server/recovery/intermediate-commit-abort-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-abort-rocksdb.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js
index 5e206f81f1..b6d9c536ed 100644
--- a/tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js
index 666154e954..84b78e110f 100644
--- a/tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-aql-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-rocksdb.js
index da839889d4..9ada8316e8 100644
--- a/tests/js/server/recovery/intermediate-commit-aql-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-aql-rocksdb.js
@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js
index abf4b4837b..46aee68fe9 100644
--- a/tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-big-rocksdb.js b/tests/js/server/recovery/intermediate-commit-big-rocksdb.js
index 31fe58691a..b8f414ad76 100644
--- a/tests/js/server/recovery/intermediate-commit-big-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-big-rocksdb.js
@@ -87,6 +87,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-rocksdb.js b/tests/js/server/recovery/intermediate-commit-rocksdb.js
index 87ed32dff6..1433c927c8 100644
--- a/tests/js/server/recovery/intermediate-commit-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-rocksdb.js
@@ -82,6 +82,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js b/tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js
index e6092358f7..8e29a1a0f4 100644
--- a/tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js
@@ -83,6 +83,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/intermediate-commits-babies-rocksdb.js b/tests/js/server/recovery/intermediate-commits-babies-rocksdb.js
index c44c6207c3..e2aba3aac1 100644
--- a/tests/js/server/recovery/intermediate-commits-babies-rocksdb.js
+++ b/tests/js/server/recovery/intermediate-commits-babies-rocksdb.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/leftover-collection-directory-mmfiles.js b/tests/js/server/recovery/leftover-collection-directory-mmfiles.js
index 06b5e83a44..28071eb57f 100644
--- a/tests/js/server/recovery/leftover-collection-directory-mmfiles.js
+++ b/tests/js/server/recovery/leftover-collection-directory-mmfiles.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/leftover-database-directory-mmfiles.js b/tests/js/server/recovery/leftover-database-directory-mmfiles.js
index 47850a4601..bcbecf5e36 100644
--- a/tests/js/server/recovery/leftover-database-directory-mmfiles.js
+++ b/tests/js/server/recovery/leftover-database-directory-mmfiles.js
@@ -102,6 +102,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/many-documents.js b/tests/js/server/recovery/many-documents.js
index 0638fc3808..5ee87cd30c 100644
--- a/tests/js/server/recovery/many-documents.js
+++ b/tests/js/server/recovery/many-documents.js
@@ -75,6 +75,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/many-inserts.js b/tests/js/server/recovery/many-inserts.js
index 612678c3ce..7a0703d197 100644
--- a/tests/js/server/recovery/many-inserts.js
+++ b/tests/js/server/recovery/many-inserts.js
@@ -85,6 +85,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/many-logs.js b/tests/js/server/recovery/many-logs.js
index 795019d56f..7434dc651e 100644
--- a/tests/js/server/recovery/many-logs.js
+++ b/tests/js/server/recovery/many-logs.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/many-updates.js b/tests/js/server/recovery/many-updates.js
index 53e91d0b3e..cecaa282be 100644
--- a/tests/js/server/recovery/many-updates.js
+++ b/tests/js/server/recovery/many-updates.js
@@ -84,6 +84,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/multi-database-durability.js b/tests/js/server/recovery/multi-database-durability.js
index 2829d98754..d8c2f88ce8 100644
--- a/tests/js/server/recovery/multi-database-durability.js
+++ b/tests/js/server/recovery/multi-database-durability.js
@@ -122,6 +122,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/multiple-journals-2-mmfiles.js b/tests/js/server/recovery/multiple-journals-2-mmfiles.js
index ed41a2909d..5fb282a773 100644
--- a/tests/js/server/recovery/multiple-journals-2-mmfiles.js
+++ b/tests/js/server/recovery/multiple-journals-2-mmfiles.js
@@ -116,6 +116,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/multiple-journals-3-mmfiles.js b/tests/js/server/recovery/multiple-journals-3-mmfiles.js
index 91ad8d1708..61944d4ccd 100644
--- a/tests/js/server/recovery/multiple-journals-3-mmfiles.js
+++ b/tests/js/server/recovery/multiple-journals-3-mmfiles.js
@@ -163,6 +163,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/multiple-journals-mmfiles.js b/tests/js/server/recovery/multiple-journals-mmfiles.js
index b79926e8a9..3270ed6640 100644
--- a/tests/js/server/recovery/multiple-journals-mmfiles.js
+++ b/tests/js/server/recovery/multiple-journals-mmfiles.js
@@ -113,6 +113,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/multiple-logs.js b/tests/js/server/recovery/multiple-logs.js
index ed3c2095d3..5beafd9ad1 100644
--- a/tests/js/server/recovery/multiple-logs.js
+++ b/tests/js/server/recovery/multiple-logs.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/no-journal.js b/tests/js/server/recovery/no-journal.js
index 48f83a729a..9803252113 100644
--- a/tests/js/server/recovery/no-journal.js
+++ b/tests/js/server/recovery/no-journal.js
@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/no-shutdown-info-multiple-logs.js b/tests/js/server/recovery/no-shutdown-info-multiple-logs.js
index 29ae806cb9..e70ca3a23f 100644
--- a/tests/js/server/recovery/no-shutdown-info-multiple-logs.js
+++ b/tests/js/server/recovery/no-shutdown-info-multiple-logs.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/no-shutdown-info-no-flush.js b/tests/js/server/recovery/no-shutdown-info-no-flush.js
index 6d4953fe19..d6ce8a1c08 100644
--- a/tests/js/server/recovery/no-shutdown-info-no-flush.js
+++ b/tests/js/server/recovery/no-shutdown-info-no-flush.js
@@ -110,6 +110,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/no-shutdown-info-with-flush.js b/tests/js/server/recovery/no-shutdown-info-with-flush.js
index 08bd22ef9f..1a1fd42bdf 100644
--- a/tests/js/server/recovery/no-shutdown-info-with-flush.js
+++ b/tests/js/server/recovery/no-shutdown-info-with-flush.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-collection-drop-indexes-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-collection-drop-indexes-rocksdb.js
index a2c1eeb898..f631c0c0ca 100644
--- a/tests/js/server/recovery/nosync-rangedelete-collection-drop-indexes-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-collection-drop-indexes-rocksdb.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-collection-drop-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-collection-drop-rocksdb.js
index 79c2fea3cc..287c7de1d1 100644
--- a/tests/js/server/recovery/nosync-rangedelete-collection-drop-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-collection-drop-rocksdb.js
@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-truncate-indexes-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-truncate-indexes-rocksdb.js
index 944005366f..86b5308bcf 100644
--- a/tests/js/server/recovery/nosync-rangedelete-truncate-indexes-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-truncate-indexes-rocksdb.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-truncate-multi-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-truncate-multi-rocksdb.js
index a9c683aeac..2d368205de 100644
--- a/tests/js/server/recovery/nosync-rangedelete-truncate-multi-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-truncate-multi-rocksdb.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-truncate-multi2-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-truncate-multi2-rocksdb.js
index 9880f294c0..d8c186cf4a 100644
--- a/tests/js/server/recovery/nosync-rangedelete-truncate-multi2-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-truncate-multi2-rocksdb.js
@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-truncate-multi3-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-truncate-multi3-rocksdb.js
index b1b9c9fcae..1b16f45f68 100644
--- a/tests/js/server/recovery/nosync-rangedelete-truncate-multi3-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-truncate-multi3-rocksdb.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/nosync-rangedelete-truncate-refill-rocksdb.js b/tests/js/server/recovery/nosync-rangedelete-truncate-refill-rocksdb.js
index 1e13175d24..16e160954d 100644
--- a/tests/js/server/recovery/nosync-rangedelete-truncate-refill-rocksdb.js
+++ b/tests/js/server/recovery/nosync-rangedelete-truncate-refill-rocksdb.js
@@ -94,6 +94,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-collection-drop-indexes-rocksdb.js b/tests/js/server/recovery/rangedelete-collection-drop-indexes-rocksdb.js
index b0e5b82ed6..840d1caabf 100644
--- a/tests/js/server/recovery/rangedelete-collection-drop-indexes-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-collection-drop-indexes-rocksdb.js
@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-collection-drop-rocksdb.js b/tests/js/server/recovery/rangedelete-collection-drop-rocksdb.js
index 20beef79b2..9b3b58d53c 100644
--- a/tests/js/server/recovery/rangedelete-collection-drop-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-collection-drop-rocksdb.js
@@ -86,6 +86,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-truncate-indexes-rocksdb.js b/tests/js/server/recovery/rangedelete-truncate-indexes-rocksdb.js
index 17b25f0f74..7a86d51ae4 100644
--- a/tests/js/server/recovery/rangedelete-truncate-indexes-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-truncate-indexes-rocksdb.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-truncate-multi-rocksdb.js b/tests/js/server/recovery/rangedelete-truncate-multi-rocksdb.js
index 4bd3922531..0a33cd7f6b 100644
--- a/tests/js/server/recovery/rangedelete-truncate-multi-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-truncate-multi-rocksdb.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-truncate-multi2-rocksdb.js b/tests/js/server/recovery/rangedelete-truncate-multi2-rocksdb.js
index a84eacac5b..4e4d3c6b62 100644
--- a/tests/js/server/recovery/rangedelete-truncate-multi2-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-truncate-multi2-rocksdb.js
@@ -93,6 +93,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/rangedelete-truncate-refill-rocksdb.js b/tests/js/server/recovery/rangedelete-truncate-refill-rocksdb.js
index 0b20b2201c..34c72fe112 100644
--- a/tests/js/server/recovery/rangedelete-truncate-refill-rocksdb.js
+++ b/tests/js/server/recovery/rangedelete-truncate-refill-rocksdb.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/recreate-collection.js b/tests/js/server/recovery/recreate-collection.js
index d0f5a09dd8..c57ce825d8 100644
--- a/tests/js/server/recovery/recreate-collection.js
+++ b/tests/js/server/recovery/recreate-collection.js
@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/recreate-databases.js b/tests/js/server/recovery/recreate-databases.js
index 1895ef96e7..360907d767 100644
--- a/tests/js/server/recovery/recreate-databases.js
+++ b/tests/js/server/recovery/recreate-databases.js
@@ -122,6 +122,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/resume-recovery-all.js b/tests/js/server/recovery/resume-recovery-all.js
index 009c313087..20c5bed07e 100644
--- a/tests/js/server/recovery/resume-recovery-all.js
+++ b/tests/js/server/recovery/resume-recovery-all.js
@@ -118,6 +118,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/resume-recovery-multi-flush.js b/tests/js/server/recovery/resume-recovery-multi-flush.js
index 70f2c3bfbe..8f514f168f 100644
--- a/tests/js/server/recovery/resume-recovery-multi-flush.js
+++ b/tests/js/server/recovery/resume-recovery-multi-flush.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/resume-recovery-other.js b/tests/js/server/recovery/resume-recovery-other.js
index ad153cc82d..10f206b592 100644
--- a/tests/js/server/recovery/resume-recovery-other.js
+++ b/tests/js/server/recovery/resume-recovery-other.js
@@ -118,6 +118,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/resume-recovery-simple.js b/tests/js/server/recovery/resume-recovery-simple.js
index cd78633f94..2175d14c71 100644
--- a/tests/js/server/recovery/resume-recovery-simple.js
+++ b/tests/js/server/recovery/resume-recovery-simple.js
@@ -90,6 +90,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/resume-recovery.js b/tests/js/server/recovery/resume-recovery.js
index f908d8bea0..53940656fe 100644
--- a/tests/js/server/recovery/resume-recovery.js
+++ b/tests/js/server/recovery/resume-recovery.js
@@ -113,6 +113,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/transaction-durability-multiple.js b/tests/js/server/recovery/transaction-durability-multiple.js
index 1d91131151..6365ae4458 100644
--- a/tests/js/server/recovery/transaction-durability-multiple.js
+++ b/tests/js/server/recovery/transaction-durability-multiple.js
@@ -110,6 +110,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/transaction-durability.js b/tests/js/server/recovery/transaction-durability.js
index 0d931e7e82..3b887f87ba 100644
--- a/tests/js/server/recovery/transaction-durability.js
+++ b/tests/js/server/recovery/transaction-durability.js
@@ -99,6 +99,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/transaction-just-committed.js b/tests/js/server/recovery/transaction-just-committed.js
index a66cbf7309..8dd2066a26 100644
--- a/tests/js/server/recovery/transaction-just-committed.js
+++ b/tests/js/server/recovery/transaction-just-committed.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/transaction-no-abort.js b/tests/js/server/recovery/transaction-no-abort.js
index 66ae6ba7d6..e34043b0b5 100644
--- a/tests/js/server/recovery/transaction-no-abort.js
+++ b/tests/js/server/recovery/transaction-no-abort.js
@@ -102,6 +102,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/transaction-no-commit.js b/tests/js/server/recovery/transaction-no-commit.js
index c150c306e3..377f789e85 100644
--- a/tests/js/server/recovery/transaction-no-commit.js
+++ b/tests/js/server/recovery/transaction-no-commit.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js
index 0025b6ca60..9f0c20d837 100644
--- a/tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js
+++ b/tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js
@@ -151,9 +151,9 @@ function main (argv) {
       return 0;
     } else {
       jsunity.run(recoverySuite);
-      return jsunity.done().status ? 0 : 1;
+      return jsunity.writeDone().status ? 0 : 1;
     }
   } else {
-    return jsunity.done();
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js
index 4eac5848f4..d714fab22d 100644
--- a/tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js
+++ b/tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js
@@ -141,9 +141,9 @@ function main (argv) {
       return 0;
     } else {
       jsunity.run(recoverySuite);
-      return jsunity.done().status ? 0 : 1;
+      return jsunity.writeDone().status ? 0 : 1;
     }
   } else {
-    return jsunity.done();
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js
index fb956e839d..3568a31fb1 100644
--- a/tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js
+++ b/tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js
@@ -151,9 +151,9 @@ function main (argv) {
       return 0;
     } else {
       jsunity.run(recoverySuite);
-      return jsunity.done().status ? 0 : 1;
+      return jsunity.writeDone().status ? 0 : 1;
     }
   } else {
-    return jsunity.done();
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-create.js b/tests/js/server/recovery/view-arangosearch-create.js
index 840bede899..aaf915962a 100644
--- a/tests/js/server/recovery/view-arangosearch-create.js
+++ b/tests/js/server/recovery/view-arangosearch-create.js
@@ -83,6 +83,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-drop.js b/tests/js/server/recovery/view-arangosearch-drop.js
index 4cdfc5904b..c8229b30f9 100644
--- a/tests/js/server/recovery/view-arangosearch-drop.js
+++ b/tests/js/server/recovery/view-arangosearch-drop.js
@@ -82,6 +82,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js
index b8c4a6205e..cd8897ba78 100644
--- a/tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-create-nonempty.js b/tests/js/server/recovery/view-arangosearch-link-create-nonempty.js
index 718ef2ee16..c3eaebae52 100644
--- a/tests/js/server/recovery/view-arangosearch-link-create-nonempty.js
+++ b/tests/js/server/recovery/view-arangosearch-link-create-nonempty.js
@@ -93,6 +93,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-create.js b/tests/js/server/recovery/view-arangosearch-link-create.js
index cc9e506731..647c6fe3b2 100644
--- a/tests/js/server/recovery/view-arangosearch-link-create.js
+++ b/tests/js/server/recovery/view-arangosearch-link-create.js
@@ -97,6 +97,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js
index cd107b47bf..cd80b5321d 100644
--- a/tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-drop-collection.js b/tests/js/server/recovery/view-arangosearch-link-drop-collection.js
index a4c1f8fc97..b45555c683 100644
--- a/tests/js/server/recovery/view-arangosearch-link-drop-collection.js
+++ b/tests/js/server/recovery/view-arangosearch-link-drop-collection.js
@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js
index 323e245d91..1dab5e2b04 100644
--- a/tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-drop.js b/tests/js/server/recovery/view-arangosearch-link-drop.js
index ad44e74a5c..296bb0987a 100644
--- a/tests/js/server/recovery/view-arangosearch-link-drop.js
+++ b/tests/js/server/recovery/view-arangosearch-link-drop.js
@@ -88,6 +88,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js
index 2f5c7aad93..f1148caca3 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js
index 8af782220e..e11abe10be 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js
index 6299fbcc82..ed11abc78e 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js
@@ -107,6 +107,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-fail.js b/tests/js/server/recovery/view-arangosearch-link-populate-fail.js
index aafb4bb2d6..f8316a3857 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-fail.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-fail.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js
index 54237932ad..69fe699a12 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js
index 296037c6e4..e5b88b1d00 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js
@@ -99,6 +99,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-no-release.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-release.js
index 9dc8d45691..9c3610cfc2 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-no-release.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-no-release.js
@@ -98,6 +98,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js
index 8755e21b7e..626d99367f 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js
@@ -105,6 +105,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-remove.js b/tests/js/server/recovery/view-arangosearch-link-populate-remove.js
index 9c60f5cddc..dded8a69bf 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-remove.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-remove.js
@@ -101,6 +101,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js
index 310b0cd306..3b5da98e38 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js
@@ -107,6 +107,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js
index 0e3bc363e4..eb9d4b3705 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js
@@ -103,6 +103,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js
index 34e337c6c6..24b347d305 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js
@@ -108,6 +108,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate-transaction.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction.js
index 76ef748aff..790e9b1c8c 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate-transaction.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate-transaction.js
@@ -104,6 +104,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-populate.js b/tests/js/server/recovery/view-arangosearch-link-populate.js
index 0805a3ce39..3acc2af6e9 100644
--- a/tests/js/server/recovery/view-arangosearch-link-populate.js
+++ b/tests/js/server/recovery/view-arangosearch-link-populate.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js
index c7c166e512..496a01702c 100644
--- a/tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js
@@ -96,6 +96,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-link-rename-collection.js b/tests/js/server/recovery/view-arangosearch-link-rename-collection.js
index 94930d0e9d..b43b4138fa 100644
--- a/tests/js/server/recovery/view-arangosearch-link-rename-collection.js
+++ b/tests/js/server/recovery/view-arangosearch-link-rename-collection.js
@@ -92,6 +92,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-modify-properties.js b/tests/js/server/recovery/view-arangosearch-modify-properties.js
index 5232fe698a..666f8f288e 100644
--- a/tests/js/server/recovery/view-arangosearch-modify-properties.js
+++ b/tests/js/server/recovery/view-arangosearch-modify-properties.js
@@ -108,6 +108,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-properties.js b/tests/js/server/recovery/view-arangosearch-properties.js
index abaf71179b..0cd248be6b 100644
--- a/tests/js/server/recovery/view-arangosearch-properties.js
+++ b/tests/js/server/recovery/view-arangosearch-properties.js
@@ -84,6 +84,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-recreate.js b/tests/js/server/recovery/view-arangosearch-recreate.js
index 21818bedd7..4887739208 100644
--- a/tests/js/server/recovery/view-arangosearch-recreate.js
+++ b/tests/js/server/recovery/view-arangosearch-recreate.js
@@ -89,6 +89,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-rename-no-flushthread-nondeterministic.js b/tests/js/server/recovery/view-arangosearch-rename-no-flushthread-nondeterministic.js
index c03713e60a..98aba3d86d 100644
--- a/tests/js/server/recovery/view-arangosearch-rename-no-flushthread-nondeterministic.js
+++ b/tests/js/server/recovery/view-arangosearch-rename-no-flushthread-nondeterministic.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-rename-query-nondeterministic.js b/tests/js/server/recovery/view-arangosearch-rename-query-nondeterministic.js
index 7482eb7cb1..6cf90fd584 100644
--- a/tests/js/server/recovery/view-arangosearch-rename-query-nondeterministic.js
+++ b/tests/js/server/recovery/view-arangosearch-rename-query-nondeterministic.js
@@ -91,6 +91,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js b/tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js
index f315dc5dfa..f3db924c25 100644
--- a/tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js
+++ b/tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-rename-recreate.js b/tests/js/server/recovery/view-arangosearch-rename-recreate.js
index 358585b357..026705ad19 100644
--- a/tests/js/server/recovery/view-arangosearch-rename-recreate.js
+++ b/tests/js/server/recovery/view-arangosearch-rename-recreate.js
@@ -95,6 +95,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-rename.js b/tests/js/server/recovery/view-arangosearch-rename.js
index b77bb872f6..ecfb5f5770 100644
--- a/tests/js/server/recovery/view-arangosearch-rename.js
+++ b/tests/js/server/recovery/view-arangosearch-rename.js
@@ -119,6 +119,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js
index 11c91878dd..1910de8f23 100644
--- a/tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js
+++ b/tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js
@@ -79,6 +79,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/view-arangosearch-view-create-drop.js b/tests/js/server/recovery/view-arangosearch-view-create-drop.js
index c5eddc4ce2..1b7e9597ea 100644
--- a/tests/js/server/recovery/view-arangosearch-view-create-drop.js
+++ b/tests/js/server/recovery/view-arangosearch-view-create-drop.js
@@ -74,6 +74,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/wait-for-sync.js b/tests/js/server/recovery/wait-for-sync.js
index 82e1173c91..b65d45b8aa 100644
--- a/tests/js/server/recovery/wait-for-sync.js
+++ b/tests/js/server/recovery/wait-for-sync.js
@@ -79,6 +79,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }
diff --git a/tests/js/server/recovery/write-throttling-mmfiles.js b/tests/js/server/recovery/write-throttling-mmfiles.js
index d536e48641..463aa3b620 100644
--- a/tests/js/server/recovery/write-throttling-mmfiles.js
+++ b/tests/js/server/recovery/write-throttling-mmfiles.js
@@ -100,6 +100,6 @@ function main (argv) {
     return 0;
   } else {
     jsunity.run(recoverySuite);
-    return jsunity.done().status ? 0 : 1;
+    return jsunity.writeDone().status ? 0 : 1;
   }
 }