diff --git a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
index 64b178bb4d..f12ef38195 100644
--- a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
@@ -2,15 +2,13 @@ import Ember from 'ember';
 import { module, test } from 'qunit';
 import startApp from '<%= testFolderRoot %>/tests/helpers/start-app';
 
-var application;
-
 module('<%= friendlyTestName %>', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
 
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/addon/component-with-template/tests/acceptance/main-test.js b/tests/fixtures/addon/component-with-template/tests/acceptance/main-test.js
index 18928efec2..2910fed762 100644
--- a/tests/fixtures/addon/component-with-template/tests/acceptance/main-test.js
+++ b/tests/fixtures/addon/component-with-template/tests/acceptance/main-test.js
@@ -2,14 +2,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import { module, test } from 'qunit';
 
-var application;
-
 module('Acceptance', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/brocfile-tests/default-development/tests/integration/app-boots-test.js b/tests/fixtures/brocfile-tests/default-development/tests/integration/app-boots-test.js
index b7d29dfc8d..348d301788 100644
--- a/tests/fixtures/brocfile-tests/default-development/tests/integration/app-boots-test.js
+++ b/tests/fixtures/brocfile-tests/default-development/tests/integration/app-boots-test.js
@@ -5,14 +5,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import { module, test } from 'qunit';
 
-var application;
-
 module('default-development - Integration', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/brocfile-tests/pods-templates/tests/integration/pods-template-test.js b/tests/fixtures/brocfile-tests/pods-templates/tests/integration/pods-template-test.js
index 937befc1f9..22bd427276 100644
--- a/tests/fixtures/brocfile-tests/pods-templates/tests/integration/pods-template-test.js
+++ b/tests/fixtures/brocfile-tests/pods-templates/tests/integration/pods-template-test.js
@@ -5,14 +5,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import { module, test } from 'qunit';
 
-var application;
-
 module('pods based templates', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/brocfile-tests/pods-with-prefix-templates/tests/integration/pods-template-test.js b/tests/fixtures/brocfile-tests/pods-with-prefix-templates/tests/integration/pods-template-test.js
index 815c1d8272..004a64b748 100644
--- a/tests/fixtures/brocfile-tests/pods-with-prefix-templates/tests/integration/pods-template-test.js
+++ b/tests/fixtures/brocfile-tests/pods-with-prefix-templates/tests/integration/pods-template-test.js
@@ -5,14 +5,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import { module, test } from 'qunit';
 
-var application;
-
 module('pods based templates', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/brocfile-tests/wrap-in-eval/tests/integration/wrap-in-eval-test.js b/tests/fixtures/brocfile-tests/wrap-in-eval/tests/integration/wrap-in-eval-test.js
index 3465cb8211..693d8b21e5 100644
--- a/tests/fixtures/brocfile-tests/wrap-in-eval/tests/integration/wrap-in-eval-test.js
+++ b/tests/fixtures/brocfile-tests/wrap-in-eval/tests/integration/wrap-in-eval-test.js
@@ -5,14 +5,12 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import { module, test } from 'qunit';
 
-var application;
-
 module('wrapInEval in-app test', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/generate/acceptance-test-expected.js b/tests/fixtures/generate/acceptance-test-expected.js
index 2cf25426da..ec783f082d 100644
--- a/tests/fixtures/generate/acceptance-test-expected.js
+++ b/tests/fixtures/generate/acceptance-test-expected.js
@@ -2,15 +2,13 @@ import Ember from 'ember';
 import { module, test } from 'qunit';
 import startApp from 'my-app/tests/helpers/start-app';
 
-var application;
-
 module('Acceptance | foo', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
 
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/generate/addon-acceptance-test-expected.js b/tests/fixtures/generate/addon-acceptance-test-expected.js
index 38dd2730c0..926439dba6 100644
--- a/tests/fixtures/generate/addon-acceptance-test-expected.js
+++ b/tests/fixtures/generate/addon-acceptance-test-expected.js
@@ -2,15 +2,13 @@ import Ember from 'ember';
 import { module, test } from 'qunit';
 import startApp from '../../tests/helpers/start-app';
 
-var application;
-
 module('Acceptance | foo', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
 
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });
 
diff --git a/tests/fixtures/generate/addon-acceptance-test-nested-expected.js b/tests/fixtures/generate/addon-acceptance-test-nested-expected.js
index 4f6570d37e..aabba337f8 100644
--- a/tests/fixtures/generate/addon-acceptance-test-nested-expected.js
+++ b/tests/fixtures/generate/addon-acceptance-test-nested-expected.js
@@ -2,15 +2,13 @@ import Ember from 'ember';
 import { module, test } from 'qunit';
 import startApp from '../../../tests/helpers/start-app';
 
-var application;
-
 module('Acceptance | foo/bar', {
   beforeEach: function() {
-    application = startApp();
+    this.application = startApp();
   },
 
   afterEach: function() {
-    Ember.run(application, 'destroy');
+    Ember.run(this.application, 'destroy');
   }
 });