diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
new file mode 100644
index 00000000000..ec6e6e39ee8
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -0,0 +1,33 @@
+//// [checkSuperCallBeforeThisAccessing1.ts]
+class Based { }
+class Derived extends Based {
+    public x: number;
+    constructor() {
+        super();
+        this;
+        this.x = 10;
+        var that = this;
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing1.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Based = (function () {
+    function Based() {
+    }
+    return Based;
+})();
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        _super.call(this);
+        this;
+        this.x = 10;
+        var that = this;
+    }
+    return Derived;
+})(Based);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols
new file mode 100644
index 00000000000..008d1156b56
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts ===
+class Based { }
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0))
+
+class Derived extends Based {
+>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0))
+
+    public x: number;
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+
+    constructor() {
+        super();
+>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0))
+
+        this;
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
+
+        this.x = 10;
+>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29))
+
+        var that = this;
+>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing1.ts, 7, 11))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15))
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types
new file mode 100644
index 00000000000..f6114d28997
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts ===
+class Based { }
+>Based : Based
+
+class Derived extends Based {
+>Derived : Derived
+>Based : Based
+
+    public x: number;
+>x : number
+
+    constructor() {
+        super();
+>super() : void
+>super : typeof Based
+
+        this;
+>this : Derived
+
+        this.x = 10;
+>this.x = 10 : number
+>this.x : number
+>this : Derived
+>x : number
+>10 : number
+
+        var that = this;
+>that : Derived
+>this : Derived
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt
new file mode 100644
index 00000000000..2c9473976a4
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: 'super' has to be called before 'this' accessing.
+
+
+==== tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts (1 errors) ====
+    class Based { }
+    class Derived extends Based {
+        public x: number;
+        constructor() {
+            this.x = 100;
+            super();
+            ~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
+            this.x = 10;
+            var that = this;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
new file mode 100644
index 00000000000..eb58afd820b
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -0,0 +1,33 @@
+//// [checkSuperCallBeforeThisAccessing2.ts]
+class Based { }
+class Derived extends Based {
+    public x: number;
+    constructor() {
+        this.x = 100;
+        super();
+        this.x = 10;
+        var that = this;
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing2.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Based = (function () {
+    function Based() {
+    }
+    return Based;
+})();
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        this.x = 100;
+        _super.call(this);
+        this.x = 10;
+        var that = this;
+    }
+    return Derived;
+})(Based);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
new file mode 100644
index 00000000000..2c5652cf95f
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -0,0 +1,43 @@
+//// [checkSuperCallBeforeThisAccessing3.ts]
+class Based { }
+class Derived extends Based {
+    public x: number;
+    constructor() {
+        class innver {
+            public y: boolean;
+            constructor() {
+                this.y = true;
+            }
+        }
+        super();
+        this.x = 10;
+        var that = this;
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing3.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Based = (function () {
+    function Based() {
+    }
+    return Based;
+})();
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        var innver = (function () {
+            function innver() {
+                this.y = true;
+            }
+            return innver;
+        })();
+        _super.call(this);
+        this.x = 10;
+        var that = this;
+    }
+    return Derived;
+})(Based);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols
new file mode 100644
index 00000000000..8dd68fc3b74
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts ===
+class Based { }
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0))
+
+class Derived extends Based {
+>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15))
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0))
+
+    public x: number;
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+
+    constructor() {
+        class innver {
+>innver : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19))
+
+            public y: boolean;
+>y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+
+            constructor() {
+                this.y = true;
+>this.y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+>this : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19))
+>y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22))
+            }
+        }
+        super();
+>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0))
+
+        this.x = 10;
+>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15))
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29))
+
+        var that = this;
+>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing3.ts, 12, 11))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15))
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types
new file mode 100644
index 00000000000..45077a6fe5e
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts ===
+class Based { }
+>Based : Based
+
+class Derived extends Based {
+>Derived : Derived
+>Based : Based
+
+    public x: number;
+>x : number
+
+    constructor() {
+        class innver {
+>innver : innver
+
+            public y: boolean;
+>y : boolean
+
+            constructor() {
+                this.y = true;
+>this.y = true : boolean
+>this.y : boolean
+>this : innver
+>y : boolean
+>true : boolean
+            }
+        }
+        super();
+>super() : void
+>super : typeof Based
+
+        this.x = 10;
+>this.x = 10 : number
+>this.x : number
+>this : Derived
+>x : number
+>10 : number
+
+        var that = this;
+>that : Derived
+>this : Derived
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
new file mode 100644
index 00000000000..eacec00c438
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -0,0 +1,52 @@
+//// [checkSuperCallBeforeThisAccessing4.ts]
+class Based { }
+class Derived extends Based {
+    public x: number;
+    constructor() {
+        (() => {
+            this;  // No error
+        });
+        () => {
+            this;  // No error
+        };
+        (() => {
+            this;  // No error
+        })();
+        super();
+        super();
+        this.x = 10;
+        var that = this;
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing4.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Based = (function () {
+    function Based() {
+    }
+    return Based;
+})();
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        var _this = this;
+        (function () {
+            _this; // No error
+        });
+        (function () {
+            _this; // No error
+        });
+        (function () {
+            _this; // No error
+        })();
+        _super.call(this);
+        _super.call(this);
+        this.x = 10;
+        var that = this;
+    }
+    return Derived;
+})(Based);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols
new file mode 100644
index 00000000000..7101280358d
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols
@@ -0,0 +1,43 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts ===
+class Based { }
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
+
+class Derived extends Based {
+>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
+
+    public x: number;
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+
+    constructor() {
+        (() => {
+            this;  // No error
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+
+        });
+        () => {
+            this;  // No error
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+
+        };
+        (() => {
+            this;  // No error
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+
+        })();
+        super();
+>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
+
+        super();
+>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0))
+
+        this.x = 10;
+>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29))
+
+        var that = this;
+>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing4.ts, 16, 11))
+>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15))
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types
new file mode 100644
index 00000000000..965d09a4109
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types
@@ -0,0 +1,56 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts ===
+class Based { }
+>Based : Based
+
+class Derived extends Based {
+>Derived : Derived
+>Based : Based
+
+    public x: number;
+>x : number
+
+    constructor() {
+        (() => {
+>(() => {            this;  // No error        }) : () => void
+>() => {            this;  // No error        } : () => void
+
+            this;  // No error
+>this : Derived
+
+        });
+        () => {
+>() => {            this;  // No error        } : () => void
+
+            this;  // No error
+>this : Derived
+
+        };
+        (() => {
+>(() => {            this;  // No error        })() : void
+>(() => {            this;  // No error        }) : () => void
+>() => {            this;  // No error        } : () => void
+
+            this;  // No error
+>this : Derived
+
+        })();
+        super();
+>super() : void
+>super : typeof Based
+
+        super();
+>super() : void
+>super : typeof Based
+
+        this.x = 10;
+>this.x = 10 : number
+>this.x : number
+>this : Derived
+>x : number
+>10 : number
+
+        var that = this;
+>that : Derived
+>this : Derived
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt
new file mode 100644
index 00000000000..fa5cfd524cb
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: 'super' has to be called before 'this' accessing.
+
+
+==== tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts (1 errors) ====
+    class Based { constructor(...arg) { } }
+    class Derived extends Based {
+        public x: number;
+        constructor() {
+            super(this.x);
+            ~~~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
new file mode 100644
index 00000000000..489c7200050
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -0,0 +1,31 @@
+//// [checkSuperCallBeforeThisAccessing5.ts]
+class Based { constructor(...arg) { } }
+class Derived extends Based {
+    public x: number;
+    constructor() {
+        super(this.x);
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing5.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Based = (function () {
+    function Based() {
+        var arg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            arg[_i - 0] = arguments[_i];
+        }
+    }
+    return Based;
+})();
+var Derived = (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        _super.call(this, this.x);
+    }
+    return Derived;
+})(Based);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
new file mode 100644
index 00000000000..6ad9773bc5f
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -0,0 +1,36 @@
+//// [checkSuperCallBeforeThisAccessing6.ts]
+class Base {
+    constructor(...arg) {
+    }
+}
+class Super extends Base {
+    constructor() {
+        (() => this);  // No Error
+        super();
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing6.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Base = (function () {
+    function Base() {
+        var arg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            arg[_i - 0] = arguments[_i];
+        }
+    }
+    return Base;
+})();
+var Super = (function (_super) {
+    __extends(Super, _super);
+    function Super() {
+        var _this = this;
+        (function () { return _this; }); // No Error
+        _super.call(this);
+    }
+    return Super;
+})(Base);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols
new file mode 100644
index 00000000000..84bac5775ec
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts ===
+class Base {
+>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0))
+
+    constructor(...arg) {
+>arg : Symbol(arg, Decl(checkSuperCallBeforeThisAccessing6.ts, 1, 16))
+    }
+}
+class Super extends Base {
+>Super : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing6.ts, 3, 1))
+>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0))
+
+    constructor() {
+        (() => this);  // No Error
+>this : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing6.ts, 3, 1))
+
+        super();
+>super : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0))
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types
new file mode 100644
index 00000000000..8e2d285d85b
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts ===
+class Base {
+>Base : Base
+
+    constructor(...arg) {
+>arg : any[]
+    }
+}
+class Super extends Base {
+>Super : Super
+>Base : Base
+
+    constructor() {
+        (() => this);  // No Error
+>(() => this) : () => Super
+>() => this : () => Super
+>this : Super
+
+        super();
+>super() : void
+>super : typeof Base
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
new file mode 100644
index 00000000000..eafc662085f
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -0,0 +1,30 @@
+//// [checkSuperCallBeforeThisAccessing7.ts]
+class Base {
+    constructor(func: ()=>Base) {
+    }
+}
+class Super extends Base {
+    constructor() {
+        super((() => this)); // No error
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing7.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Base = (function () {
+    function Base(func) {
+    }
+    return Base;
+})();
+var Super = (function (_super) {
+    __extends(Super, _super);
+    function Super() {
+        var _this = this;
+        _super.call(this, (function () { return _this; })); // No error
+    }
+    return Super;
+})(Base);
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols
new file mode 100644
index 00000000000..3611429d2b2
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts ===
+class Base {
+>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0))
+
+    constructor(func: ()=>Base) {
+>func : Symbol(func, Decl(checkSuperCallBeforeThisAccessing7.ts, 1, 16))
+>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0))
+    }
+}
+class Super extends Base {
+>Super : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing7.ts, 3, 1))
+>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0))
+
+    constructor() {
+        super((() => this)); // No error
+>super : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0))
+>this : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing7.ts, 3, 1))
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types
new file mode 100644
index 00000000000..fa5e7dbe857
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts ===
+class Base {
+>Base : Base
+
+    constructor(func: ()=>Base) {
+>func : () => Base
+>Base : Base
+    }
+}
+class Super extends Base {
+>Super : Super
+>Base : Base
+
+    constructor() {
+        super((() => this)); // No error
+>super((() => this)) : void
+>super : typeof Base
+>(() => this) : () => Super
+>() => this : () => Super
+>this : Super
+    }
+}
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt
new file mode 100644
index 00000000000..f7c763ee708
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing.
+
+
+==== tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts (1 errors) ====
+    class Base {
+        constructor(...arg) {
+        }
+    }
+    class Super extends Base {
+        constructor() {
+            var that = this;
+            super();
+            ~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
new file mode 100644
index 00000000000..4675d328b38
--- /dev/null
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -0,0 +1,35 @@
+//// [checkSuperCallBeforeThisAccessing8.ts]
+class Base {
+    constructor(...arg) {
+    }
+}
+class Super extends Base {
+    constructor() {
+        var that = this;
+        super();
+    }
+}
+
+//// [checkSuperCallBeforeThisAccessing8.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Base = (function () {
+    function Base() {
+        var arg = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            arg[_i - 0] = arguments[_i];
+        }
+    }
+    return Base;
+})();
+var Super = (function (_super) {
+    __extends(Super, _super);
+    function Super() {
+        var that = this;
+        _super.call(this);
+    }
+    return Super;
+})(Base);
diff --git a/tests/baselines/reference/classUpdateTests.errors.txt b/tests/baselines/reference/classUpdateTests.errors.txt
index 59e9bc9ced1..55965756410 100644
--- a/tests/baselines/reference/classUpdateTests.errors.txt
+++ b/tests/baselines/reference/classUpdateTests.errors.txt
@@ -1,11 +1,11 @@
 tests/cases/compiler/classUpdateTests.ts(34,2): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/classUpdateTests.ts(43,18): error TS2335: 'super' can only be referenced in a derived class.
