diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.gitignore b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.id b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.id
new file mode 100644
index 0000000000..a053d075b8
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+ic2o9oh3h8qt12iy9x7
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/packages b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/packages
new file mode 100644
index 0000000000..66abf8acc3
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/packages
@@ -0,0 +1,7 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+ecmascript              # Enable ECMAScript2015+ syntax in app code
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/platforms b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/release b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/.meteor/versions b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/versions
new file mode 100644
index 0000000000..aab65768e3
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/.meteor/versions
@@ -0,0 +1,73 @@
+allow-deny@1.0.1-modules.2
+autopublish@1.0.4
+autoupdate@1.2.5-modules.2
+babel-compiler@5.8.25-modules.3
+babel-runtime@0.1.5-modules.2
+base64@1.0.5-modules.2
+binary-heap@1.0.5-modules.2
+blaze@2.1.4-modules.2
+blaze-html-templates@1.0.1
+blaze-tools@1.0.5-modules.2
+boilerplate-generator@1.0.5-modules.2
+caching-compiler@1.0.1-modules.2
+caching-html-compiler@1.0.3-modules.2
+callback-hook@1.0.5-modules.2
+check@1.1.1-modules.2
+ddp@1.2.2
+ddp-client@1.2.2-modules.2
+ddp-common@1.2.2
+ddp-server@1.2.3-modules.2
+deps@1.0.9
+diff-sequence@1.0.2-modules.2
+ecmascript@0.3.1-modules.2
+ecmascript-runtime@0.2.7-modules.2
+ejson@1.0.8-modules.2
+es5-shim@4.3.2-modules.2
+fastclick@1.0.8-modules.2
+geojson-utils@1.0.5-modules.2
+hot-code-push@1.0.1-modules.2
+html-tools@1.0.6-modules.2
+htmljs@1.0.6-modules.2
+http@1.1.2-modules.2
+id-map@1.0.4
+insecure@1.0.4
+jquery@1.11.5-modules.2
+launch-screen@1.0.5-modules.2
+livedata@1.0.15
+logging@1.0.9-modules.2
+meteor@1.1.11-modules.2
+meteor-base@1.0.1
+meteor-env-dev@0.0.1-modules.2
+meteor-env-prod@0.0.1-modules.2
+minifiers-css@1.1.8-modules.2
+minifiers-js@1.1.8-modules.2
+minimongo@1.0.11-modules.2
+mobile-experience@1.0.1
+mobile-status-bar@1.0.6
+modules@0.4.1-modules.2
+mongo@1.1.4-modules.2
+mongo-id@1.0.1
+npm-mongo@1.4.40-modules.2
+observe-sequence@1.0.8-modules.2
+ordered-dict@1.0.4
+promise@0.5.2-modules.2
+random@1.0.6-modules.2
+reactive-dict@1.1.4-modules.2
+reactive-var@1.0.6
+reload@1.1.5-modules.2
+retry@1.0.4
+routepolicy@1.0.7-modules.2
+session@1.1.2-modules.2
+spacebars@1.0.8-modules.2
+spacebars-compiler@1.0.8-modules.2
+standard-minifiers@1.0.3-modules.2
+standard-minifiers-css@1.0.3-modules.2
+standard-minifiers-js@1.0.3-modules.2
+templating@1.1.6-modules.2
+templating-tools@1.0.1-modules.2
+tracker@1.0.10-modules.2
+ui@1.0.8
+underscore@1.0.5-modules.2
+url@1.0.6-modules.2
+webapp@1.2.4-modules.2
+webapp-hashing@1.0.6-modules.2
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/imports/file.js b/tools/tests/apps/app-with-unimported-lazy-file/imports/file.js
new file mode 100644
index 0000000000..5d0d8fe0db
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/imports/file.js
@@ -0,0 +1 @@
+console.log("This file shouldn't be loaded");
diff --git a/tools/tests/apps/app-with-unimported-lazy-file/main.js b/tools/tests/apps/app-with-unimported-lazy-file/main.js
new file mode 100644
index 0000000000..0774628a70
--- /dev/null
+++ b/tools/tests/apps/app-with-unimported-lazy-file/main.js
@@ -0,0 +1,3 @@
+Meteor.startup(function() {
+  process.exit(1);
+});
diff --git a/tools/tests/modules.js b/tools/tests/modules.js
new file mode 100644
index 0000000000..fcb5126424
--- /dev/null
+++ b/tools/tests/modules.js
@@ -0,0 +1,14 @@
+var selftest = require('../tool-testing/selftest.js');
+var Sandbox = selftest.Sandbox;
+var utils = require('../utils/utils.js');
+
+selftest.define("modules - unimported lazy files", function() {
+  const s = new Sandbox();
+  s.createApp("myapp", "app-with-unimported-lazy-file");
+  s.cd("myapp", function() {
+    const run = s.run("--once");
+    run.waitSecs(30);
+    run.expectExit(1);
+    run.forbid("This file shouldn't be loaded");
+  });
+});