diff --git a/app/tests/helpers/module-for-acceptance.js b/app/tests/helpers/module-for-acceptance.js
index 8c8b74ec..562c95a5 100644
--- a/app/tests/helpers/module-for-acceptance.js
+++ b/app/tests/helpers/module-for-acceptance.js
@@ -10,14 +10,21 @@ export default function(name, options = {}) {
       if (options.beforeEach) {
         options.beforeEach.apply(this, arguments);
       }
+
+      this.register = (fullName, Factory) => {
+        let instance = this.application.__deprecatedInstance__;
+        let registry = instance.register ? instance : instance.registry;
+
+        return registry.register(fullName, Factory);
+      };
     },
 
     afterEach() {
+      destroyApp(this.application);
+
       if (options.afterEach) {
         options.afterEach.apply(this, arguments);
       }
-
-      destroyApp(this.application);
     }
   });
 }
diff --git a/app/tests/helpers/stub-session.js b/app/tests/helpers/stub-session.js
new file mode 100644
index 00000000..8bcc4027
--- /dev/null
+++ b/app/tests/helpers/stub-session.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+
+const Session = Ember.Service.extend({
+    login(credentials) {
+        // TODO: figure out what to do with credentials
+        return new Ember.RSVP.resolve();
+    }
+});
+
+export default Ember.Test.registerAsyncHelper('stubSession', function(app, test, attrs={}) {
+    test.register('service:session', Session.extend(attrs));
+});