-tests/cases/compiler/classUpdateTests.ts(57,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/compiler/classUpdateTests.ts(59,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 tests/cases/compiler/classUpdateTests.ts(63,7): error TS2415: Class 'L' incorrectly extends base class 'G'.
   Property 'p1' is private in type 'L' but not in type 'G'.
 tests/cases/compiler/classUpdateTests.ts(69,7): error TS2415: Class 'M' incorrectly extends base class 'G'.
   Property 'p1' is private in type 'M' but not in type 'G'.
-tests/cases/compiler/classUpdateTests.ts(70,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/compiler/classUpdateTests.ts(72,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 tests/cases/compiler/classUpdateTests.ts(93,3): error TS1128: Declaration or statement expected.
 tests/cases/compiler/classUpdateTests.ts(95,1): error TS1128: Declaration or statement expected.
 tests/cases/compiler/classUpdateTests.ts(99,3): error TS1128: Declaration or statement expected.
@@ -80,14 +80,11 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st
     
     class K extends G {
     	constructor(public p1:number) { // ERROR
-    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		var i = 0;
-    ~~~~~~~~~~~~
     		super();
-    ~~~~~~~~~~
-    	}
-    ~~
+    		~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+    	}
     }
     
     class L extends G {
@@ -104,14 +101,11 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st
 !!! error TS2415: Class 'M' incorrectly extends base class 'G'.
 !!! error TS2415:   Property 'p1' is private in type 'M' but not in type 'G'.
     	constructor(private p1:number) { // ERROR
-    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		var i = 0;
-    ~~~~~~~~~~~~
     		super();
-    ~~~~~~~~~~
-    	}
-    ~~
+    		~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+    	}
     }
     
     //
diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt
index 0dba0d24cb0..7b57951d493 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt
+++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt
@@ -1,10 +1,11 @@
-tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(15,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
-tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(30,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
-tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(56,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
-tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(79,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17006: 'super' has to be called before 'this' accessing.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (4 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (5 errors) ====
     // ordering of super calls in derived constructors matters depending on other class contents
     
     class Base {
@@ -20,14 +21,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP
     
     class Derived2 extends Base {
         constructor(public y: string) {
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             var a = 1;
-    ~~~~~~~~~~~~~~~~~~
             super(); // error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+        }
     }
     
     class Derived3 extends Base {
@@ -40,14 +38,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP
     class Derived4 extends Base {
         a = 1;
         constructor(y: string) {
-        ~~~~~~~~~~~~~~~~~~~~~~~~
             var b = 2;
-    ~~~~~~~~~~~~~~~~~~
             super(); // error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+        }
     }
     
     class Derived5 extends Base {
@@ -63,7 +58,9 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP
         constructor(y: string) {
             this.a = 1;
             var b = 2;
-            super(); // ok
+            super(); // error: "super" has to be called before "this" accessing
+            ~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
@@ -71,16 +68,12 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP
         a = 1;
         b: number;
         constructor(y: string) {
-        ~~~~~~~~~~~~~~~~~~~~~~~~
             this.a = 3;
-    ~~~~~~~~~~~~~~~~~~~
             this.b = 3;
-    ~~~~~~~~~~~~~~~~~~~
             super(); // error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+        }
     }
     
     class Derived8 extends Base {
@@ -100,16 +93,12 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP
         a = 1;
         b: number;
         constructor(y: string) {
-        ~~~~~~~~~~~~~~~~~~~~~~~~
             this.a = 3;
-    ~~~~~~~~~~~~~~~~~~~
             this.b = 3;
-    ~~~~~~~~~~~~~~~~~~~
             super(); // error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+        }
     }
     
     class Derived10<T> extends Base2<T> {
diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js
index c0a1736a2a3..8e5fa82cf0f 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -47,7 +47,7 @@ class Derived6 extends Base {
     constructor(y: string) {
         this.a = 1;
         var b = 2;
-        super(); // ok
+        super(); // error: "super" has to be called before "this" accessing
     }
 }
 
@@ -155,7 +155,7 @@ var Derived6 = (function (_super) {
     function Derived6(y) {
         this.a = 1;
         var b = 2;
-        _super.call(this); // ok
+        _super.call(this); // error: "super" has to be called before "this" accessing
     }
     return Derived6;
 }(Base));
diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt
index ef43d1d6f52..d8b724e3d0f 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt
@@ -1,8 +1,9 @@
+tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing.
 tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (2 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (3 errors) ====
     class Base {
         x: string;
         constructor(a) { }
@@ -11,6 +12,8 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS
     class Derived extends Base {
         constructor() {
             super(this); // ok
+            ~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
diff --git a/tests/baselines/reference/strictModeInConstructor.errors.txt b/tests/baselines/reference/strictModeInConstructor.errors.txt
index 9a80732842a..3c38530cc12 100644
--- a/tests/baselines/reference/strictModeInConstructor.errors.txt
+++ b/tests/baselines/reference/strictModeInConstructor.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+tests/cases/compiler/strictModeInConstructor.ts(29,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 
 
 ==== tests/cases/compiler/strictModeInConstructor.ts (1 errors) ====
@@ -29,16 +29,12 @@ tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' c
         public s: number = 9;
     
         constructor () {
-        ~~~~~~~~~~~~~~~~
             var x = 1; // Error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
             super();
-    ~~~~~~~~~~~~~~~~
-            "use strict";
-    ~~~~~~~~~~~~~~~~~~~~~
-        }
-    ~~~~~
+            ~~~~~~~~
 !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
+            "use strict";
+        }
     }
     
     class Bs extends A {
diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt
index 76b90ed7c20..0200ae6f84c 100644
--- a/tests/baselines/reference/thisInInvalidContexts.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt
@@ -1,4 +1,5 @@
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
@@ -23,7 +24,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9):
         t;
         //'this' in optional super call
         constructor() {
-            super(this); // OK
+            super(this); // Error
+            ~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js
index 63a39b33b0e..75ccd12c288 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -12,7 +12,7 @@ class ClassWithNoInitializer extends BaseErrClass {
     t;
     //'this' in optional super call
     constructor() {
-        super(this); // OK
+        super(this); // Error
     }
 }
 
@@ -70,7 +70,7 @@ var ClassWithNoInitializer = (function (_super) {
     __extends(ClassWithNoInitializer, _super);
     //'this' in optional super call
     function ClassWithNoInitializer() {
-        _super.call(this, this); // OK
+        _super.call(this, this); // Error
     }
     return ClassWithNoInitializer;
 }(BaseErrClass));
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
index a1afdea661b..3a808b10bae 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt
@@ -1,4 +1,5 @@
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer.
+tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body.
 tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface.
@@ -24,7 +25,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
         t;
         //'this' in optional super call
         constructor() {
-            super(this); // OK
+            super(this); // error: "super" has to be called before "this" accessing
+            ~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index 3df51877d13..2e7e6d8b47c 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -12,7 +12,7 @@ class ClassWithNoInitializer extends BaseErrClass {
     t;
     //'this' in optional super call
     constructor() {
-        super(this); // OK
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }
 
@@ -71,7 +71,7 @@ var ClassWithNoInitializer = (function (_super) {
     __extends(ClassWithNoInitializer, _super);
     //'this' in optional super call
     function ClassWithNoInitializer() {
-        _super.call(this, this); // OK
+        _super.call(this, this); // error: "super" has to be called before "this" accessing
     }
     return ClassWithNoInitializer;
 }(BaseErrClass));
diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt
index 57255aa9582..d0be13d8adc 100644
--- a/tests/baselines/reference/thisInSuperCall.errors.txt
+++ b/tests/baselines/reference/thisInSuperCall.errors.txt
@@ -1,15 +1,18 @@
+tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17006: 'super' has to be called before 'this' accessing.
 tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location.
 tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location.
 
 
-==== tests/cases/compiler/thisInSuperCall.ts (2 errors) ====
+==== tests/cases/compiler/thisInSuperCall.ts (3 errors) ====
     class Base { 
         constructor(x: any) {}
     }
     
     class Foo extends Base {
         constructor() {
-            super(this); // no error
+            super(this); // error: "super" has to be called before "this" accessing
+            ~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
diff --git a/tests/baselines/reference/thisInSuperCall.js b/tests/baselines/reference/thisInSuperCall.js
index a867715957f..827d101c95a 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -5,7 +5,7 @@ class Base {
 
 class Foo extends Base {
     constructor() {
-        super(this); // no error
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }
 
@@ -36,7 +36,7 @@ var Base = (function () {
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
-        _super.call(this, this); // no error
+        _super.call(this, this); // error: "super" has to be called before "this" accessing
     }
     return Foo;
 }(Base));
diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt
index d3a94f79487..0559f83eb90 100644
--- a/tests/baselines/reference/thisInSuperCall2.errors.txt
+++ b/tests/baselines/reference/thisInSuperCall2.errors.txt
@@ -1,7 +1,8 @@
+tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing.
 tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location.
 
 
-==== tests/cases/compiler/thisInSuperCall2.ts (1 errors) ====
+==== tests/cases/compiler/thisInSuperCall2.ts (2 errors) ====
     class Base { 
         constructor(a: any) {}
     }
@@ -9,7 +10,9 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be
     class Foo extends Base {
         public x: number;
         constructor() {
-            super(this); // no error
+            super(this); // error: "super" has to be called before "this" accessing
+            ~~~~~~~~~~~~
+!!! error TS17006: 'super' has to be called before 'this' accessing.
         }
     }
     
diff --git a/tests/baselines/reference/thisInSuperCall2.js b/tests/baselines/reference/thisInSuperCall2.js
index 82cae46b2d6..fdffdd27d6d 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -6,7 +6,7 @@ class Base {
 class Foo extends Base {
     public x: number;
     constructor() {
-        super(this); // no error
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }
 
@@ -33,7 +33,7 @@ var Base = (function () {
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
-        _super.call(this, this); // no error
+        _super.call(this, this); // error: "super" has to be called before "this" accessing
     }
     return Foo;
 }(Base));
diff --git a/tests/cases/compiler/thisInSuperCall.ts b/tests/cases/compiler/thisInSuperCall.ts
index 6a54e9ac6f1..b7df7cbafad 100644
--- a/tests/cases/compiler/thisInSuperCall.ts
+++ b/tests/cases/compiler/thisInSuperCall.ts
@@ -4,7 +4,7 @@ class Base {
 
 class Foo extends Base {
     constructor() {
-        super(this); // no error
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }
 
diff --git a/tests/cases/compiler/thisInSuperCall2.ts b/tests/cases/compiler/thisInSuperCall2.ts
index 5de7c34cf32..2869ab9a805 100644
--- a/tests/cases/compiler/thisInSuperCall2.ts
+++ b/tests/cases/compiler/thisInSuperCall2.ts
@@ -5,7 +5,7 @@ class Base {
 class Foo extends Base {
     public x: number;
     constructor() {
-        super(this); // no error
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }
 
diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts
index edfd7ab4f8c..a054ed0f683 100644
--- a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts
+++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts
@@ -46,7 +46,7 @@ class Derived6 extends Base {
     constructor(y: string) {
         this.a = 1;
         var b = 2;
-        super(); // ok
+        super(); // error: "super" has to be called before "this" accessing
     }
 }
 
diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
index 0afbc450040..2b929318c13 100644
--- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts
@@ -11,7 +11,7 @@ class ClassWithNoInitializer extends BaseErrClass {
     t;
     //'this' in optional super call
     constructor() {
-        super(this); // OK
+        super(this); // Error
     }
 }
 
diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
index 513e56977df..e3d8ce9f5fc 100644
--- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
+++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts
@@ -11,7 +11,7 @@ class ClassWithNoInitializer extends BaseErrClass {
     t;
     //'this' in optional super call
     constructor() {
-        super(this); // OK
+        super(this); // error: "super" has to be called before "this" accessing
     }
 }