diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithClass.js b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js
new file mode 100644
index 00000000000..90a11364897
--- /dev/null
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js
@@ -0,0 +1,39 @@
+//// [circularTypeAliasForUnionWithClass.ts]
+var v0: T0;
+type T0 = string | I0;
+class I0 {
+    x: T0;
+}
+
+var v3: T3;
+type T3 = string | I3;
+class I3 {
+    [x: number]: T3;
+}
+
+var v4: T4;
+type T4 = string | I4;
+class I4 {
+    [x: string]: T4;
+}
+
+
+//// [circularTypeAliasForUnionWithClass.js]
+var v0;
+var I0 = (function () {
+    function I0() {
+    }
+    return I0;
+})();
+var v3;
+var I3 = (function () {
+    function I3() {
+    }
+    return I3;
+})();
+var v4;
+var I4 = (function () {
+    function I4() {
+    }
+    return I4;
+})();
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithClass.types b/tests/baselines/reference/circularTypeAliasForUnionWithClass.types
new file mode 100644
index 00000000000..99a05f3d66a
--- /dev/null
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.types
@@ -0,0 +1,49 @@
+=== tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithClass.ts ===
+var v0: T0;
+>v0 : string | I0
+>T0 : string | I0
+
+type T0 = string | I0;
+>T0 : string | I0
+>I0 : I0
+
+class I0 {
+>I0 : I0
+
+    x: T0;
+>x : string | I0
+>T0 : string | I0
+}
+
+var v3: T3;
+>v3 : string | I3
+>T3 : string | I3
+
+type T3 = string | I3;
+>T3 : string | I3
+>I3 : I3
+
+class I3 {
+>I3 : I3
+
+    [x: number]: T3;
+>x : number
+>T3 : string | I3
+}
+
+var v4: T4;
+>v4 : string | I4
+>T4 : string | I4
+
+type T4 = string | I4;
+>T4 : string | I4
+>I4 : I4
+
+class I4 {
+>I4 : I4
+
+    [x: string]: T4;
+>x : string
+>T4 : string | I4
+}
+
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.js b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.js
new file mode 100644
index 00000000000..60f4df9a8b6
--- /dev/null
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.js
@@ -0,0 +1,38 @@
+//// [circularTypeAliasForUnionWithInterface.ts]
+var v0: T0;
+type T0 = string | I0;
+interface I0 {
+    x: T0;
+}
+
+var v1: T1;
+type T1 = string | I1;
+interface I1 {
+    (): T1;
+}
+
+var v2: T2;
+type T2 = string | I2;
+interface I2 {
+    new (): T2;
+}
+
+var v3: T3;
+type T3 = string | I3;
+interface I3 {
+    [x: number]: T3;
+}
+
+var v4: T4;
+type T4 = string | I4;
+interface I4 {
+    [x: string]: T4;
+}
+
+
+//// [circularTypeAliasForUnionWithInterface.js]
+var v0;
+var v1;
+var v2;
+var v3;
+var v4;
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types
new file mode 100644
index 00000000000..4325f9c774a
--- /dev/null
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithInterface.types
@@ -0,0 +1,79 @@
+=== tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithInterface.ts ===
+var v0: T0;
+>v0 : string | I0
+>T0 : string | I0
+
+type T0 = string | I0;
+>T0 : string | I0
+>I0 : I0
+
+interface I0 {
+>I0 : I0
+
+    x: T0;
+>x : string | I0
+>T0 : string | I0
+}
+
+var v1: T1;
+>v1 : string | I1
+>T1 : string | I1
+
+type T1 = string | I1;
+>T1 : string | I1
+>I1 : I1
+
+interface I1 {
+>I1 : I1
+
+    (): T1;
+>T1 : string | I1
+}
+
+var v2: T2;
+>v2 : string | I2
+>T2 : string | I2
+
+type T2 = string | I2;
+>T2 : string | I2
+>I2 : I2
+
+interface I2 {
+>I2 : I2
+
+    new (): T2;
+>T2 : string | I2
+}
+
+var v3: T3;
+>v3 : string | I3
+>T3 : string | I3
+
+type T3 = string | I3;
+>T3 : string | I3
+>I3 : I3
+
+interface I3 {
+>I3 : I3
+
+    [x: number]: T3;
+>x : number
+>T3 : string | I3
+}
+
+var v4: T4;
+>v4 : string | I4
+>T4 : string | I4
+
+type T4 = string | I4;
+>T4 : string | I4
+>I4 : I4
+
+interface I4 {
+>I4 : I4
+
+    [x: string]: T4;
+>x : string
+>T4 : string | I4
+}
+
diff --git a/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithClass.ts b/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithClass.ts
new file mode 100644
index 00000000000..e7cca719f4b
--- /dev/null
+++ b/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithClass.ts
@@ -0,0 +1,17 @@
+var v0: T0;
+type T0 = string | I0;
+class I0 {
+    x: T0;
+}
+
+var v3: T3;
+type T3 = string | I3;
+class I3 {
+    [x: number]: T3;
+}
+
+var v4: T4;
+type T4 = string | I4;
+class I4 {
+    [x: string]: T4;
+}
diff --git a/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithInterface.ts b/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithInterface.ts
new file mode 100644
index 00000000000..c3eab454384
--- /dev/null
+++ b/tests/cases/conformance/types/typeAliases/circularTypeAliasForUnionWithInterface.ts
@@ -0,0 +1,29 @@
+var v0: T0;
+type T0 = string | I0;
+interface I0 {
+    x: T0;
+}
+
+var v1: T1;
+type T1 = string | I1;
+interface I1 {
+    (): T1;
+}
+
+var v2: T2;
+type T2 = string | I2;
+interface I2 {
+    new (): T2;
+}
+
+var v3: T3;
+type T3 = string | I3;
+interface I3 {
+    [x: number]: T3;
+}
+
+var v4: T4;
+type T4 = string | I4;
+interface I4 {
+    [x: string]: T4;
+}