diff --git a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
index f12ef381957..abbcab2497f 100644
--- a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
@@ -1,16 +1,7 @@
-import Ember from 'ember';
-import { module, test } from 'qunit';
-import startApp from '<%= testFolderRoot %>/tests/helpers/start-app';
+import { test } from 'qunit';
+import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance';
 
-module('<%= friendlyTestName %>', {
-  beforeEach: function() {
-    this.application = startApp();
-  },
-
-  afterEach: function() {
-    Ember.run(this.application, 'destroy');
-  }
-});
+moduleForAcceptance('<%= friendlyTestName %>');
 
 test('visiting /<%= dasherizedModuleName %>', function(assert) {
   visit('/<%= dasherizedModuleName %>');
diff --git a/blueprints/app/files/tests/helpers/module-for-acceptance.js b/blueprints/app/files/tests/helpers/module-for-acceptance.js
new file mode 100644
index 00000000000..86ce65f485a
--- /dev/null
+++ b/blueprints/app/files/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,21 @@
+import Ember from 'ember';
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+
+export default function(name, options = {}) {
+  module(`Acceptance | ${name}`, {
+    beforeEach: function() {
+      this.application = startApp();
+      if (options.beforeEach) {
+        options.beforeEach.call(this, arguments);
+      }
+    },
+
+    afterEach: function() {
+      Ember.run(this.application, 'destroy');
+      if (options.afterEach) {
+        options.afterEach.call(this, arguments);
+      }
+    }
+  });
+}
diff --git a/tests/fixtures/generate/acceptance-test-expected.js b/tests/fixtures/generate/acceptance-test-expected.js
index ec783f082db..c027755cb7e 100644
--- a/tests/fixtures/generate/acceptance-test-expected.js
+++ b/tests/fixtures/generate/acceptance-test-expected.js
@@ -1,16 +1,7 @@
-import Ember from 'ember';
-import { module, test } from 'qunit';
-import startApp from 'my-app/tests/helpers/start-app';
+import { test } from 'qunit';
+import moduleForAcceptance from 'my-app/tests/helpers/module-for-acceptance';
 
-module('Acceptance | foo', {
-  beforeEach: function() {
-    this.application = startApp();
-  },
-
-  afterEach: function() {
-    Ember.run(this.application, 'destroy');
-  }
-});
+moduleForAcceptance('foo');
 
 test('visiting /foo', function(assert) {
   visit('/foo');