diff --git a/‎test/runner.js‎
Lines changed: 11 additions & 1 deletion b/‎test/runner.js‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎test/tests/worker.js‎
Lines changed: 4 additions & 3 deletions b/‎test/tests/worker.js‎
Lines changed: 4 additions & 3 deletions
@@ -1,13 +1,23 @@
 var fse = require("fs-extra");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var exec = require('../utils/execPromise');
+var _exec = require('../utils/execPromise');
 
 var NodeGit = require('..');
 
 var workdirPath = local("repos/workdir");
 var constWorkdirPath = local("repos/constworkdir");
 var masterSha;
+
+// Wrap exec to remove stale git locks before any git command
+function exec(command, opts) {
+  if (opts && opts.cwd && command.startsWith("git ")) {
+    try {
+      fse.removeSync(path.join(opts.cwd, ".git", "index.lock"));
+    } catch (e) {}
+  }
+  return _exec(command, opts);
+}
 var gitDir;
 var gitBackupDir;
 
 
@@ -101,7 +101,8 @@ if (Worker) {
         worker.on("error", () => {});
         worker.on("exit", (code) => {
           if (code === TERMINATED_EXIT_CODE) {
-            done();
+            // Delay to let native threads release locks after termination
+            setTimeout(done, 1000);
           } else {
             assert.fail();
           }
@@ -144,7 +145,7 @@ if (Worker) {
       worker.on("error", () => {});
       worker.on("exit", (code) => {
         if (code === TERMINATED_EXIT_CODE && testOk === true) {
-          done();
+          setTimeout(done, 1000);
         }
         else {
           assert.fail();
@@ -217,7 +218,7 @@ if (Worker) {
       worker.on("error", () => {});
       worker.on("exit", (code) => {
         if (code === TERMINATED_EXIT_CODE && testOk === true) {
-          done();
+          setTimeout(done, 1000);
         }
         else {
           assert.fail();