diff --git a/lib/runnable.js b/lib/runnable.js
index 07501785a3..1f3435a617 100644
--- a/lib/runnable.js
+++ b/lib/runnable.js
@@ -314,7 +314,11 @@ Runnable.prototype.run = function(fn) {
         }
         return done(new Error('done() invoked with non-Error: ' + err));
       }
-      done();
+      if (ctx && ctx.test) {
+        done(ctx.test.err);
+      } else {
+        done();
+      }
     });
   }
 };