diff --git a/test/javascripts/integration/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6
similarity index 100%
rename from test/javascripts/integration/about-test.js.es6
rename to test/javascripts/acceptance/about-test.js.es6
diff --git a/test/javascripts/integration/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6
similarity index 100%
rename from test/javascripts/integration/badges-test.js.es6
rename to test/javascripts/acceptance/badges-test.js.es6
diff --git a/test/javascripts/integration/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
similarity index 100%
rename from test/javascripts/integration/create-account-user-fields-test.js.es6
rename to test/javascripts/acceptance/create-account-user-fields-test.js.es6
diff --git a/test/javascripts/integration/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
similarity index 100%
rename from test/javascripts/integration/groups-test.js.es6
rename to test/javascripts/acceptance/groups-test.js.es6
diff --git a/test/javascripts/integration/header-anonymous-test.js.es6 b/test/javascripts/acceptance/header-anonymous-test.js.es6
similarity index 100%
rename from test/javascripts/integration/header-anonymous-test.js.es6
rename to test/javascripts/acceptance/header-anonymous-test.js.es6
diff --git a/test/javascripts/integration/header-test-staff.js.es6 b/test/javascripts/acceptance/header-test-staff.js.es6
similarity index 100%
rename from test/javascripts/integration/header-test-staff.js.es6
rename to test/javascripts/acceptance/header-test-staff.js.es6
diff --git a/test/javascripts/integration/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js.es6
similarity index 100%
rename from test/javascripts/integration/login-required-test.js.es6
rename to test/javascripts/acceptance/login-required-test.js.es6
diff --git a/test/javascripts/integration/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
similarity index 100%
rename from test/javascripts/integration/modal-test.js.es6
rename to test/javascripts/acceptance/modal-test.js.es6
diff --git a/test/javascripts/integration/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
similarity index 100%
rename from test/javascripts/integration/sign-in-test.js.es6
rename to test/javascripts/acceptance/sign-in-test.js.es6
diff --git a/test/javascripts/integration/static-test.js.es6 b/test/javascripts/acceptance/static-test.js.es6
similarity index 100%
rename from test/javascripts/integration/static-test.js.es6
rename to test/javascripts/acceptance/static-test.js.es6
diff --git a/test/javascripts/integration/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6
similarity index 100%
rename from test/javascripts/integration/topic-discovery-test.js.es6
rename to test/javascripts/acceptance/topic-discovery-test.js.es6
diff --git a/test/javascripts/integration/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
similarity index 100%
rename from test/javascripts/integration/topic-test.js.es6
rename to test/javascripts/acceptance/topic-test.js.es6
diff --git a/test/javascripts/integration/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
similarity index 100%
rename from test/javascripts/integration/unknown-test.js.es6
rename to test/javascripts/acceptance/unknown-test.js.es6
diff --git a/test/javascripts/integration/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js.es6
similarity index 100%
rename from test/javascripts/integration/user-card-test.js.es6
rename to test/javascripts/acceptance/user-card-test.js.es6
diff --git a/test/javascripts/integration/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
similarity index 100%
rename from test/javascripts/integration/user-test.js.es6
rename to test/javascripts/acceptance/user-test.js.es6
diff --git a/test/javascripts/integration/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
similarity index 100%
rename from test/javascripts/integration/users-test.js.es6
rename to test/javascripts/acceptance/users-test.js.es6
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index bf87e3d2549..87c2812f06a 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -127,8 +127,6 @@ var helpers = require("helpers/qunit-helpers");
 window.asyncTestDiscourse = helpers.asyncTestDiscourse;
 window.controllerFor = helpers.controllerFor;
 window.fixture = helpers.fixture;
-window.integration = helpers.integration;
-
 
 Ember.keys(requirejs.entries).forEach(function(entry) {
   if ((/\-test/).test(entry)) {