diff --git a/.gitignore b/.gitignore
index 614204c..1ca1dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+package-lock.json
 testem.log
 .DS_Store
 /typings/*
diff --git a/addon/mixins/spread.js b/addon/mixins/spread.js
index e8a64cd..8a1ceb8 100644
--- a/addon/mixins/spread.js
+++ b/addon/mixins/spread.js
@@ -132,7 +132,8 @@ export default Mixin.create({
         return
       }
 
-      // Based on: https://github.com/emberjs/ember.js/blob/v2.12.0/packages/ember-runtime/lib/system/core_object.js#L127-L141
+      // Based on
+      // https://github.com/emberjs/ember.js/blob/v2.12.0/packages/ember-runtime/lib/system/core_object.js#L127-L141
       if (Array.isArray(concatenatedProperties) && concatenatedProperties.indexOf(key) !== -1) {
         const baseValue = this[key]
 
@@ -147,7 +148,8 @@ export default Mixin.create({
         return
       }
 
-      // Based on: https://github.com/emberjs/ember.js/blob/v2.12.0/packages/ember-runtime/lib/system/core_object.js#L143-L149
+      // Based on
+      // https://github.com/emberjs/ember.js/blob/v2.12.0/packages/ember-runtime/lib/system/core_object.js#L143-L149
       if (Array.isArray(mergedProperties) && mergedProperties.indexOf(key) !== -1) {
         const originalValue = this[key]
 
diff --git a/ember-cli-build.js b/ember-cli-build.js
index dbce903..c4edcdf 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -2,10 +2,7 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
 
 module.exports = function (defaults) {
-  var app = new EmberAddon(defaults, {
-    'ember-cli-mocha': {
-      useLintTree: false
-    },
+  const app = new EmberAddon(defaults, {
     snippetSearchPaths: ['tests/dummy/app']
   })
 
diff --git a/package.json b/package.json
index b06e44b..29a4cbe 100644
--- a/package.json
+++ b/package.json
@@ -23,38 +23,41 @@
   ],
   "license": "MIT",
   "devDependencies": {
+    "bower": "^1.8.2",
     "broccoli-asset-rev": "^2.4.5",
     "chai-jquery": "^2.0.0",
     "ember-cli": "2.12.3",
-    "ember-cli-chai": "0.3.2",
-    "ember-cli-code-coverage": "0.3.5",
+    "ember-cli-chai": "0.4.3",
+    "ember-cli-code-coverage": "0.3.12",
     "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-frost-blueprints": "^5.0.0",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-htmlbars-inline-precompile": "0.3.12",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-mocha": "0.13.2",
+    "ember-cli-mocha": "0.14.4",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-uglify": "^1.2.0",
-    "ember-code-snippet": "^1.10.0",
+    "ember-code-snippet": "1.7.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-hook": "^1.4.1",
+    "ember-frost-test": "^4.0.0",
+    "ember-hook": "1.4.2",
     "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
-    "ember-sinon": "0.6.0",
+    "ember-sinon": "^0.7.0",
     "ember-source": "~2.12.0",
-    "ember-test-utils": "^1.10.3",
+    "ember-test-utils": "^8.0.0",
     "loader.js": "^4.2.3",
-    "sinon-chai": "^2.8.0"
+    "sinon-chai": "^2.14.0"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
     "ember-cli-babel": "^5.1.7",
-    "ember-prop-types": "^5.0.0"
+    "ember-prop-types": "^6.0.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
\ No newline at end of file
+}
diff --git a/testem.js b/testem.js
index 8c03242..3f7838d 100644
--- a/testem.js
+++ b/testem.js
@@ -1,5 +1,5 @@
 /* eslint-env node */
