diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index a94a1353c2..0ebacd3ec6 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -4023,7 +4023,7 @@ function unitTest(cases, options) {
     ARANGORESTORE_BIN,
     ARANGOSH_BIN];
   for (let b = 0; b < checkFiles.length; ++b) {
-    if (! fs.isFile(checkFiles[b])) {
+    if (! fs.isFile(checkFiles[b]) && ! fs.isFile(checkFiles[b]+ ".exe" )) {
       throw "unable to locate " + checkFiles[b];
     }
   }
diff --git a/utils/generateExamples.js b/utils/generateExamples.js
index afb5838352..cb6cbab8b8 100644
--- a/utils/generateExamples.js
+++ b/utils/generateExamples.js
@@ -36,20 +36,20 @@ let ARANGOSH;
 
 function locateArangod() {
   ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod");
-  if(!fs.isFile(ARANGOD)) {
+  if(!fs.isFile(ARANGOD) && !!fs.isFile(ARANGOD + ".exe")) {
     ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangod");
   }
-  if(!fs.isFile(ARANGOD)) {
+  if(!fs.isFile(ARANGOD) && !!fs.isFile(ARANGOD + ".exe")) {
     throw "Cannot find Aarangod to execute tests against";
   }
 }
 
 function locateArangosh() {
   ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh");
-  if(!fs.isFile(ARANGOSH)) {
+  if(!fs.isFile(ARANGOSH) && !!fs.isFile(ARANGOSH + ".exe")) {
     ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangosh");
   }
-  if(!fs.isFile(ARANGOSH)) {
+  if(!fs.isFile(ARANGOSH) && !!fs.isFile(ARANGOSH + ".exe")) {
     throw "Cannot find arangosh to run tests with";
   }
 }