diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts
index bec60dda00a3..1b1d7c0d881d 100644
--- a/packages/@angular/cli/models/webpack-configs/common.ts
+++ b/packages/@angular/cli/models/webpack-configs/common.ts
@@ -67,7 +67,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     devtool: buildOptions.sourcemaps ? 'source-map' : false,
     resolve: {
       extensions: ['.ts', '.js'],
-      modules: [nodeModules],
+      modules: ['node_modules', nodeModules],
     },
     resolveLoader: {
       modules: [nodeModules]
diff --git a/tests/e2e/tests/misc/module-resolution.ts b/tests/e2e/tests/misc/module-resolution.ts
new file mode 100644
index 000000000000..6b02d7d4e1cb
--- /dev/null
+++ b/tests/e2e/tests/misc/module-resolution.ts
@@ -0,0 +1,13 @@
+import { appendToFile, prependToFile } from '../../utils/fs';
+import { ng, silentNpm } from '../../utils/process';
+
+
+export default async function () {
+  await silentNpm('install', 'firebase@3.7.8');
+
+  await prependToFile('src/app/app.module.ts', 'import * as firebase from \'firebase\';');
+  await appendToFile('src/app/app.module.ts', 'firebase.initializeApp({});');
+
+  await ng('build');
+  await ng('build', '--aot');
+}