diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
index 820e8a2f2d..567d4f7717 100644
--- a/lib/broccoli/ember-app.js
+++ b/lib/broccoli/ember-app.js
@@ -841,7 +841,7 @@ EmberApp.prototype.javascript = function() {
 
   var appJs = new ES6Modules(
     new Funnel(applicationJs, {
-      include: [new RegExp(escapeRegExp(this.name + '/') + '.*\\.js$')],
+      include: [new RegExp('^' + escapeRegExp(this.name + '/') + '.*\\.js$')],
       description: 'Funnel: App JS Files'
     }),
 
diff --git a/tests/acceptance/brocfile-smoke-test-slow.js b/tests/acceptance/brocfile-smoke-test-slow.js
index 957959e5a1..b0b385eeb4 100644
--- a/tests/acceptance/brocfile-smoke-test-slow.js
+++ b/tests/acceptance/brocfile-smoke-test-slow.js
@@ -139,6 +139,15 @@ describe('Acceptance: brocfile-smoke-test', function() {
       });
   });
 
+  it('default development build does not fail', function() {
+    this.timeout(100000);
+
+    return copyFixtureFiles('brocfile-tests/query')
+      .then(function() {
+        return runCommand(path.join('.', 'node_modules', 'ember-cli', 'bin', 'ember'), 'build', '--silent');
+      });
+  });
+
   it('default development build tests', function() {
     this.timeout(450000);
 
diff --git a/tests/fixtures/brocfile-tests/query/app/app.js b/tests/fixtures/brocfile-tests/query/app/app.js
new file mode 100644
index 0000000000..aba5466564
--- /dev/null
+++ b/tests/fixtures/brocfile-tests/query/app/app.js
@@ -0,0 +1,16 @@
+import Ember from 'ember';
+import Resolver from 'ember/resolver';
+import loadInitializers from 'ember/load-initializers';
+
+Ember.MODEL_FACTORY_INJECTIONS = true;
+
+var App = Ember.Application.extend({
+  modulePrefix: 'query',
+  podModulePrefix: 'app/pods',
+  Resolver: Resolver
+});
+
+loadInitializers(App, 'query');
+
+export default App;
+
diff --git a/tests/fixtures/brocfile-tests/query/app/pods/application/template.hbs b/tests/fixtures/brocfile-tests/query/app/pods/application/template.hbs
new file mode 100644
index 0000000000..dc9900c702
--- /dev/null
+++ b/tests/fixtures/brocfile-tests/query/app/pods/application/template.hbs
@@ -0,0 +1 @@
+<h2 id="title">ZOMG, PODS WORKS!!</h2>
diff --git a/tests/fixtures/brocfile-tests/query/app/resolver.js b/tests/fixtures/brocfile-tests/query/app/resolver.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fixtures/brocfile-tests/query/package.json b/tests/fixtures/brocfile-tests/query/package.json
new file mode 100644
index 0000000000..b96736ba89
--- /dev/null
+++ b/tests/fixtures/brocfile-tests/query/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "query"
+}