diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 9c54de6ba13..68753fdb638 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -3337,10 +3337,7 @@ namespace ts {
         function parseAwaitExpression() {
             const node = <AwaitExpression>createNode(SyntaxKind.AwaitExpression);
             nextToken();
-            node.expression = token === SyntaxKind.AwaitKeyword
-                // Forbid `await await`
-                ? <UnaryExpression>createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ false, Diagnostics.Expression_expected)
-                : parseSimpleUnaryExpression();
+            node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
 
@@ -3389,7 +3386,7 @@ namespace ts {
          *      6) - UnaryExpression[?yield]
          *      7) ~ UnaryExpression[?yield]
          *      8) ! UnaryExpression[?yield]
-         *      9) await AwaitExpression[?yield]
+         *      9) [+Await] await AwaitExpression[?yield]
          */
         function parseSimpleUnaryExpression(): UnaryExpression {
             switch (token) {
diff --git a/tests/baselines/reference/awaitAwait.errors.txt b/tests/baselines/reference/awaitAwait.errors.txt
deleted file mode 100644
index 5a04051139c..00000000000
--- a/tests/baselines/reference/awaitAwait.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/awaitAwait.ts(2,11): error TS1109: Expression expected.
-
-
-==== tests/cases/compiler/awaitAwait.ts (1 errors) ====
-    async function f() {
-        await await 0;
-              ~~~~~
-!!! error TS1109: Expression expected.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/awaitAwait.js b/tests/baselines/reference/awaitAwait.js
deleted file mode 100644
index 14fb3a11505..00000000000
--- a/tests/baselines/reference/awaitAwait.js
+++ /dev/null
@@ -1,21 +0,0 @@
-//// [awaitAwait.ts]
-async function f() {
-    await await 0;
-}
-
-
-//// [awaitAwait.js]
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments)).next());
-    });
-};
-function f() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield ;
-        yield 0;
-    });
-}
diff --git a/tests/baselines/reference/castOfAwait.js b/tests/baselines/reference/castOfAwait.js
index 9d1399d9d65..95817b7f0e6 100644
--- a/tests/baselines/reference/castOfAwait.js
+++ b/tests/baselines/reference/castOfAwait.js
@@ -4,6 +4,7 @@ async function f() {
     typeof await 0;
     void await 0;
     await void <string> typeof <number> void await 0;
+    await await 0;
 }
 
 
@@ -22,5 +23,6 @@ function f() {
         typeof yield 0;
         void yield 0;
         yield void typeof void yield 0;
+        yield yield 0;
     });
 }
diff --git a/tests/baselines/reference/castOfAwait.symbols b/tests/baselines/reference/castOfAwait.symbols
index d0bca9f38c7..574ee21f773 100644
--- a/tests/baselines/reference/castOfAwait.symbols
+++ b/tests/baselines/reference/castOfAwait.symbols
@@ -6,5 +6,6 @@ async function f() {
     typeof await 0;
     void await 0;
     await void <string> typeof <number> void await 0;
+    await await 0;
 }
 
diff --git a/tests/baselines/reference/castOfAwait.types b/tests/baselines/reference/castOfAwait.types
index ba1590fe03d..ad3597f6c01 100644
--- a/tests/baselines/reference/castOfAwait.types
+++ b/tests/baselines/reference/castOfAwait.types
@@ -25,6 +25,11 @@ async function f() {
 ><number> void await 0 : number
 >void await 0 : undefined
 >await 0 : number
+>0 : number
+
+    await await 0;
+>await await 0 : number
+>await 0 : number
 >0 : number
 }
 
diff --git a/tests/cases/compiler/awaitAwait.ts b/tests/cases/compiler/awaitAwait.ts
deleted file mode 100644
index 5a405804b00..00000000000
--- a/tests/cases/compiler/awaitAwait.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @target: es6
-async function f() {
-    await await 0;
-}
diff --git a/tests/cases/compiler/castOfAwait.ts b/tests/cases/compiler/castOfAwait.ts
index 6a152226ea2..fcd8f999e9f 100644
--- a/tests/cases/compiler/castOfAwait.ts
+++ b/tests/cases/compiler/castOfAwait.ts
@@ -4,4 +4,5 @@ async function f() {
     typeof await 0;
     void await 0;
     await void <string> typeof <number> void await 0;
+    await await 0;
 }