diff --git a/addon-test-support/ember-mocha/index.js b/addon-test-support/ember-mocha/index.js
index 51923d0f..0bf12b9e 100644
--- a/addon-test-support/ember-mocha/index.js
+++ b/addon-test-support/ember-mocha/index.js
@@ -3,8 +3,8 @@ import describeComponent from 'ember-mocha/describe-component';
 import describeModel     from 'ember-mocha/describe-model';
 import setupTestFactory  from 'ember-mocha/setup-test-factory';
 import { it }            from 'mocha';
+import { setResolver }   from '@ember/test-helpers';
 import {
-  setResolver,
   TestModule,
   TestModuleForModel,
   TestModuleForComponent,
diff --git a/addon-test-support/ember-mocha/mocha-module.js b/addon-test-support/ember-mocha/mocha-module.js
index a1c0deba..b5d1244e 100644
--- a/addon-test-support/ember-mocha/mocha-module.js
+++ b/addon-test-support/ember-mocha/mocha-module.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import { beforeEach, afterEach, after, describe } from 'mocha';
-import { getContext } from 'ember-test-helpers';
+import { getContext } from '@ember/test-helpers';
 
 export function createModule(Constructor, name, description, callbacks, tests, method) {
   Ember.deprecate(
diff --git a/addon-test-support/ember-mocha/setup-test-factory.js b/addon-test-support/ember-mocha/setup-test-factory.js
index dc8f5f06..bdc2b99c 100644
--- a/addon-test-support/ember-mocha/setup-test-factory.js
+++ b/addon-test-support/ember-mocha/setup-test-factory.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import { before, beforeEach, afterEach, after } from 'mocha';
-import { getContext } from 'ember-test-helpers';
+import { getContext } from '@ember/test-helpers';
 
 export default function(Constructor) {
   return function setupTest(moduleName, options = {}) {