diff --git a/UnitTests/unittest.js b/UnitTests/unittest.js
index 72662cfa18..c8ada69c31 100644
--- a/UnitTests/unittest.js
+++ b/UnitTests/unittest.js
@@ -189,6 +189,8 @@ function main(argv) {
     testOutputDirectory = 'out/';    
   }
 
+  options.testOutputDirectory = testOutputDirectory;
+  
   // force json reply
   options.jsonReply = true;
 
diff --git a/js/client/modules/@arangodb/testsuites/catch.js b/js/client/modules/@arangodb/testsuites/catch.js
index ef46a58fb3..f77d9586aa 100644
--- a/js/client/modules/@arangodb/testsuites/catch.js
+++ b/js/client/modules/@arangodb/testsuites/catch.js
@@ -67,7 +67,7 @@ function catchRunner (options) {
         '-r',
         'junit',
         '-o',
-        fs.join('out', 'catch-standard.xml')];
+        fs.join(options.testOutputDirectory, 'catch-standard.xml')];
       results.basics = pu.executeAndWait(run, argv, options, 'all-catch', rootDir);
     } else {
       results.basics = {
@@ -83,7 +83,7 @@ function catchRunner (options) {
                   '-r',
                   'junit',
                   '-o',
-                  fs.join('out', 'catch-cache.xml')
+                  fs.join(options.testOutputDirectory, 'catch-cache.xml')
                  ];
       results.cache_suite = pu.executeAndWait(run, argv, options,
                                            'cache_suite', rootDir);
@@ -101,7 +101,7 @@ function catchRunner (options) {
                   '-r',
                   'junit',
                   '-o',
-                  fs.join('out', 'catch-geo.xml')
+                  fs.join(options.testOutputDirectory, 'catch-geo.xml')
                  ];
       results.geo_suite = pu.executeAndWait(run, argv, options, 'geo_suite', rootDir);
     } else {