diff --git a/addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts b/addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts
index 0048212b8..375d2bb38 100644
--- a/addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts
+++ b/addon/addon-test-support/@ember/test-helpers/-internal/build-registry.ts
@@ -123,7 +123,7 @@ export default function (resolver: Resolver) {
     // correctly for the tests; that's why we import and call setupContainer
     // here; also see https://github.com/emberjs/data/issues/4071 for context
     let setupContainer = require('ember-data/setup-container')['default'];
-    setupContainer(registry || container);
+    setupContainer(owner);
   }
 
   return {