diff --git a/addon/utils/bind-data-test-attributes.js b/addon/utils/bind-data-test-attributes.js
index 2ab869cd..b16207ca 100644
--- a/addon/utils/bind-data-test-attributes.js
+++ b/addon/utils/bind-data-test-attributes.js
@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { warn, isArray } = Ember;
+import { warn } from "@ember/debug";
+import { isArray } from "@ember/array";
 
 const TEST_SELECTOR_PREFIX = /data-test-.*/;
 
diff --git a/tests/unit/utils/bind-data-test-attributes-test.js b/tests/unit/utils/bind-data-test-attributes-test.js
index 6472e4df..a81d1093 100644
--- a/tests/unit/utils/bind-data-test-attributes-test.js
+++ b/tests/unit/utils/bind-data-test-attributes-test.js
@@ -1,10 +1,8 @@
 import { module, test } from 'qunit';
-import Ember from 'ember';
+import EmberObject, { computed } from '@ember/object';
 
 import bindDataTestAttributes from 'ember-test-selectors/utils/bind-data-test-attributes';
 
-const { Object: EmberObject, computed } = Ember;
-
 module('Unit | Utility | bind data test attributes');
 
 test('it adds missing attributeBindings array', function(assert) {