diff --git a/‎test/tests/revwalk.js‎
Lines changed: 18 additions & 20 deletions b/‎test/tests/revwalk.js‎
Lines changed: 18 additions & 20 deletions
@@ -8,6 +8,9 @@ describe("Revwalk", function() {
   var Revwalk = require("../../lib/revwalk");
   var Oid = require("../../lib/oid");
 
+  // Set a reasonable timeout here now that our repository has grown.
+  this.timeout(150000);
+
   before(function(done) {
     var test = this;
     return Repository.open(reposPath).then(function(repository) {
@@ -81,34 +84,29 @@ describe("Revwalk", function() {
     });
   });
 
-  // This test requires forcing garbage collection, so mocha needs to be run via
-  // node rather than npm, with a la `node --expose-gc [pathtohmoca] [testglob]`
-  var testGC = (global.gc ? it : it.skip);
+  // This test requires forcing garbage collection, so mocha needs to be run
+  // via node rather than npm, with a la `node --expose-gc [pathtohmoca]
+  // [testglob]`
+  var testGC = global.gc ? it : it.skip;
 
   testGC("doesnt segfault when accessing .author() twice", function(done) {
-    this.timeout(10000);
-
-    return Repository.open(reposPath).then(function(repository) {
+    Repository.open(reposPath).then(function(repository) {
       var walker = repository.createRevWalk();
-      return repository.getMasterCommit().then(function(firstCommitOnMaster) {
-        var did = false;
-        walker.walk(firstCommitOnMaster, function(error, commit) {
+
+      repository.getMasterCommit().then(function(firstCommitOnMaster) {
+        walker.walk(firstCommitOnMaster, function(err, commit) {
+          if (!err && !commit) {
+            return done();
+          }
+
           for (var i = 0; i < 1000; i++) {
-            if (true) {
-              commit.author().name();
-              commit.author().email();
-            }
+            commit.author().name();
+            commit.author().email();
+
             global.gc();
           }
-          if (!did) {
-            done();
-            did = true;
-          }
         });
       });
-    }).then(function() {
-      global.gc();
     });
   });
-
 });