diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.js b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.js
new file mode 100644
index 00000000000..195cd78f359
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.js
@@ -0,0 +1,15 @@
+//// [classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts]
+function f() {
+    new C2(); // OK
+}    
+class C2 { }
+
+//// [classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.js]
+function f() {
+    new C2(); // OK
+}
+var C2 = (function () {
+    function C2() {
+    }
+    return C2;
+}());
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.symbols b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.symbols
new file mode 100644
index 00000000000..19e4620b5cf
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts ===
+function f() {
+>f : Symbol(f, Decl(classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts, 0, 0))
+
+    new C2(); // OK
+>C2 : Symbol(C2, Decl(classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts, 2, 1))
+}    
+class C2 { }
+>C2 : Symbol(C2, Decl(classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts, 2, 1))
+
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.types b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.types
new file mode 100644
index 00000000000..62550065239
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts ===
+function f() {
+>f : () => void
+
+    new C2(); // OK
+>new C2() : C2
+>C2 : typeof C2
+}    
+class C2 { }
+>C2 : C2
+
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js
new file mode 100644
index 00000000000..b3a3d25a819
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.js
@@ -0,0 +1,9 @@
+//// [classDeclarationCheckUsedBeforeDefinitionInItself.ts]
+class C3 { 
+    static intance = new C3();  // ok
+}
+
+//// [classDeclarationCheckUsedBeforeDefinitionInItself.js]
+class C3 {
+}
+C3.intance = new C3(); // ok
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.symbols b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.symbols
new file mode 100644
index 00000000000..f0e6f2a5a71
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInItself.ts ===
+class C3 { 
+>C3 : Symbol(C3, Decl(classDeclarationCheckUsedBeforeDefinitionInItself.ts, 0, 0))
+
+    static intance = new C3();  // ok
+>intance : Symbol(C3.intance, Decl(classDeclarationCheckUsedBeforeDefinitionInItself.ts, 0, 10))
+>C3 : Symbol(C3, Decl(classDeclarationCheckUsedBeforeDefinitionInItself.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.types b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.types
new file mode 100644
index 00000000000..e4f36dda38c
--- /dev/null
+++ b/tests/baselines/reference/classDeclarationCheckUsedBeforeDefinitionInItself.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInItself.ts ===
+class C3 { 
+>C3 : C3
+
+    static intance = new C3();  // ok
+>intance : C3
+>new C3() : C3
+>C3 : typeof C3
+}
diff --git a/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts b/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts
new file mode 100644
index 00000000000..cf09163ed5a
--- /dev/null
+++ b/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInFunctionDeclaration.ts
@@ -0,0 +1,4 @@
+function f() {
+    new C2(); // OK
+}    
+class C2 { }
\ No newline at end of file
diff --git a/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInItself.ts b/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInItself.ts
new file mode 100644
index 00000000000..389c669e740
--- /dev/null
+++ b/tests/cases/compiler/classDeclarationCheckUsedBeforeDefinitionInItself.ts
@@ -0,0 +1,4 @@
+// @target: es6
+class C3 { 
+    static intance = new C3();  // ok
+}
\ No newline at end of file