diff --git a/packages/babel-generator/src/node/parentheses.js b/packages/babel-generator/src/node/parentheses.js
index 777bb6e519..4755902855 100644
--- a/packages/babel-generator/src/node/parentheses.js
+++ b/packages/babel-generator/src/node/parentheses.js
@@ -144,19 +144,15 @@ export function SequenceExpression(node: Object, parent: Object): boolean {
   return true;
 }
 
-export function AwaitExpression(node: Object, parent: Object): boolean {
-  return t.isUnaryLike(parent) ||
+export function YieldExpression(node: Object, parent: Object): boolean {
+  return t.isBinary(parent) ||
+         t.isUnaryLike(parent) ||
          t.isCallExpression(parent) ||
          t.isMemberExpression(parent) ||
          t.isNewExpression(parent);
 }
 
-export function YieldExpression(node: Object, parent: Object): boolean {
-  return t.isUnaryLike(parent) ||
-         t.isCallExpression(parent) ||
-         t.isMemberExpression(parent) ||
-         t.isNewExpression(parent);
-}
+export { YieldExpression as AwaitExpression };
 
 export function ClassExpression(node: Object, parent: Object): boolean {
   // (class {});
diff --git a/packages/babel-generator/test/fixtures/parentheses/await-expression/expected.js b/packages/babel-generator/test/fixtures/parentheses/await-expression/expected.js
index d154d585d2..a5ec177acd 100644
--- a/packages/babel-generator/test/fixtures/parentheses/await-expression/expected.js
+++ b/packages/babel-generator/test/fixtures/parentheses/await-expression/expected.js
@@ -1,5 +1,5 @@
 async function asdf() {
-  await 1 || await 2;
+  (await 1) || (await 2);
   (await b)();
   new (await b)();
   true ? await 1 : await 2;
diff --git a/packages/babel-generator/test/fixtures/parentheses/yield-expression/expected.js b/packages/babel-generator/test/fixtures/parentheses/yield-expression/expected.js
index 5c191ac909..9d5aab1a3a 100644
--- a/packages/babel-generator/test/fixtures/parentheses/yield-expression/expected.js
+++ b/packages/babel-generator/test/fixtures/parentheses/yield-expression/expected.js
@@ -1,5 +1,5 @@
 function* asdf() {
-  yield 1 || yield 2;
+  (yield 1) || (yield 2);
   (yield b)();
   new (yield b)();
   true ? yield 1 : yield 2;