diff --git a/test/language/expressions/async-generator/named-yield-star-sync-next.js b/test/language/expressions/async-generator/named-yield-star-sync-next.js
index 5289030dfc..64523cd556 100644
--- a/test/language/expressions/async-generator/named-yield-star-sync-next.js
+++ b/test/language/expressions/async-generator/named-yield-star-sync-next.js
@@ -197,27 +197,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/expressions/async-generator/yield-star-sync-next.js b/test/language/expressions/async-generator/yield-star-sync-next.js
index 92b8a4a13c..f05aa02cfb 100644
--- a/test/language/expressions/async-generator/yield-star-sync-next.js
+++ b/test/language/expressions/async-generator/yield-star-sync-next.js
@@ -197,27 +197,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js b/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
index c66fd67896..11fddad726 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
@@ -204,27 +204,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/expressions/class/async-gen-method-yield-star-sync-next.js b/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
index 70b7ae8ae3..22e7e5d0c4 100644
--- a/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
+++ b/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
@@ -204,27 +204,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
index 437c049b7c..9f3673d463 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
@@ -197,27 +197,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/statements/async-generator/yield-star-sync-next.js b/test/language/statements/async-generator/yield-star-sync-next.js
index f3dfe46263..2f260688e2 100644
--- a/test/language/statements/async-generator/yield-star-sync-next.js
+++ b/test/language/statements/async-generator/yield-star-sync-next.js
@@ -197,27 +197,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js b/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
index bdb289cf6e..e32a47d826 100644
--- a/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
+++ b/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
@@ -204,27 +204,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);
 
diff --git a/test/language/statements/class/async-gen-method-yield-star-sync-next.js b/test/language/statements/class/async-gen-method-yield-star-sync-next.js
index 8ebd7af6cf..5e9bab7ec7 100644
--- a/test/language/statements/class/async-gen-method-yield-star-sync-next.js
+++ b/test/language/statements/class/async-gen-method-yield-star-sync-next.js
@@ -204,27 +204,24 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log.length, 8, "log.length");
 
   iter.next("next-arg-2").then(v => {
-    assert.sameValue(log[8].name, "get next");
-    assert.sameValue(log[8].thisValue.name, "syncIterator", "get next thisValue");
+    assert.sameValue(log[8].name, "call next");
+    assert.sameValue(log[8].thisValue.name, "syncIterator", "next thisValue");
+    assert.sameValue(log[8].args.length, 1, "next args.length");
+    assert.sameValue(log[8].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[9].name, "call next");
-    assert.sameValue(log[9].thisValue.name, "syncIterator", "next thisValue");
-    assert.sameValue(log[9].args.length, 1, "next args.length");
-    assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
+    assert.sameValue(log[9].name, "get next done (2)");
+    assert.sameValue(log[9].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[10].name, "get next done (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[10].name, "get next value (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
 
-    assert.sameValue(log[11].name, "get next value (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
-
-    assert.sameValue(log[12].name, "after yield*");
-    assert.sameValue(log[12].value, "next-value-2");
+    assert.sameValue(log[11].name, "after yield*");
+    assert.sameValue(log[11].value, "next-value-2");
 
     assert.sameValue(v.value, "return-value");
     assert.sameValue(v.done, true);
 
-    assert.sameValue(log.length, 13, "log.length");
+    assert.sameValue(log.length, 12, "log.length");
   }).then($DONE, $DONE);
 }).catch($DONE);