diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index d9d998b7fc..da16a5172a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14224,7 +14224,21 @@ namespace ts {
             }
 
             if (isHeritageClauseElementIdentifier(<EntityName>entityName)) {
-                let meaning = entityName.parent.kind === SyntaxKind.ExpressionWithTypeArguments ? SymbolFlags.Type : SymbolFlags.Namespace;
+                let meaning = SymbolFlags.None;
+
+                // In an interface or class, we're definitely interested in a type.
+                if (entityName.parent.kind === SyntaxKind.ExpressionWithTypeArguments) {
+                    meaning = SymbolFlags.Type;
+
+                    // In a class 'extends' clause we are also looking for a value.
+                    if (isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+                        meaning |= SymbolFlags.Value;
+                    }
+                }
+                else {
+                    meaning = SymbolFlags.Namespace;
+                }
+
                 meaning |= SymbolFlags.Alias;
                 return resolveEntityName(<EntityName>entityName, meaning);
             }
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.symbols b/tests/baselines/reference/extendClassExpressionFromModule.symbols
index c131ea8fa2..78d483b5d7 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.symbols
+++ b/tests/baselines/reference/extendClassExpressionFromModule.symbols
@@ -8,6 +8,7 @@ var x = foo1;
 
 class y extends x {}
 >y : Symbol(y, Decl(foo2.ts, 1, 13))
+>x : Symbol(x, Decl(foo2.ts, 1, 3))
 
 === tests/cases/conformance/classes/classExpressions/foo1.ts ===
 class x{}
diff --git a/tests/baselines/reference/extendNonClassSymbol1.symbols b/tests/baselines/reference/extendNonClassSymbol1.symbols
index 02291ebb18..7c03ef3a97 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.symbols
+++ b/tests/baselines/reference/extendNonClassSymbol1.symbols
@@ -9,4 +9,5 @@ var x = A;
 
 class C extends x { } // error, could not find symbol xs
 >C : Symbol(C, Decl(extendNonClassSymbol1.ts, 1, 10))
+>x : Symbol(x, Decl(extendNonClassSymbol1.ts, 1, 3))
 
diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts
new file mode 100644
index 0000000000..1ec144d7e8
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause01.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+
+////var [|Base|] = class { };
+////class C extends [|Base|] { }
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedReference of ranges) {
+        verify.referencesAtPositionContains(expectedReference);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts
new file mode 100644
index 0000000000..0f06a3c420
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForVariableInExtendsClause02.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts"/>
+
+////interface [|Base|] { }
+////namespace n {
+////    var Base = class { };
+////    interface I extends [|Base|] { }
+////}
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedReference of ranges) {
+        verify.referencesAtPositionContains(expectedReference);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts
new file mode 100644
index 0000000000..93f8cec810
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsForVariableInImplementsClause01.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts"/>
+
+
+////var Base = class { };
+////class C extends Base implements [|Base|] { }
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    verify.referencesCountIs(0);
+}
\ No newline at end of file