diff --git a/src/lib/es2015.promise.d.ts b/src/lib/es2015.promise.d.ts
index ab33531191ffc..5e7d7829dcc2e 100644
--- a/src/lib/es2015.promise.d.ts
+++ b/src/lib/es2015.promise.d.ts
@@ -10,7 +10,7 @@ interface PromiseConstructor {
      * a resolve callback used resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+    new <T>(executor: (resolve: T extends void ? (value?: PromiseLike<void>) => void : (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 0f773e787869e..768f3e2f8e99b 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -1273,7 +1273,7 @@ declare type PropertyDecorator = (target: Object, propertyKey: string | symbol)
 declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
 declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void;
 
-declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
+declare type PromiseConstructorLike = new <T>(executor: (resolve: T extends void ? (value?: PromiseLike<void>) => void : (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void) => PromiseLike<T>;
 
 interface PromiseLike<T> {
     /**
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 8b4bb1ad212f3..36b056eab479a 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1,7 +1,7 @@
 /* @internal */ // Don't expose that we use this
 // Based on lib.es6.d.ts
 interface PromiseConstructor {
-    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+    new <T>(executor: (resolve: T extends void ? (value?: PromiseLike<void>) => void : (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
     reject(reason: any): Promise<never>;
     all<T>(values: (T | PromiseLike<T>)[]): Promise<T[]>;
 }
diff --git a/tests/baselines/reference/asyncAwaitNestedClasses_es5.js b/tests/baselines/reference/asyncAwaitNestedClasses_es5.js
index ff806b76ff15d..2a79a5fd5edaa 100644
--- a/tests/baselines/reference/asyncAwaitNestedClasses_es5.js
+++ b/tests/baselines/reference/asyncAwaitNestedClasses_es5.js
@@ -3,7 +3,7 @@
 class A {
     static B = class B {
         static func2(): Promise<void> {
-            return new Promise((resolve) => { resolve(null); });
+            return new Promise((resolve) => { resolve(); });
         }
         static C = class C {
             static async func() {
@@ -24,7 +24,7 @@ var A = /** @class */ (function () {
             function B() {
             }
             B.func2 = function () {
-                return new Promise(function (resolve) { resolve(null); });
+                return new Promise(function (resolve) { resolve(); });
             };
             return B;
         }()),
diff --git a/tests/baselines/reference/asyncAwaitNestedClasses_es5.symbols b/tests/baselines/reference/asyncAwaitNestedClasses_es5.symbols
index 339b2617fbfbb..10cf22c2544ab 100644
--- a/tests/baselines/reference/asyncAwaitNestedClasses_es5.symbols
+++ b/tests/baselines/reference/asyncAwaitNestedClasses_es5.symbols
@@ -11,7 +11,7 @@ class A {
 >func2 : Symbol(B.func2, Decl(asyncAwaitNestedClasses_es5.ts, 2, 24))
 >Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
-            return new Promise((resolve) => { resolve(null); });
+            return new Promise((resolve) => { resolve(); });
 >Promise : Symbol(Promise, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >resolve : Symbol(resolve, Decl(asyncAwaitNestedClasses_es5.ts, 4, 32))
 >resolve : Symbol(resolve, Decl(asyncAwaitNestedClasses_es5.ts, 4, 32))
diff --git a/tests/baselines/reference/asyncAwaitNestedClasses_es5.types b/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
index fd61951d5ccdc..558b4cec6a44b 100644
--- a/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
+++ b/tests/baselines/reference/asyncAwaitNestedClasses_es5.types
@@ -5,21 +5,20 @@ class A {
 
     static B = class B {
 >B : typeof B
->class B {        static func2(): Promise<void> {            return new Promise((resolve) => { resolve(null); });        }        static C = class C {            static async func() {                await B.func2();            }        }    } : typeof B
+>class B {        static func2(): Promise<void> {            return new Promise((resolve) => { resolve(); });        }        static C = class C {            static async func() {                await B.func2();            }        }    } : typeof B
 >B : typeof B
 
         static func2(): Promise<void> {
 >func2 : () => Promise<void>
 >Promise : Promise<T>
 
-            return new Promise((resolve) => { resolve(null); });
->new Promise((resolve) => { resolve(null); }) : Promise<void>
+            return new Promise((resolve) => { resolve(); });
+>new Promise((resolve) => { resolve(); }) : Promise<void>
 >Promise : PromiseConstructor
->(resolve) => { resolve(null); } : (resolve: (value?: void | PromiseLike<void>) => void) => void
->resolve : (value?: void | PromiseLike<void>) => void
->resolve(null) : void
->resolve : (value?: void | PromiseLike<void>) => void
->null : null
+>(resolve) => { resolve(); } : (resolve: (value?: PromiseLike<void>) => void) => void
+>resolve : (value?: PromiseLike<void>) => void
+>resolve() : void
+>resolve : (value?: PromiseLike<void>) => void
         }
         static C = class C {
 >C : typeof C
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.types b/tests/baselines/reference/defaultExportInAwaitExpression01.types
index 1f7de76b90eae..a68e9b88fa269 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.types
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.types
@@ -3,11 +3,11 @@ const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
 >x : Promise<{}>
 >new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
 >Promise : PromiseConstructor
->( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>( resolve, reject ) => { resolve( {} ); } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 >resolve( {} ) : void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >{} : {}
 
 export default x;
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.types b/tests/baselines/reference/defaultExportInAwaitExpression02.types
index 1f7de76b90eae..a68e9b88fa269 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.types
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.types
@@ -3,11 +3,11 @@ const x = new Promise( ( resolve, reject ) => { resolve( {} ); } );
 >x : Promise<{}>
 >new Promise( ( resolve, reject ) => { resolve( {} ); } ) : Promise<{}>
 >Promise : PromiseConstructor
->( resolve, reject ) => { resolve( {} ); } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>( resolve, reject ) => { resolve( {} ); } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 >resolve( {} ) : void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >{} : {}
 
 export default x;
diff --git a/tests/baselines/reference/inferenceLimit.types b/tests/baselines/reference/inferenceLimit.types
index 4a3989322322b..16e030241c229 100644
--- a/tests/baselines/reference/inferenceLimit.types
+++ b/tests/baselines/reference/inferenceLimit.types
@@ -21,8 +21,8 @@ export class BrokenClass {
 >Array : T[]
 >MyModule : any
 >MyModel : MyModule.MyModel
->(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void, reject: (reason?: any) => void) => Promise<void>
->resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>(resolve, reject) => {    let result: Array<MyModule.MyModel> = [];    let populateItems = (order) => {      return new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      });    };    return Promise.all(result.map(populateItems))      .then((orders: Array<MyModule.MyModel>) => {        resolve(orders);      });    } : (resolve: (value: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void, reject: (reason?: any) => void) => Promise<void>
+>resolve : (value: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
 >reject : (reason?: any) => void
 
     let result: Array<MyModule.MyModel> = [];
@@ -40,8 +40,8 @@ export class BrokenClass {
       return new Promise((resolve, reject) => {
 >new Promise((resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      }) : Promise<{}>
 >Promise : PromiseConstructor
->(resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      } : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>(resolve, reject) => {        this.doStuff(order.id)          .then((items) => {            order.items = items;            resolve(order);          });      } : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 
         this.doStuff(order.id)
@@ -69,7 +69,7 @@ export class BrokenClass {
 
             resolve(order);
 >resolve(order) : void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >order : any
 
           });
@@ -99,7 +99,7 @@ export class BrokenClass {
 
         resolve(orders);
 >resolve(orders) : void
->resolve : (value?: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
+>resolve : (value: MyModule.MyModel[] | PromiseLike<MyModule.MyModel[]>) => void
 >orders : MyModule.MyModel[]
 
       });
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
index 20d0779621c07..9ed95e6be3be9 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.types
@@ -137,8 +137,8 @@ async function out() {
     return new Promise(function (resolve, reject) {});
 >new Promise(function (resolve, reject) {}) : Promise<{}>
 >Promise : PromiseConstructor
->function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 }
 
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
index 367ac41f246f2..76beab82546b5 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.types
@@ -137,8 +137,8 @@ async function out() {
     return new Promise(function (resolve, reject) {});
 >new Promise(function (resolve, reject) {}) : Promise<{}>
 >Promise : PromiseConstructor
->function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 }
 
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
index 8dc959b1afefe..0f36116080b6e 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.types
@@ -137,8 +137,8 @@ async function out() {
     return new Promise(function (resolve, reject) {});
 >new Promise(function (resolve, reject) {}) : Promise<{}>
 >Promise : PromiseConstructor
->function (resolve, reject) {} : (resolve: (value?: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
->resolve : (value?: {} | PromiseLike<{}>) => void
+>function (resolve, reject) {} : (resolve: (value: {} | PromiseLike<{}>) => void, reject: (reason?: any) => void) => void
+>resolve : (value: {} | PromiseLike<{}>) => void
 >reject : (reason?: any) => void
 }
 
diff --git a/tests/cases/conformance/async/es5/asyncAwaitNestedClasses_es5.ts b/tests/cases/conformance/async/es5/asyncAwaitNestedClasses_es5.ts
index 222718122eff1..9187f860525b2 100644
--- a/tests/cases/conformance/async/es5/asyncAwaitNestedClasses_es5.ts
+++ b/tests/cases/conformance/async/es5/asyncAwaitNestedClasses_es5.ts
@@ -5,7 +5,7 @@
 class A {
     static B = class B {
         static func2(): Promise<void> {
-            return new Promise((resolve) => { resolve(null); });
+            return new Promise((resolve) => { resolve(); });
         }
         static C = class C {
             static async func() {