diff --git a/lib/test.js b/lib/test.js
index 3353d5bb..43bf905e 100644
--- a/lib/test.js
+++ b/lib/test.js
@@ -116,18 +116,21 @@ Test.prototype.run = function run() {
         && typeof callbackReturn.then === 'function'
 	) {
 		var self = this;
-		Promise.resolve(callbackReturn).then(function onResolve() {
-			if (!self.calledEnd) {
+		Promise.resolve(callbackReturn).then(
+			function onResolve() {
+				if (!self.calledEnd) {
+					self.end();
+				}
+			},
+			function onError(err) {
+				if (err instanceof Error || objectToString(err) === '[object Error]') {
+					self.ifError(err);
+				} else {
+					self.fail(err);
+				}
 				self.end();
 			}
-		})['catch'](function onError(err) {
-			if (err instanceof Error || objectToString(err) === '[object Error]') {
-				self.ifError(err);
-			} else {
-				self.fail(err);
-			}
-			self.end();
-		});
+		);
 		return;
 	}