diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
index 58566199373..c829c1213b4 100644
--- a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index b8215b2e711..874340678ec 100644
--- a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index cded3089872..1124f53ec61 100644
--- a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 999fd69cd9f..922cc75b599 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 39f3d69f5cc..70beddc7a11 100644
--- a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 2bd2b5fb853..576450eeeb7 100644
--- a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 8eed95f4e7f..caf6e271319 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 69c96f7b230..5197aa67b56 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 36e7503f359..163dbd6210b 100644
--- a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index abe9789b73d..1bbe98f8213 100644
--- a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 1970c5ddbb0..3c8a84d0323 100644
--- a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 49b3458119a..fc13a97e339 100644
--- a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index 70a32e23d7b..5a7a1c4f577 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -139,7 +139,7 @@ describe('Blueprint: acceptance-test', function () {
       it('acceptance-test foo', function () {
         return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/qunit-rfc268.js')
+            fixture('acceptance-test/qunit-rfc268-addon.js')
           );
         });
       });
diff --git a/node-tests/fixtures/acceptance-test/mocha-rfc268.js b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
index ee8ab318fc6..89b9ee39e21 100644
--- a/node-tests/fixtures/acceptance-test/mocha-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from 'my-app/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('Acceptance | foo', function () {
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
new file mode 100644
index 00000000000..2d001b04e05
--- /dev/null
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { visit, currentURL } from '@ember/test-helpers';
+import { setupApplicationTest } from 'my-addon/tests/helpers';
+
+module('Acceptance | foo', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /foo', async function (assert) {
+    await visit('/foo');
+
+    assert.strictEqual(currentURL(), '/foo');
+  });
+});
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268.js b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
index 480b0bacea1..a313e02d112 100644
--- a/node-tests/fixtures/acceptance-test/qunit-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from 'my-app/tests/helpers';
 
 module('Acceptance | foo', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/node-tests/fixtures/component-test/mocha-rfc232-unit.js b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
index eb920ec4225..bd084d11c77 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232-unit.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Component | x-foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/component-test/mocha-rfc232.js b/node-tests/fixtures/component-test/mocha-rfc232.js
index 8b8d85dfb17..8f1edf3f246 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/component-test/rfc232-unit.js b/node-tests/fixtures/component-test/rfc232-unit.js
index 848f8a3dec6..404bf3f9409 100644
--- a/node-tests/fixtures/component-test/rfc232-unit.js
+++ b/node-tests/fixtures/component-test/rfc232-unit.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Component | x-foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/component-test/rfc232.js b/node-tests/fixtures/component-test/rfc232.js
index 3e3a9dded48..93374f79530 100644
--- a/node-tests/fixtures/component-test/rfc232.js
+++ b/node-tests/fixtures/component-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
index a957691c713..0eee2a68ef3 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Controller | foo/bar', function () {
   setupTest();
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232.js b/node-tests/fixtures/controller-test/mocha-rfc232.js
index cbfb5c0665a..b0a2c780a73 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Controller | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/controller-test/rfc232-nested.js b/node-tests/fixtures/controller-test/rfc232-nested.js
index aecdde3dd5f..598a6942a42 100644
--- a/node-tests/fixtures/controller-test/rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/rfc232-nested.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Controller | foo/bar', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/controller-test/rfc232.js b/node-tests/fixtures/controller-test/rfc232.js
index c4815a2ea8c..44f3af0265f 100644
--- a/node-tests/fixtures/controller-test/rfc232.js
+++ b/node-tests/fixtures/controller-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Controller | foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232.js b/node-tests/fixtures/helper-test/mocha-rfc232.js
index 6017c0f6292..8b262c88ff2 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index 4c666b1afbd..ad840ae1ad5 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/route-test/mocha-rfc232.js b/node-tests/fixtures/route-test/mocha-rfc232.js
index 0ae4896e73f..b6435e1b089 100644
--- a/node-tests/fixtures/route-test/mocha-rfc232.js
+++ b/node-tests/fixtures/route-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Route | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/route-test/rfc232.js b/node-tests/fixtures/route-test/rfc232.js
index 3d6bf9b098b..25c080eed61 100644
--- a/node-tests/fixtures/route-test/rfc232.js
+++ b/node-tests/fixtures/route-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Route | foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/service-test/mocha-rfc232.js b/node-tests/fixtures/service-test/mocha-rfc232.js
index 3aa66206dc2..ceae7203f34 100644
--- a/node-tests/fixtures/service-test/mocha-rfc232.js
+++ b/node-tests/fixtures/service-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Service | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/service-test/rfc232.js b/node-tests/fixtures/service-test/rfc232.js
index f54363db7ca..1ae3f96b1eb 100644
--- a/node-tests/fixtures/service-test/rfc232.js
+++ b/node-tests/fixtures/service-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Service | foo', function (hooks) {
   setupTest(hooks);