diff --git a/.eslintignore b/.eslintignore
index 405629b448e..dffb6cf0db7 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,6 +6,7 @@ tests/fixtures/*
 common-tmp/*
 
 lib/broccoli/app-*.js
+lib/broccoli/modules-from-meta.js
 lib/broccoli/test-support-*.js
 lib/broccoli/tests-*.js
 lib/broccoli/vendor-*.js
diff --git a/tests/acceptance/addon-modules-test-slow.js b/tests/acceptance/addon-modules-test-slow.js
new file mode 100644
index 00000000000..5d8265403a1
--- /dev/null
+++ b/tests/acceptance/addon-modules-test-slow.js
@@ -0,0 +1,57 @@
+'use strict';
+
+var Promise    = require('../../lib/ext/promise');
+var path       = require('path');
+var fs         = require('fs-extra');
+var remove     = Promise.denodeify(fs.remove);
+var addonName  = 'some-cool-addon';
+var spawn      = require('child_process').spawn;
+var chalk      = require('chalk');
+var expect     = require('chai').expect;
+
+var symlinkOrCopySync   = require('symlink-or-copy').sync;
+var runCommand          = require('../helpers/run-command');
+var ember               = require('../helpers/ember');
+var copyFixtureFiles    = require('../helpers/copy-fixture-files');
+var killCliProcess      = require('../helpers/kill-cli-process');
+var assertDirEmpty      = require('../helpers/assert-dir-empty');
+var acceptance          = require('../helpers/acceptance');
+var createTestTargets   = acceptance.createTestTargets;
+var teardownTestTargets = acceptance.teardownTestTargets;
+var linkDependencies    = acceptance.linkDependencies;
+var cleanupRun          = acceptance.cleanupRun;
+
+describe('Acceptance: addon-smoke-test', function() {
+  this.timeout(450000);
+
+  before(function() {
+    return createTestTargets(addonName, {
+      command: 'addon'
+    });
+  });
+
+  after(function() {
+    return teardownTestTargets();
+  });
+
+  beforeEach(function() {
+    return linkDependencies(addonName);
+  });
+
+  afterEach(function() {
+    return cleanupRun().then(function() {
+      assertDirEmpty('tmp');
+    });
+  });
+
+  it('can add modules via `{{content-for "head"}}`', function() {
+    return copyFixtureFiles('addon/content-for-head')
+      .then(function() {
+        return ember(['test']);
+      })
+      .then(function(result) {
+        expect(result.exitCode).to.eql(0);
+      });
+  });
+
+});
diff --git a/tests/acceptance/addon-smoke-test-slow.js b/tests/acceptance/addon-smoke-test-slow.js
index e94c98207f1..c1e040e64f3 100644
--- a/tests/acceptance/addon-smoke-test-slow.js
+++ b/tests/acceptance/addon-smoke-test-slow.js
@@ -108,16 +108,6 @@ describe('Acceptance: addon-smoke-test', function() {
       });
   });
 
-  it('can add modules via `{{content-for "head"}}`', function() {
-    return copyFixtureFiles('addon/content-for-head')
-      .then(function() {
-        return ember(['test']);
-      })
-      .then(function(result) {
-        expect(result.exitCode).to.eql(0);
-      });
-  });
-
   it('build with only pod templates', function() {
     return copyFixtureFiles('addon/pod-templates-only')
       .then(function() {