-var Reporter = require('ember-test-utils/reporter')
+const Reporter = require('ember-test-utils/reporter')
 
 module.exports = {
   disable_watching: true,
diff --git a/tests/dummy/app/pods/index/template.hbs b/tests/dummy/app/pods/index/template.hbs
index 25c3f07..598fb7e 100644
--- a/tests/dummy/app/pods/index/template.hbs
+++ b/tests/dummy/app/pods/index/template.hbs
@@ -131,34 +131,34 @@
   <div class='haunted'>
     {{component hauntShape class='haunted-dot' options=hauntOptions}}
     <svg width=400 viewBox="0 0 75 25">
-    <g>
       <g>
-        <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M12.9,8.6C11.7,8.3,9.9,8,8.8,8C3.9,8,0,10.9,0,16.2
+        <g>
+          <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M12.9,8.6C11.7,8.3,9.9,8,8.8,8C3.9,8,0,10.9,0,16.2
           c0,5.4,3.8,8.2,8.3,8.2c1.3,0,3.4-0.3,4.6-0.9v-4.2c-1,0.4-2.2,0.6-3.2,0.6c-2,0-4.3-1.2-4.3-3.6c0-2.8,2.2-3.8,4.4-3.8
           c1,0,2.2,0.3,3.1,0.6V8.6z"/>
-        <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M61.4,24.3c2.1,0,3.5-0.8,4.6-2v1.6h5.3v-9c0-2.2-0.4-3.8-1.6-5
+          <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M61.4,24.3c2.1,0,3.5-0.8,4.6-2v1.6h5.3v-9c0-2.2-0.4-3.8-1.6-5
           c-1.2-1.2-3.2-1.9-6-1.9c-2.3,0-4.4,0.6-6.4,1.2v4c1.8-0.7,3.9-1,5.5-1c2.1,0,3.1,0.9,3.1,2.6v0.3c-0.9-0.3-2.3-0.6-3.8-0.6
           c-3.7,0-6.2,1.7-6.2,4.9v0.1C56.1,22.6,58.4,24.3,61.4,24.3z M63.3,20.8c-1.1,0-1.9-0.6-1.9-1.7v-0.1c0-1.2,0.9-1.9,2.5-1.9
           c0.8,0,1.5,0.2,2.1,0.5C66.1,19.6,64.9,20.8,63.3,20.8z"/>
-        <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M39.5,8.5h5.3v2.4l0.2-0.3C46,9.2,47.4,8,49.6,8
+          <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M39.5,8.5h5.3v2.4l0.2-0.3C46,9.2,47.4,8,49.6,8
           c3.3,0,5.2,2.1,5.2,5.7v10.2h-5.3v-8.5c0-1.8-0.9-2.8-2.3-2.8c-1.4,0-2.4,1-2.4,2.8v8.5h-5.3V8.5z"/>
-        <g>
           <g>
-            <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M37.9,22c-1.7,1.1-3.9,2.3-6.7,2.3c-2,0-3.8-0.6-5.1-1.6
+            <g>
+              <path fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" d="M37.9,22c-1.7,1.1-3.9,2.3-6.7,2.3c-2,0-3.8-0.6-5.1-1.6
               C23.3,24,21.2,24.4,19,24c-3.5-0.6-4-3.7-4-5.7V8.6h4.9c0,0,0,4.7,0.1,8.1c0.1,2.8,0.7,4.2,3.8,3.4c-0.5-1.1-0.8-2.5-0.8-3.9
               c0.1-4.5,3.6-8.6,8.2-8.6c5.3,0,6.5,4.5,4.6,7.5c-1.2,1.9-3,3.5-4.9,4.8c1.9,1.4,4.9,0.4,7-0.9V22z M32.2,15.2
               c1.8-2.3,0.4-3.6-1.2-3.3c-1.4,0.3-3.6,2.6-1.8,5.9C30.4,17,31.5,16.1,32.2,15.2z"/>
+            </g>
+            <circle fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" cx="17.5" cy="3.5" r="2.9"/>
           </g>
-          <circle fill-rule="evenodd" clip-rule="evenodd" fill="#DC242E" cx="17.5" cy="3.5" r="2.9"/>
         </g>
-      </g>
-      <g>
-        <path fill="#DC242E" d="M74,22c0.5,0,1,0.4,1,1c0,0.6-0.4,1-1,1c-0.5,0-1-0.4-1-1C73.1,22.4,73.5,22,74,22z M74,23.8
+        <g>
+          <path fill="#DC242E" d="M74,22c0.5,0,1,0.4,1,1c0,0.6-0.4,1-1,1c-0.5,0-1-0.4-1-1C73.1,22.4,73.5,22,74,22z M74,23.8
           c0.5,0,0.8-0.4,0.8-0.8c0-0.5-0.4-0.8-0.8-0.8c-0.5,0-0.8,0.4-0.8,0.8C73.2,23.4,73.6,23.8,74,23.8z M73.7,22.4h0.4
           c0.3,0,0.4,0.1,0.4,0.3c0,0.2-0.1,0.3-0.3,0.3l0.3,0.5h-0.2L74,23.1h-0.2v0.5h-0.2V22.4z M73.8,22.9H74c0.2,0,0.3,0,0.3-0.2
           c0-0.2-0.1-0.2-0.3-0.2h-0.2V22.9z"/>
+        </g>
       </g>
-    </g>
     </svg>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index 4010ebb..e22d50c 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -1,7 +1,7 @@
 /* eslint-env node */
 
 module.exports = function (environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
     podModulePrefix: 'dummy/pods',
     environment: environment,
diff --git a/tests/integration/components/spread-test.js b/tests/integration/components/spread-test.js
index d456b59..90386df 100644
--- a/tests/integration/components/spread-test.js
+++ b/tests/integration/components/spread-test.js
@@ -2,8 +2,8 @@ import {expect} from 'chai'
 import Ember from 'ember'
 const {Component, computed} = Ember
 import {$hook, initialize as initializeHook} from 'ember-hook'
-import {setupComponentTest} from 'ember-mocha'
 import SpreadMixin from 'ember-spread'
+import {integration} from 'ember-test-utils/test-support/setup-component-test'
 import hbs from 'htmlbars-inline-precompile'
 import {beforeEach, describe, it} from 'mocha'
 
@@ -37,10 +37,10 @@ const SpreadComponent = Component.extend(SpreadMixin, {
   }
 })
 
-describe('ember-spread', function () {
-  setupComponentTest('ember-spread', {
-    integration: true
-  })
+const test = integration('ember-spread')
+
+describe(test.label, function () {
+  test.setup()
 
   let handler