diff --git a/tests/baselines/reference/defineProperty(target=es5).js b/tests/baselines/reference/defineProperty(target=es5).js
new file mode 100644
index 00000000000..85a644e0f65
--- /dev/null
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -0,0 +1,118 @@
+//// [defineProperty.ts]
+var x: "p" = "p"
+class A {
+    a = this.y
+    b
+    ["computed"] = 13
+    ;[x] = 14
+    m() { }
+    constructor(public readonly y: number) { }
+    z = this.y
+    declare notEmitted;
+}
+class B {
+}
+class C extends B {
+    z = this.ka
+    constructor(public ka: number) {
+        super()
+    }
+    ki = this.ka
+}
+
+
+//// [defineProperty.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var _a;
+var x = "p";
+var A = /** @class */ (function () {
+    function A(y) {
+        Object.defineProperty(this, "y", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: y
+        });
+        Object.defineProperty(this, "a", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.y
+        });
+        Object.defineProperty(this, "b", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "computed", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 13
+        });
+        Object.defineProperty(this, _a, {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 14
+        });
+        Object.defineProperty(this, "z", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.y
+        });
+    }
+    Object.defineProperty(A.prototype, "m", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function () { }
+    });
+    return A;
+}());
+_a = x;
+var B = /** @class */ (function () {
+    function B() {
+    }
+    return B;
+}());
+var C = /** @class */ (function (_super) {
+    __extends(C, _super);
+    function C(ka) {
+        var _this = _super.call(this) || this;
+        Object.defineProperty(_this, "ka", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ka
+        });
+        Object.defineProperty(_this, "z", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: _this.ka
+        });
+        Object.defineProperty(_this, "ki", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: _this.ka
+        });
+        return _this;
+    }
+    return C;
+}(B));
diff --git a/tests/baselines/reference/defineProperty(target=es5).symbols b/tests/baselines/reference/defineProperty(target=es5).symbols
new file mode 100644
index 00000000000..35d3be47665
--- /dev/null
+++ b/tests/baselines/reference/defineProperty(target=es5).symbols
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts ===
+var x: "p" = "p"
+>x : Symbol(x, Decl(defineProperty.ts, 0, 3))
+
+class A {
+>A : Symbol(A, Decl(defineProperty.ts, 0, 16))
+
+    a = this.y
+>a : Symbol(A.a, Decl(defineProperty.ts, 1, 9))
+>this.y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+>this : Symbol(A, Decl(defineProperty.ts, 0, 16))
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    b
+>b : Symbol(A.b, Decl(defineProperty.ts, 2, 14))
+
+    ["computed"] = 13
+>["computed"] : Symbol(A["computed"], Decl(defineProperty.ts, 3, 5))
+>"computed" : Symbol(A["computed"], Decl(defineProperty.ts, 3, 5))
+
+    ;[x] = 14
+>[x] : Symbol(A[x], Decl(defineProperty.ts, 5, 5))
+>x : Symbol(x, Decl(defineProperty.ts, 0, 3))
+
+    m() { }
+>m : Symbol(A.m, Decl(defineProperty.ts, 5, 13))
+
+    constructor(public readonly y: number) { }
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    z = this.y
+>z : Symbol(A.z, Decl(defineProperty.ts, 7, 46))
+>this.y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+>this : Symbol(A, Decl(defineProperty.ts, 0, 16))
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    declare notEmitted;
+>notEmitted : Symbol(A.notEmitted, Decl(defineProperty.ts, 8, 14))
+}
+class B {
+>B : Symbol(B, Decl(defineProperty.ts, 10, 1))
+}
+class C extends B {
+>C : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>B : Symbol(B, Decl(defineProperty.ts, 10, 1))
+
+    z = this.ka
+>z : Symbol(C.z, Decl(defineProperty.ts, 13, 19))
+>this.ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+>this : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+
+    constructor(public ka: number) {
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+
+        super()
+>super : Symbol(B, Decl(defineProperty.ts, 10, 1))
+    }
+    ki = this.ka
+>ki : Symbol(C.ki, Decl(defineProperty.ts, 17, 5))
+>this.ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+>this : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+}
+
diff --git a/tests/baselines/reference/definePropertyESNext.types b/tests/baselines/reference/defineProperty(target=es5).types
similarity index 76%
rename from tests/baselines/reference/definePropertyESNext.types
rename to tests/baselines/reference/defineProperty(target=es5).types
index 303387461a5..6bd6c745599 100644
--- a/tests/baselines/reference/definePropertyESNext.types
+++ b/tests/baselines/reference/defineProperty(target=es5).types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts ===
+=== tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts ===
 var x: "p" = "p"
 >x : "p"
 >"p" : "p"
