diff --git a/tests/node/helpers/setup-app.js b/tests/node/helpers/setup-app.js
index 6749946018b..32abc05b417 100644
--- a/tests/node/helpers/setup-app.js
+++ b/tests/node/helpers/setup-app.js
@@ -92,16 +92,23 @@ function createApplication() {
 
   let app = this.Ember.Application.extend().create({
     autoboot: false,
+    Resolver: {
+      create: (specifier) => {
+        return this.registry[specifier];
+      },
+    },
   });
 
-  app.Router = this.Ember.Router.extend({
+  let Router = this.Ember.Router.extend({
     location: 'none',
   });
 
   if (this.routesCallback) {
-    app.Router.map(this.routesCallback);
+    Router.map(this.routesCallback);
   }
 
+  this.register('router:main', Router);
+
   registerApplicationClasses(app, this.registry);
 
   // Run application initializers