diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt
new file mode 100644
index 00000000000..7ed41b52489
--- /dev/null
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.errors.txt
@@ -0,0 +1,34 @@
+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 (5 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.
+    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.
+    
+    function f<U>() {
+        var x: 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
new file mode 100644
index 00000000000..798a660e326
--- /dev/null
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
@@ -0,0 +1,35 @@
+//// [nonGenericTypeReferenceWithTypeArguments.ts]
+// Check that errors are reported for non-generic types with type arguments
+
+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>;
+}
+
+
+//// [nonGenericTypeReferenceWithTypeArguments.js]
+// Check that errors are reported for non-generic types with type arguments
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+var E;
+(function (E) {
+})(E || (E = {}));
+var v1;
+var v2;
+var v3;
+var v4;
+function f() {
+    var x;
+}
diff --git a/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts b/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts
new file mode 100644
index 00000000000..01679367177
--- /dev/null
+++ b/tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts
@@ -0,0 +1,15 @@
+// Check that errors are reported for non-generic types with type arguments
+
+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>;
+}