diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt
index 7ed41b5248..b227ff0f0a 100644
--- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt
@@ -1,18 +1,21 @@
-tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(8,9): error TS2315: Type 'C' is not generic.
-tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(9,9): error TS2315: Type 'I' is not generic.
-tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(10,9): error TS2315: Type 'E' is not generic.
-tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(11,9): error TS2315: Type 'T' is not generic.
-tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(14,12): error TS2315: Type 'U' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(7,9): error TS2315: Type 'C' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(8,9): error TS2315: Type 'I' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(9,9): error TS2315: Type 'E' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(10,9): error TS2315: Type 'T' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(17,13): error TS2315: Type 'C' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(18,13): error TS2315: Type 'I' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(19,13): error TS2315: Type 'E' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(20,13): error TS2315: Type 'T' is not generic.
+tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(21,13): error TS2315: Type 'U' is not generic.
 
 
-==== tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts (5 errors) ====
+==== tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts (9 errors) ====
     // Check that errors are reported for non-generic types with type arguments
     
     class C { }
     interface I { }
     enum E { }
     type T = { };
-    
     var v1: C<string>;
             ~~~~~~~~~
 !!! error TS2315: Type 'C' is not generic.
@@ -27,8 +30,24 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeRefer
 !!! error TS2315: Type 'T' is not generic.
     
     function f<U>() {
-        var x: U<string>;
-               ~~~~~~~~~
+        class C { }
+        interface I { }
+        enum E { }
+        type T = {};
+        var v1: C<string>;
+                ~~~~~~~~~
+!!! error TS2315: Type 'C' is not generic.
+        var v2: I<string>;
+                ~~~~~~~~~
+!!! error TS2315: Type 'I' is not generic.
+        var v3: E<string>;
+                ~~~~~~~~~
+!!! error TS2315: Type 'E' is not generic.
+        var v4: T<string>;
+                ~~~~~~~~~
+!!! error TS2315: Type 'T' is not generic.
+        var v5: U<string>;
+                ~~~~~~~~~
 !!! error TS2315: Type 'U' is not generic.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
index 798a660e32..5558cb2fc8 100644
--- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
@@ -5,14 +5,21 @@ class C { }
 interface I { }
 enum E { }
 type T = { };
-
 var v1: C<string>;
 var v2: I<string>;
 var v3: E<string>;
 var v4: T<string>;
 
 function f<U>() {
-    var x: U<string>;
+    class C { }
+    interface I { }
+    enum E { }
+    type T = {};
+    var v1: C<string>;
+    var v2: I<string>;
+    var v3: E<string>;
+    var v4: T<string>;
+    var v5: U<string>;
 }
 
 
@@ -31,5 +38,17 @@ var v2;
 var v3;
 var v4;
 function f() {
-    var x;
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+    var E;
+    (function (E) {
+    })(E || (E = {}));
+    var v1;
+    var v2;
+    var v3;
+    var v4;
+    var v5;
 }
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts
index 0167936717..0d84fe7ae5 100644
--- a/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts
@@ -4,12 +4,19 @@ class C { }
 interface I { }
 enum E { }
 type T = { };
-
 var v1: C<string>;
 var v2: I<string>;
 var v3: E<string>;
 var v4: T<string>;
 
 function f<U>() {
-    var x: U<string>;
+    class C { }
+    interface I { }
+    enum E { }
+    type T = {};
+    var v1: C<string>;
+    var v2: I<string>;
+    var v3: E<string>;
+    var v4: T<string>;
+    var v5: U<string>;
 }