diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/options.json
index 15db91d1e301..eeebc1a57738 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/options.json
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/options.json
@@ -1,6 +1,5 @@
 {
   "parserOpts": {
     "allowReturnOutsideFunction": true
-  },
-  "plugins": ["proposal-async-generator-functions"]
+  }
 }
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/output.js b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/output.js
index 792882550bc9..e3db99173493 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/output.js
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/lhs-member-expression/output.js
@@ -1,11 +1,11 @@
-(async function () {
+babelHelpers.asyncToGenerator(function* () {
   var _iteratorAbruptCompletion = false;
   var _didIteratorError = false;
 
   var _iteratorError;
 
   try {
-    for (var _iterator = babelHelpers.asyncIterator(y), _step; _iteratorAbruptCompletion = !(_step = await _iterator.next()).done; _iteratorAbruptCompletion = false) {
+    for (var _iterator = babelHelpers.asyncIterator(y), _step; _iteratorAbruptCompletion = !(_step = yield _iterator.next()).done; _iteratorAbruptCompletion = false) {
       obj.x = _step.value;
     }
   } catch (err) {
@@ -14,7 +14,7 @@
   } finally {
     try {
       if (_iteratorAbruptCompletion && _iterator.return != null) {
-        await _iterator.return();
+        yield _iterator.return();
       }
     } finally {
       if (_didIteratorError) {
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-single-tick/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-single-tick/options.json
index 15db91d1e301..eeebc1a57738 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-single-tick/options.json
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-single-tick/options.json
@@ -1,6 +1,5 @@
 {
   "parserOpts": {
     "allowReturnOutsideFunction": true
-  },
-  "plugins": ["proposal-async-generator-functions"]
+  }
 }
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-is-promise/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-is-promise/options.json
index 15db91d1e301..eeebc1a57738 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-is-promise/options.json
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-is-promise/options.json
@@ -1,6 +1,5 @@
 {
   "parserOpts": {
     "allowReturnOutsideFunction": true
-  },
-  "plugins": ["proposal-async-generator-functions"]
+  }
 }
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-not-accessed-when-done/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-not-accessed-when-done/options.json
index 15db91d1e301..eeebc1a57738 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-not-accessed-when-done/options.json
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/step-value-not-accessed-when-done/options.json
@@ -1,6 +1,5 @@
 {
   "parserOpts": {
     "allowReturnOutsideFunction": true
-  },
-  "plugins": ["proposal-async-generator-functions"]
+  }
 }