diff --git a/api.js b/api.js
index 21f42e15c..2234af950 100644
--- a/api.js
+++ b/api.js
@@ -84,8 +84,14 @@ Api.prototype._handleTest = function (test) {
 			if (test.error.originalMessage) {
 				message = test.error.originalMessage + ' ' + message;
 			}
+
 			test.error.message = message;
 		}
+
+		if (test.error.name !== 'AssertionError') {
+			test.error.message = 'failed with "' + test.error.message + '"';
+		}
+
 		this.errors.push(test);
 	} else {
 		test.error = null;
diff --git a/lib/test.js b/lib/test.js
index 0cb9aea8b..5b9acc7e3 100644
--- a/lib/test.js
+++ b/lib/test.js
@@ -118,12 +118,7 @@ Test.prototype.run = function () {
 				self.exit();
 			})
 			.catch(function (err) {
-				self._setAssertError(new assert.AssertionError({
-					actual: err,
-					message: 'Promise rejected → ' + err,
-					operator: 'promise'
-				}));
-
+				self._setAssertError(err);
 				self.exit();
 			});
 	} else if (!this.metadata.callback) {
diff --git a/test/promise.js b/test/promise.js
index 8a9b887a7..81d672370 100644
--- a/test/promise.js
+++ b/test/promise.js
@@ -245,7 +245,8 @@ test('reject', function (t) {
 		});
 	}).run().catch(function (err) {
 		t.ok(err);
-		t.is(err.name, 'AssertionError');
+		t.is(err.name, 'Error');
+		t.is(err.message, 'unicorn');
 		t.end();
 	});
 });