diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-parallel/exec.js b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-parallel/exec.js
new file mode 100644
index 000000000000..1c4ef15d5d06
--- /dev/null
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-parallel/exec.js
@@ -0,0 +1,34 @@
+const log = [];
+
+async function* inner() {
+  try {
+    log.push(1);
+    yield "a";
+    log.push(2);
+    yield "b";
+    log.push(3);
+  } finally {
+    log.push(4);
+    yield "c";
+    log.push(5);
+  }
+}
+
+async function* outer() {
+  log.push(6);
+  yield* inner();
+  log.push(7);
+}
+
+return (async () => {
+  const iterator = outer();
+
+  let res = await iterator.next();
+  expect(res).toEqual({ value: "a", done: false });
+  expect(log).toEqual([6, 1]);
+
+  const [res1, res2] = await Promise.all([ iterator.return("x"), iterator.return("y") ]);
+  expect(res1).toEqual({ value: "c", done: false });
+  expect(res2).toEqual({ value: "y", done: true });
+  expect(log).toEqual([6, 1, 4]);
+})();
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-2/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-parallel/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-2/options.json
rename to packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-parallel/options.json
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-2/exec.js b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/exec.js
similarity index 82%
rename from packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-2/exec.js
rename to packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/exec.js
index 0dec561b0638..84865ef6f3df 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-2/exec.js
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/exec.js
@@ -27,11 +27,11 @@ return (async () => {
   expect(res).toEqual({ value: "a", done: false });
   expect(log).toEqual([6, 1]);
 
-  res = await iterator.return();
+  res = await iterator.return("x");
   expect(res).toEqual({ value: "c", done: false });
   expect(log).toEqual([6, 1, 4]);
 
-  res = await iterator.return();
-  expect(res).toEqual({ value: undefined, done: true });
+  res = await iterator.return("y");
+  expect(res).toEqual({ value: "y", done: true });
   expect(log).toEqual([6, 1, 4]);
 })();
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/options.json
new file mode 100644
index 000000000000..7edb6d2fc815
--- /dev/null
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/return-method-with-finally-multiple-serial/options.json
@@ -0,0 +1,3 @@
+{
+  "minNodeVersion": "8.0.0"
+}
\ No newline at end of file