Nested before error using wrong test name in error message

lib/runner.js

@@ -324,6 +324,10 @@ Runner.prototype.hook = function(name, fn) {
             hook.pending = true;
           }
         } else {
+          if (!self.suite.bail()) {
+            // set the current test to the next one to run so the error message is correct
+            hook.ctx.currentTest = suite.tests[0];
+          }
           self.failHook(hook, err);
 
           // stop executing hooks, notify callee of hook err

test/integration/fixtures/hooks/after-nested-hook-error.fixture.js

@@ -0,0 +1,20 @@
+'use strict';
+
+describe('spec 1', function () {
+  it('should not blame me', function () {
+    console.log('test 1');
+  });
+  describe('nested 1', function () {
+    after(function() {
+      throw new Error('Nested before hook error');
+    });
+    it('blames me', function () {
+      console.log('test 2');
+    });
+  });
+  describe('nested 2', function() {
+    it('should not blame me either', function() {
+      console.log('test 3');
+    });
+  });
+});

test/integration/fixtures/hooks/before-nested-hook-error.fixture.js

@@ -0,0 +1,15 @@
+'use strict';
+
+describe('spec 1', function () {
+  it('should not blame me', function () {
+    console.log('test 1');
+  });
+  describe('nested 1', function () {
+    before(function() {
+      throw new Error('Nested before hook error');
+    });
+    it('blames me', function () {
+      console.log('test 2');
+    });
+  });
+});

test/integration/hook-err.spec.js

@@ -17,7 +17,21 @@ describe('hook error handling', function() {
   describe('before hook error tip', function() {
     before(run('hooks/before-hook-error-tip.fixture.js', onlyErrorTitle()));
     it('should verify results', function() {
-      expect(lines, 'to equal', ['1) spec 2', '"before all" hook:']);
+      expect(lines, 'to equal', [
+        '1) spec 2',
+        '"before all" hook for "skipped":'
+      ]);
+    });
+  });
+
+  describe('nested before hook error', function() {
+    before(run('hooks/before-nested-hook-error.fixture.js', onlyErrorTitle()));
+    it('should verify results', function() {
+      expect(lines, 'to equal', [
+        '1) spec 1',
+        'nested 1',
+        '"before all" hook for "blames me":'
+      ]);
     });
   });
 
@@ -35,6 +49,17 @@ describe('hook error handling', function() {
     });
   });
 
+  describe('nested after hook error', function() {
+    before(run('hooks/after-nested-hook-error.fixture.js', onlyErrorTitle()));
+    it('should verify results', function() {
+      expect(lines, 'to equal', [
+        '1) spec 1',
+        'nested 1',
+        '"after all" hook for "blames me":'
+      ]);
+    });
+  });
+
   describe('after each hook error', function() {
     before(run('hooks/afterEach-hook-error.fixture.js'));
     it('should verify results', function() {