@@ -6,9 +6,11 @@ var x: "p" = "p"
 class A {
 >A : A
 
-    a = 12
+    a = this.y
 >a : number
->12 : 12
+>this.y : number
+>this : this
+>y : number
 
     b
 >b : any
@@ -29,6 +31,12 @@ class A {
     constructor(public readonly y: number) { }
 >y : number
 
+    z = this.y
+>z : number
+>this.y : number
+>this : this
+>y : number
+
     declare notEmitted;
 >notEmitted : any
 }
diff --git a/tests/baselines/reference/definePropertyESNext.js b/tests/baselines/reference/defineProperty(target=esnext).js
similarity index 80%
rename from tests/baselines/reference/definePropertyESNext.js
rename to tests/baselines/reference/defineProperty(target=esnext).js
index 5fbd2fad7a9..53d78aa5587 100644
--- a/tests/baselines/reference/definePropertyESNext.js
+++ b/tests/baselines/reference/defineProperty(target=esnext).js
@@ -1,12 +1,13 @@
-//// [definePropertyESNext.ts]
+//// [defineProperty.ts]
 var x: "p" = "p"
 class A {
-    a = 12
+    a = this.y
     b
     ["computed"] = 13
     ;[x] = 14
     m() { }
     constructor(public readonly y: number) { }
+    z = this.y
     declare notEmitted;
 }
 class B {
@@ -20,11 +21,11 @@ class C extends B {
 }
 
 
-//// [definePropertyESNext.js]
+//// [defineProperty.js]
 var x = "p";
 class A {
     y;
-    a = 12;
+    a = this.y;
     b;
     ["computed"] = 13;
     [x] = 14;
@@ -32,6 +33,7 @@ class A {
     constructor(y) {
         this.y = y;
     }
+    z = this.y;
 }
 class B {
 }
diff --git a/tests/baselines/reference/defineProperty(target=esnext).symbols b/tests/baselines/reference/defineProperty(target=esnext).symbols
new file mode 100644
index 00000000000..35d3be47665
--- /dev/null
+++ b/tests/baselines/reference/defineProperty(target=esnext).symbols
@@ -0,0 +1,65 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts ===
+var x: "p" = "p"
+>x : Symbol(x, Decl(defineProperty.ts, 0, 3))
+
+class A {
+>A : Symbol(A, Decl(defineProperty.ts, 0, 16))
+
+    a = this.y
+>a : Symbol(A.a, Decl(defineProperty.ts, 1, 9))
+>this.y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+>this : Symbol(A, Decl(defineProperty.ts, 0, 16))
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    b
+>b : Symbol(A.b, Decl(defineProperty.ts, 2, 14))
+
+    ["computed"] = 13
+>["computed"] : Symbol(A["computed"], Decl(defineProperty.ts, 3, 5))
+>"computed" : Symbol(A["computed"], Decl(defineProperty.ts, 3, 5))
+
+    ;[x] = 14
+>[x] : Symbol(A[x], Decl(defineProperty.ts, 5, 5))
+>x : Symbol(x, Decl(defineProperty.ts, 0, 3))
+
+    m() { }
+>m : Symbol(A.m, Decl(defineProperty.ts, 5, 13))
+
+    constructor(public readonly y: number) { }
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    z = this.y
+>z : Symbol(A.z, Decl(defineProperty.ts, 7, 46))
+>this.y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+>this : Symbol(A, Decl(defineProperty.ts, 0, 16))
+>y : Symbol(A.y, Decl(defineProperty.ts, 7, 16))
+
+    declare notEmitted;
+>notEmitted : Symbol(A.notEmitted, Decl(defineProperty.ts, 8, 14))
+}
+class B {
+>B : Symbol(B, Decl(defineProperty.ts, 10, 1))
+}
+class C extends B {
+>C : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>B : Symbol(B, Decl(defineProperty.ts, 10, 1))
+
+    z = this.ka
+>z : Symbol(C.z, Decl(defineProperty.ts, 13, 19))
+>this.ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+>this : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+
+    constructor(public ka: number) {
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+
+        super()
+>super : Symbol(B, Decl(defineProperty.ts, 10, 1))
+    }
+    ki = this.ka
+>ki : Symbol(C.ki, Decl(defineProperty.ts, 17, 5))
+>this.ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+>this : Symbol(C, Decl(defineProperty.ts, 12, 1))
+>ka : Symbol(C.ka, Decl(defineProperty.ts, 15, 16))
+}
+
diff --git a/tests/baselines/reference/definePropertyES5.types b/tests/baselines/reference/defineProperty(target=esnext).types
similarity index 52%
rename from tests/baselines/reference/definePropertyES5.types
rename to tests/baselines/reference/defineProperty(target=esnext).types
index 7de77a24269..6bd6c745599 100644
--- a/tests/baselines/reference/definePropertyES5.types
+++ b/tests/baselines/reference/defineProperty(target=esnext).types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts ===
+=== tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts ===
 var x: "p" = "p"
 >x : "p"
 >"p" : "p"
@@ -37,7 +37,33 @@ class A {
 >this : this
 >y : number
 
-    declare notEmitted: boolean;
->notEmitted : boolean
+    declare notEmitted;
+>notEmitted : any
+}
+class B {
+>B : B
+}
+class C extends B {
+>C : C
+>B : B
+
+    z = this.ka
+>z : number
+>this.ka : number
+>this : this
+>ka : number
+
+    constructor(public ka: number) {
+>ka : number
+
+        super()
+>super() : void
+>super : typeof B
+    }
+    ki = this.ka
+>ki : number
+>this.ka : number
+>this : this
+>ka : number
 }
 
diff --git a/tests/baselines/reference/definePropertyES5.js b/tests/baselines/reference/definePropertyES5.js
deleted file mode 100644
index 300222fa35b..00000000000
--- a/tests/baselines/reference/definePropertyES5.js
+++ /dev/null
@@ -1,65 +0,0 @@
-//// [definePropertyES5.ts]
-var x: "p" = "p"
-class A {
-    a = this.y
-    b
-    ["computed"] = 13
-    ;[x] = 14
-    m() { }
-    constructor(public readonly y: number) { }
-    z = this.y
-    declare notEmitted: boolean;
-}
-
-
-//// [definePropertyES5.js]
-var _a;
-var x = "p";
-var A = /** @class */ (function () {
-    function A(y) {
-        Object.defineProperty(this, "y", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: y
-        });
-        Object.defineProperty(this, "a", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.y
-        });
-        Object.defineProperty(this, "b", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "computed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 13
-        });
-        Object.defineProperty(this, _a, {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 14
-        });
-        Object.defineProperty(this, "z", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.y
-        });
-    }
-    Object.defineProperty(A.prototype, "m", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () { }
-    });
-    return A;
-}());
-_a = x;
diff --git a/tests/baselines/reference/definePropertyES5.symbols b/tests/baselines/reference/definePropertyES5.symbols
deleted file mode 100644
index a77224c5cf8..00000000000
--- a/tests/baselines/reference/definePropertyES5.symbols
+++ /dev/null
@@ -1,40 +0,0 @@
-=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts ===
-var x: "p" = "p"
->x : Symbol(x, Decl(definePropertyES5.ts, 0, 3))
-
-class A {
->A : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
-
-    a = this.y
->a : Symbol(A.a, Decl(definePropertyES5.ts, 1, 9))
->this.y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
->this : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
->y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
-
-    b
->b : Symbol(A.b, Decl(definePropertyES5.ts, 2, 14))
-
-    ["computed"] = 13
->["computed"] : Symbol(A["computed"], Decl(definePropertyES5.ts, 3, 5))
->"computed" : Symbol(A["computed"], Decl(definePropertyES5.ts, 3, 5))
-
-    ;[x] = 14
->[x] : Symbol(A[x], Decl(definePropertyES5.ts, 5, 5))
->x : Symbol(x, Decl(definePropertyES5.ts, 0, 3))
-
-    m() { }
->m : Symbol(A.m, Decl(definePropertyES5.ts, 5, 13))
-
-    constructor(public readonly y: number) { }
->y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
-
-    z = this.y
->z : Symbol(A.z, Decl(definePropertyES5.ts, 7, 46))
->this.y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
->this : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
->y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
-
-    declare notEmitted: boolean;
->notEmitted : Symbol(A.notEmitted, Decl(definePropertyES5.ts, 8, 14))
-}
-
diff --git a/tests/baselines/reference/definePropertyESNext.symbols b/tests/baselines/reference/definePropertyESNext.symbols
deleted file mode 100644
index 56463362d4e..00000000000
--- a/tests/baselines/reference/definePropertyESNext.symbols
+++ /dev/null
@@ -1,56 +0,0 @@
-=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts ===
-var x: "p" = "p"
->x : Symbol(x, Decl(definePropertyESNext.ts, 0, 3))
-
-class A {
->A : Symbol(A, Decl(definePropertyESNext.ts, 0, 16))
-
-    a = 12
->a : Symbol(A.a, Decl(definePropertyESNext.ts, 1, 9))
-
-    b
->b : Symbol(A.b, Decl(definePropertyESNext.ts, 2, 10))
-
-    ["computed"] = 13
->["computed"] : Symbol(A["computed"], Decl(definePropertyESNext.ts, 3, 5))
->"computed" : Symbol(A["computed"], Decl(definePropertyESNext.ts, 3, 5))
-
-    ;[x] = 14
->[x] : Symbol(A[x], Decl(definePropertyESNext.ts, 5, 5))
->x : Symbol(x, Decl(definePropertyESNext.ts, 0, 3))
-
-    m() { }
->m : Symbol(A.m, Decl(definePropertyESNext.ts, 5, 13))
-
-    constructor(public readonly y: number) { }
->y : Symbol(A.y, Decl(definePropertyESNext.ts, 7, 16))
-
-    declare notEmitted;
->notEmitted : Symbol(A.notEmitted, Decl(definePropertyESNext.ts, 7, 46))
-}
-class B {
->B : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
-}
-class C extends B {
->C : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
->B : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
-
-    z = this.ka
->z : Symbol(C.z, Decl(definePropertyESNext.ts, 12, 19))
->this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
->this : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
->ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
-
-    constructor(public ka: number) {
->ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
-
-        super()
->super : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
-    }
-    ki = this.ka
->ki : Symbol(C.ki, Decl(definePropertyESNext.ts, 16, 5))
->this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
->this : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
->ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
-}
-
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
similarity index 85%
rename from tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts
rename to tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
index 4bfd516229f..19fb68f10d9 100644
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/defineProperty.ts
@@ -1,13 +1,14 @@
-// @target: esnext
+// @target: es5, esnext
 // @useDefineForClassFields: true
 var x: "p" = "p"
 class A {
-    a = 12
+    a = this.y
     b
     ["computed"] = 13
     ;[x] = 14
     m() { }
     constructor(public readonly y: number) { }
+    z = this.y
     declare notEmitted;
 }
 class B {
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts
deleted file mode 100644
index b9567cb4d6a..00000000000
--- a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// @target: es5
-// @useDefineForClassFields: true
-var x: "p" = "p"
-class A {
-    a = this.y
-    b
-    ["computed"] = 13
-    ;[x] = 14
-    m() { }
-    constructor(public readonly y: number) { }
-    z = this.y
-    declare notEmitted: boolean;
-}