diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index e9bc04a8cd2..6abe7308d97 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -2313,10 +2313,10 @@ namespace ts.FindAllReferences {
         }
 
         function isImplementation(node: Node): boolean {
-            return !(node.flags & NodeFlags.Ambient) && (
+            return !!(node.flags & NodeFlags.Ambient) ? !(isInterfaceDeclaration(node) || isTypeAliasDeclaration(node)) :
                 (isVariableLike(node) ? hasInitializer(node) :
                 isFunctionLikeDeclaration(node) ? !!node.body :
-                isClassLike(node) || isModuleOrEnumDeclaration(node)));
+                isClassLike(node) || isModuleOrEnumDeclaration(node));
         }
 
         export function getReferenceEntriesForShorthandPropertyAssignment(node: Node, checker: TypeChecker, addReference: (node: Node) => void): void {
diff --git a/tests/cases/fourslash/goToDefinitionExpandoElementAccess.ts b/tests/cases/fourslash/goToDefinitionExpandoElementAccess.ts
index 67efdb195e6..5deeb4c0253 100644
--- a/tests/cases/fourslash/goToDefinitionExpandoElementAccess.ts
+++ b/tests/cases/fourslash/goToDefinitionExpandoElementAccess.ts
@@ -4,4 +4,4 @@
 ////f[/*0*/"x"] = 0;
 ////f[[|/*1*/"x"|]] = 1;
 
-verify.goToDefinition("1", ["0", "1"]);
+verify.goToDefinition("1", "0");
diff --git a/tests/cases/fourslash/goToImplementationLocal_06.ts b/tests/cases/fourslash/goToImplementationLocal_06.ts
index 923f02a4aae..90c489bcf54 100644
--- a/tests/cases/fourslash/goToImplementationLocal_06.ts
+++ b/tests/cases/fourslash/goToImplementationLocal_06.ts
@@ -5,4 +5,4 @@
 //// declare var [|someVar|]: string;
 //// someVa/*reference*/r
 
-verify.implementationListIsEmpty();
+verify.allRangesAppearInImplementationList("reference");
diff --git a/tests/cases/fourslash/goToImplementationLocal_07.ts b/tests/cases/fourslash/goToImplementationLocal_07.ts
index fabee95ceaa..b24b463e107 100644
--- a/tests/cases/fourslash/goToImplementationLocal_07.ts
+++ b/tests/cases/fourslash/goToImplementationLocal_07.ts
@@ -5,4 +5,4 @@
 //// declare function [|someFunction|](): () => void;
 //// someFun/*reference*/ction();
 
-verify.implementationListIsEmpty();
+verify.allRangesAppearInImplementationList("reference");
diff --git a/tests/cases/fourslash/goToImplementationLocal_08.ts b/tests/cases/fourslash/goToImplementationLocal_08.ts
index 340aa1ef478..b24b463e107 100644
--- a/tests/cases/fourslash/goToImplementationLocal_08.ts
+++ b/tests/cases/fourslash/goToImplementationLocal_08.ts
@@ -5,5 +5,4 @@
 //// declare function [|someFunction|](): () => void;
 //// someFun/*reference*/ction();
 
-goTo.marker("reference");
-verify.implementationListIsEmpty();
+verify.allRangesAppearInImplementationList("reference");