diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-nonstrict.js b/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-nonstrict.js
index 2d3d8ee3ee229b73bdb41d9e44a9524946f9ea0b..db9e7a11d8cb5fe23afff5a1c3c469144a574782 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-nonstrict.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-nonstrict.js
@@ -16,9 +16,16 @@ var expectedThis = fnGlobalObject(),
 
 var p = Promise.resolve(obj).then(function(arg) {
     if (this !== expectedThis) {
-        $ERROR("'this' must be global object, got " + this);
+        $DONE("'this' must be global object, got " + this);
+        return;
     }
+
     if (arg !== obj) {
-        $ERROR("Expected promise to be fulfilled by obj, actually " + arg);
+        $DONE("Expected promise to be fulfilled by obj, actually " + arg);
+        return;
     }
-}).then($DONE, $DONE);
+
+    $DONE();
+}, function() {
+  $DONE('The promise should not be rejected.');
+});
diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-strict.js b/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-strict.js
index a843cf5a55a9f15e1423a7e6a57be9f39a08216f..f79ea812840b8429e9a92f2a12b7bc238065e37b 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-strict.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-invoke-strict.js
@@ -15,9 +15,16 @@ var expectedThis = undefined,
 
 var p = Promise.resolve(obj).then(function(arg) {
     if (this !== expectedThis) {
-        $ERROR("'this' must be undefined, got " + this);
+        $DONE("'this' must be undefined, got " + this);
+        return;
     }
+
     if (arg !== obj) {
-        $ERROR("Expected promise to be fulfilled by obj, actually " + arg);
+        $DONE("Expected promise to be fulfilled by obj, actually " + arg);
+        return;
     }
-}).then($DONE, $DONE);
+
+    $DONE();
+}, function() {
+  $DONE('The promise should not be rejected.');
+});
diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-identity.js b/test/built-ins/Promise/prototype/then/rxn-handler-identity.js
index d5bf88f39c8444e753089a7b682109d10d766ce1..6230f9c9bea85691f769d25dd182c17053656e0d 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-identity.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-identity.js
@@ -14,6 +14,10 @@ var obj = {};
 var p = Promise.resolve(obj).then(/*Identity, Thrower*/)
         .then(function (arg) {
             if (arg !== obj) {
-                $ERROR("Expected promise to be fulfilled with obj, actually " + arg);
+                $DONE("Expected promise to be fulfilled with obj, actually " + arg);
+                return;
             }
-        }).then($DONE, $DONE);
+            $DONE();
+        }, function() {
+          $DONE('The promise should not be rejected.');
+        });
diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-nonstrict.js b/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-nonstrict.js
index dccad16d4dda4db622d97273b8a5c9ac70de2729..078bbe2d5bde9f55cbe873669da706283e2a6057 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-nonstrict.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-nonstrict.js
@@ -17,13 +17,17 @@ var expectedThis = fnGlobalObject(),
     obj = {};
 
 var p = Promise.reject(obj).then(function () {
-    $ERROR("Unexpected fulfillment; expected rejection.");
+    $DONE("Unexpected fulfillment; expected rejection.");
 }, function(arg) {
     if (this !== expectedThis) {
-        $ERROR("'this' must be global object, got " + this);
+        $DONE("'this' must be global object, got " + this);
+        return;
     }
 
     if (arg !== obj) {
-        $ERROR("Expected promise to be rejected with obj, actually " + arg);
+        $DONE("Expected promise to be rejected with obj, actually " + arg);
+        return;
     }
-}).then($DONE, $DONE);
+
+    $DONE();
+});
diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-strict.js b/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-strict.js
index 7ef2666b78b40a0474acd070cc13861a18499ea2..2736556e3a908c5582ae9699f75aadc385dca22d 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-strict.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-rejected-invoke-strict.js
@@ -16,13 +16,17 @@ var expectedThis = undefined,
     obj = {};
 
 var p = Promise.reject(obj).then(function () {
-    $ERROR("Unexpected fulfillment; expected rejection.");
+    $DONE("Unexpected fulfillment; expected rejection.");
 }, function(arg) {
     if (this !== expectedThis) {
-        $ERROR("'this' must be undefined, got " + this);
+        $DONE("'this' must be undefined, got " + this);
+        return;
     }
 
     if (arg !== obj) {
-        $ERROR("Expected promise to be rejected with obj, actually " + arg);
+        $DONE("Expected promise to be rejected with obj, actually " + arg);
+        return;
     }
-}).then($DONE, $DONE);
+
+    $DONE();
+});
diff --git a/test/built-ins/Promise/prototype/then/rxn-handler-thrower.js b/test/built-ins/Promise/prototype/then/rxn-handler-thrower.js
index 4c6eb976391bfdf9547b130682358c168782ac05..437792f970d62b50a8bc783796c07588e0ea7f3a 100644
--- a/test/built-ins/Promise/prototype/then/rxn-handler-thrower.js
+++ b/test/built-ins/Promise/prototype/then/rxn-handler-thrower.js
@@ -13,9 +13,11 @@ var obj = {};
 
 var p = Promise.reject(obj).then(/*Identity, Thrower*/)
         .then(function () {
-            $ERROR("Unexpected fulfillment - promise should reject.");
+            $DONE("Unexpected fulfillment - promise should reject.");
         }, function (arg) {
             if (arg !== obj) {
-                $ERROR("Expected reject reason to be obj, actually " + arg);
+                $DONE("Expected reject reason to be obj, actually " + arg);
+                return;
             }
-        }).then($DONE, $DONE);
+            $DONE();
+        });