diff --git a/lib/ember-test-helpers/build-registry.js b/lib/ember-test-helpers/build-registry.js
index b910b24bb..3cf7b47d8 100644
--- a/lib/ember-test-helpers/build-registry.js
+++ b/lib/ember-test-helpers/build-registry.js
@@ -60,6 +60,10 @@ export default function(resolver) {
       fallback: fallbackRegistry
     });
 
+    if (Ember.ApplicationInstance && Ember.ApplicationInstance.setupRegistry) {
+      Ember.ApplicationInstance.setupRegistry(registry);
+    }
+
     // these properties are set on the fallback registry by `buildRegistry`
     // and on the primary registry within the ApplicationInstance constructor
     // but we need to manually recreate them since ApplicationInstance's are not