diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt
new file mode 100644
index 00000000000..3ee876feaed
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts (1 errors) ====
+    function f<T, K extends keyof T>() {
+        var t: T;
+        var k: K;
+        var v = {
+            [t]: 0,
+            ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
+            [k]: 1
+        };
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames51_ES5.js b/tests/baselines/reference/computedPropertyNames51_ES5.js
new file mode 100644
index 00000000000..9f138b37f3d
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames51_ES5.js
@@ -0,0 +1,21 @@
+//// [computedPropertyNames51_ES5.ts]
+function f<T, K extends keyof T>() {
+    var t: T;
+    var k: K;
+    var v = {
+        [t]: 0,
+        [k]: 1
+    };
+}
+
+
+//// [computedPropertyNames51_ES5.js]
+function f() {
+    var t;
+    var k;
+    var v = (_a = {},
+        _a[t] = 0,
+        _a[k] = 1,
+        _a);
+    var _a;
+}
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt
new file mode 100644
index 00000000000..b85ae8f48d0
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts (1 errors) ====
+    function f<T, K extends keyof T>() {
+        var t: T;
+        var k: K;
+        var v = {
+            [t]: 0,
+            ~~~
+!!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
+            [k]: 1
+        };
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames51_ES6.js b/tests/baselines/reference/computedPropertyNames51_ES6.js
new file mode 100644
index 00000000000..361af9cc15a
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames51_ES6.js
@@ -0,0 +1,20 @@
+//// [computedPropertyNames51_ES6.ts]
+function f<T, K extends keyof T>() {
+    var t: T;
+    var k: K;
+    var v = {
+        [t]: 0,
+        [k]: 1
+    };
+}
+
+
+//// [computedPropertyNames51_ES6.js]
+function f() {
+    var t;
+    var k;
+    var v = {
+        [t]: 0,
+        [k]: 1
+    };
+}
diff --git a/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt b/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
index 9fbd14a92fb..56dbe16a523 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames8_ES5.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts (1 errors) ====
     function f<T, U extends string>() {
         var t: T;
         var u: U;
@@ -11,7 +10,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES5.ts(6,9
             ~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
             [u]: 1
-            ~~~
-!!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         };
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt b/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
index 22674a3992c..9996f35f063 100644
--- a/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames8_ES6.errors.txt
@@ -1,8 +1,7 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts (1 errors) ====
     function f<T, U extends string>() {
         var t: T;
         var u: U;
@@ -11,7 +10,5 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts(6,9
             ~~~
 !!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
             [u]: 1
-            ~~~
-!!! error TS2464: A computed property name must be of type 'string', 'number', 'symbol', or 'any'.
         };
     }
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts
new file mode 100644
index 00000000000..1d467245fb2
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES5.ts
@@ -0,0 +1,8 @@
+function f<T, K extends keyof T>() {
+    var t: T;
+    var k: K;
+    var v = {
+        [t]: 0,
+        [k]: 1
+    };
+}
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts
new file mode 100644
index 00000000000..ca209996c4c
--- /dev/null
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames51_ES6.ts
@@ -0,0 +1,9 @@
+// @target: es6
+function f<T, K extends keyof T>() {
+    var t: T;
+    var k: K;
+    var v = {
+        [t]: 0,
+        [k]: 1
+    };
+}