diff --git a/ember/package.json b/ember/package.json
index a52aabdd6d..63f300e540 100644
--- a/ember/package.json
+++ b/ember/package.json
@@ -35,7 +35,7 @@
     "ember-cli-htmlbars": "^1.0.10",
     "ember-cli-htmlbars-inline-precompile": "^0.3.3",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-mocha": "^0.11.0",
+    "ember-cli-mocha": "^0.12.1",
     "ember-cli-sass": "5.5.2",
     "ember-cli-sentry": "2.4.2",
     "ember-cli-test-loader": "^1.1.0",
diff --git a/ember/tests/integration/components/flight-list-nav-test.js b/ember/tests/integration/components/flight-list-nav-test.js
index f9f256e338..6fb3a10ede 100644
--- a/ember/tests/integration/components/flight-list-nav-test.js
+++ b/ember/tests/integration/components/flight-list-nav-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: FlightListNavComponent', function() {
+  setupComponentTest('flight-list-nav', { integration: true });
 
-describeComponent('flight-list-nav', 'Integration: FlightListNavComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);
 
diff --git a/ember/tests/integration/components/timeline-events/club-join-test.js b/ember/tests/integration/components/timeline-events/club-join-test.js
index fc15821677..7856812aac 100644
--- a/ember/tests/integration/components/timeline-events/club-join-test.js
+++ b/ember/tests/integration/components/timeline-events/club-join-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: ClubJoinTimelineEventComponent', function() {
+  setupComponentTest('timeline-events/club-join', { integration: true });
 
-describeComponent('timeline-events/club-join', 'Integration: ClubJoinTimelineEventComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);
 
diff --git a/ember/tests/integration/components/timeline-events/flight-comment-test.js b/ember/tests/integration/components/timeline-events/flight-comment-test.js
index 58ac7967df..9a5de86c84 100644
--- a/ember/tests/integration/components/timeline-events/flight-comment-test.js
+++ b/ember/tests/integration/components/timeline-events/flight-comment-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: FlightCommentTimelineEventComponent', function() {
+  setupComponentTest('timeline-events/flight-comment', { integration: true });
 
-describeComponent('timeline-events/flight-comment', 'Integration: FlightCommentTimelineEventComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);
 
diff --git a/ember/tests/integration/components/timeline-events/flight-upload-test.js b/ember/tests/integration/components/timeline-events/flight-upload-test.js
index e5c59f1f25..f7344f59d2 100644
--- a/ember/tests/integration/components/timeline-events/flight-upload-test.js
+++ b/ember/tests/integration/components/timeline-events/flight-upload-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: FlightUploadTimelineEventComponent', function() {
+  setupComponentTest('timeline-events/flight-upload', { integration: true });
 
-describeComponent('timeline-events/flight-upload', 'Integration: FlightUploadTimelineEventComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);
 
diff --git a/ember/tests/integration/components/timeline-events/follower-test.js b/ember/tests/integration/components/timeline-events/follower-test.js
index 553e595d4f..ab895ae8da 100644
--- a/ember/tests/integration/components/timeline-events/follower-test.js
+++ b/ember/tests/integration/components/timeline-events/follower-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: FollowerTimelineEventComponent', function() {
+  setupComponentTest('timeline-events/follower', { integration: true });
 
-describeComponent('timeline-events/follower', 'Integration: FollowerTimelineEventComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);
 
diff --git a/ember/tests/integration/components/timeline-events/new-user-test.js b/ember/tests/integration/components/timeline-events/new-user-test.js
index a7b23476cb..daf046cdd0 100644
--- a/ember/tests/integration/components/timeline-events/new-user-test.js
+++ b/ember/tests/integration/components/timeline-events/new-user-test.js
@@ -1,15 +1,15 @@
 import Ember from 'ember';
 
 import { expect } from 'chai';
-import { describeComponent, it } from 'ember-mocha';
-import { beforeEach } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import { beforeEach, it, describe } from 'mocha';
 import hbs from 'htmlbars-inline-precompile';
 
 import instanceInitializer from '../../../../instance-initializers/ember-intl';
 
-let options = { integration: true };
+describe('Integration: NewUserTimelineEventComponent', function() {
+  setupComponentTest('timeline-events/new-user', { integration: true });
 
-describeComponent('timeline-events/new-user', 'Integration: NewUserTimelineEventComponent', options, function() {
   beforeEach(function() {
     instanceInitializer.initialize(this);