diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 39679675a31..0e4525c9f2d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2063,9 +2063,9 @@ namespace ts {
                     error(errorNode, diag, moduleReference, resolvedModule.resolvedFileName);
                 }
                 else if (noImplicitAny && moduleNotFoundError) {
-                    let errorInfo = !resolvedModule.isExternalLibraryImport ? undefined : chainDiagnosticMessages(/*details*/ undefined,
+                    let errorInfo = resolvedModule.packageId && chainDiagnosticMessages(/*details*/ undefined,
                         Diagnostics.Try_npm_install_types_Slash_0_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0,
-                        moduleReference);
+                        resolvedModule.packageId.name);
                     errorInfo = chainDiagnosticMessages(errorInfo,
                         Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type,
                         moduleReference,
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt b/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt
index 0f451941bd7..5137ea4ae5f 100644
--- a/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt
@@ -8,8 +8,11 @@
 !!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
 !!! error TS7016:   Try `npm install @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
     
-==== /node_modules/foo/index.js (0 errors) ====
+==== /node_modules/foo/package.json (0 errors) ====
     // This tests that `--noImplicitAny` disables untyped modules.
     
+    { "name": "foo", "version": "1.2.3" }
+    
+==== /node_modules/foo/index.js (0 errors) ====
     This file is not processed.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
index 86e2ae3c175..378ebee6d7a 100644
--- a/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny.js
@@ -1,8 +1,11 @@
 //// [tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny.ts] ////
 
-//// [index.js]
+//// [package.json]
 // This tests that `--noImplicitAny` disables untyped modules.
 
+{ "name": "foo", "version": "1.2.3" }
+
+//// [index.js]
 This file is not processed.
 
 //// [a.ts]
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.errors.txt b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.errors.txt
new file mode 100644
index 00000000000..1aeb8489b8d
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.errors.txt
@@ -0,0 +1,16 @@
+/a.ts(1,22): error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+  Try `npm install @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
+
+
+==== /a.ts (1 errors) ====
+    import * as foo from "./node_modules/foo";
+                         ~~~~~~~~~~~~~~~~~~~~
+!!! error TS7016: Could not find a declaration file for module './node_modules/foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm install @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
+    
+==== /node_modules/foo/package.json (0 errors) ====
+    { "name": "foo", "version": "1.2.3" }
+    
+==== /node_modules/foo/index.js (0 errors) ====
+    This file is not processed.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.js b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.js
new file mode 100644
index 00000000000..7e8c52a3bfb
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.js
@@ -0,0 +1,15 @@
+//// [tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny_relativePath.ts] ////
+
+//// [package.json]
+{ "name": "foo", "version": "1.2.3" }
+
+//// [index.js]
+This file is not processed.
+
+//// [a.ts]
+import * as foo from "./node_modules/foo";
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.symbols b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.symbols
new file mode 100644
index 00000000000..0b9aff6bbef
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.symbols
@@ -0,0 +1,4 @@
+=== /a.ts ===
+import * as foo from "./node_modules/foo";
+>foo : Symbol(foo, Decl(a.ts, 0, 6))
+
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.types b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.types
new file mode 100644
index 00000000000..d9b7333550d
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_noImplicitAny_relativePath.types
@@ -0,0 +1,4 @@
+=== /a.ts ===
+import * as foo from "./node_modules/foo";
+>foo : any
+
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny.ts
index 1aee7c069de..39208624a72 100644
--- a/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny.ts
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny.ts
@@ -1,8 +1,10 @@
 // @noImplicitReferences: true
-// @currentDirectory: /
 // @noImplicitAny: true
 // This tests that `--noImplicitAny` disables untyped modules.
 
+// @filename: /node_modules/foo/package.json
+{ "name": "foo", "version": "1.2.3" }
+
 // @filename: /node_modules/foo/index.js
 This file is not processed.
 
diff --git a/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny_relativePath.ts b/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny_relativePath.ts
new file mode 100644
index 00000000000..ae38be5dfa0
--- /dev/null
+++ b/tests/cases/conformance/moduleResolution/untypedModuleImport_noImplicitAny_relativePath.ts
@@ -0,0 +1,11 @@
+// @noImplicitReferences: true
+// @noImplicitAny: true
+
+// @filename: /node_modules/foo/package.json
+{ "name": "foo", "version": "1.2.3" }
+
+// @filename: /node_modules/foo/index.js
+This file is not processed.
+
+// @filename: /a.ts
+import * as foo from "./node_modules/foo";