diff --git a/.jscsrc b/.jscsrc
index 324b5b00..f261a13f 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,4 +1,5 @@
 {
+  "preset": "ember-suave",
   "esnext": true,
   "disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningRoundBrace": true
diff --git a/.npmignore b/.npmignore
index c14bfcc9..4f6a71f7 100644
--- a/.npmignore
+++ b/.npmignore
@@ -10,5 +10,4 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
-ember-cli-build.js
 testem.json
diff --git a/.watchmanconfig b/.watchmanconfig
index 5e9462c2..e7834e3e 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/README.md b/README.md
index f5a17545..763ae50f 100644
--- a/README.md
+++ b/README.md
@@ -267,6 +267,8 @@ export default Ember.Mixin.create(
 ## Development
 
 - `git clone https://github.com/sir-dunxalot/ember-tooltips.git`
+- `cd ember-tooltips`
+- `npm install && bower install`
 - `ember s`
 - `ember test` or `/tests` route
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
deleted file mode 100644
index a9331f74..00000000
--- a/app/styles/app.scss
+++ /dev/null
@@ -1 +0,0 @@
- @import 'ember-paper';
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 655aa3bf..41c03155 100644
--- a/bower.json
+++ b/bower.json
@@ -1,21 +1,22 @@
 {
   "name": "ember-tooltips",
   "dependencies": {
-    "ember": "2.0.2",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.5",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "2.0.0",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
-    "ember-qunit": "0.4.10",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.21",
+    "ember": "2.1.0",
+    "ember-cli-shims": "0.0.6",
+    "ember-cli-test-loader": "0.2.1",
+    "ember-load-initializers": "0.1.7",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
-    "qunit": "~1.18.0",
-    "hammerjs": "~2.0.4",
-    "matchMedia": "0.2.0"
+    "loader.js": "3.3.0"
   },
   "devDependencies": {
-    "compass-mixins": "~1.0.2"
+    "compass-mixins": "~1.0.2",
+    "ember-qunit": "0.4.13",
+    "ember-qunit-notifications": "0.1.0",
+    "hammerjs": "~2.0.4",
+    "matchMedia": "0.2.0",
+    "qunit": "~1.19.0"
+  },
+  "resolutions": {
+    "ember": "2.1.0"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
index 83dab0f1..3e88bc61 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 module.exports = {
   scenarios: [
     {
diff --git a/config/environment.js b/config/environment.js
index 0dfaed47..28a787b6 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 3ae8632e..e6f785d2 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,16 +1,17 @@
+/*jshint node:true*/
 /* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  var app = new EmberAddon(defaults, {
     snippetSearchPaths: ['app', 'tests'],
 
     sassOptions: {
       extension: 'scss',
       includePaths: [
-        'bower_components/compass-mixins/lib',
-      ],
-    },
+        'bower_components/compass-mixins/lib'
+      ]
+    }
   });
 
   /*
diff --git a/package.json b/package.json
index 740687f6..b24eb104 100644
--- a/package.json
+++ b/package.json
@@ -18,27 +18,26 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
+    "broccoli-asset-rev": "^2.2.0",
     "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
+    "ember-cli-app-version": "^1.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.1",
+    "ember-cli-dependency-checker": "^1.1.0",
     "ember-cli-github-pages": "0.0.6",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.0",
-    "ember-cli-release": "0.2.7",
+    "ember-cli-qunit": "^1.0.3",
+    "ember-cli-release": "0.2.8",
     "ember-cli-sass": "4.2.1",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.1.0",
-    "ember-data": "2.0.0",
     "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4",
     "ember-paper": "0.2.8",
-    "ember-suave": "1.1.0",
-    "ember-try": "0.0.6",
+    "ember-suave": "1.2.2",
+    "ember-resolver": "^2.0.3",
+    "ember-try": "~0.0.8",
     "publish": "^0.5.0",
     "rsvp": "^3.1.0"
   },
@@ -52,7 +51,7 @@
   ],
   "dependencies": {
     "ember-cli-babel": "^5.1.5",
-    "ember-cli-htmlbars": "0.7.9"
+    "ember-cli-htmlbars": "^1.0.1"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
index 8d5b99ed..80341dec 100644
--- a/tests/dummy/app/app.js
+++ b/tests/dummy/app/app.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index 411e394f..b4b57d4d 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -23,7 +23,7 @@ module.exports = function(environment) {
       'style-src': "'self' 'unsafe-inline' *.google.com *.googleapis.com",
       'font-src': "'self' *.gstatic.com *.googleapis.com",
       'img-src': "'self' *.amazonaws.com",
-    },
+    }
   };
 
   if (environment === 'development') {
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
new file mode 100644
index 00000000..c3d4d1ab
--- /dev/null
+++ b/tests/helpers/destroy-app.js
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
new file mode 100644
index 00000000..9b6952b7
--- /dev/null
+++ b/tests/helpers/module-for-acceptance.js
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      destroyApp(this.application);
+
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+    },
+  });
+}
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
index 723e4022..1cbe8eec 100644
--- a/tests/helpers/resolver.js
+++ b/tests/helpers/resolver.js
@@ -1,4 +1,4 @@
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import config from '../../config/environment';
 
 const resolver = Resolver.create();
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 482782f9..87def335 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -9,12 +9,12 @@ import './async/mouse-over';
 import './sync/inspect';
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
   let application;
 
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/tests/index.html b/tests/index.html
index 8fea6fe7..5e88e5e1 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -18,13 +18,14 @@
     {{content-for 'test-head-footer'}}
   </head>
   <body>
-
     {{content-for 'body'}}
     {{content-for 'test-body'}}
+
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="testem.js"></script>
+    <script src="testem.js" integrity=""></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
     {{content-for 'body-footer'}}