diff --git a/packages/-ember-data/addon/index.js b/packages/-ember-data/addon/index.js
index 9ed13daf31a..f0dc70104dc 100644
--- a/packages/-ember-data/addon/index.js
+++ b/packages/-ember-data/addon/index.js
@@ -186,7 +186,7 @@ import JSONSerializer from '@ember-data/serializer/json';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import Transform from '@ember-data/serializer/transform';
-import Store, { normalizeModelName } from '@ember-data/store';
+import { normalizeModelName } from '@ember-data/store';
 
 import {
   DS,
@@ -197,6 +197,7 @@ import {
   PromiseObject,
   RecordArrayManager,
   Snapshot,
+  Store,
 } from './-private';
 import setupContainer from './setup-container';
 
diff --git a/packages/request/src/-private/debug.ts b/packages/request/src/-private/debug.ts
index 7ef136a102c..078296ad3b5 100644
--- a/packages/request/src/-private/debug.ts
+++ b/packages/request/src/-private/debug.ts
@@ -107,7 +107,11 @@ export function deepFreeze<T = unknown>(value: T): T {
           return value;
         case 'object':
           Object.keys(value as {}).forEach((key) => {
-            (value as {})[key] = deepFreeze((value as {})[key]) as {};
+            try {
+              (value as {})[key] = deepFreeze((value as {})[key]) as {};
+            } catch {
+              // continue
+            }
           });
           value[IS_FROZEN] = true;
           return Object.freeze(value);
diff --git a/packages/store/rollup.config.mjs b/packages/store/rollup.config.mjs
index 69ad24c4328..094ab2b8477 100644
--- a/packages/store/rollup.config.mjs
+++ b/packages/store/rollup.config.mjs
@@ -16,6 +16,7 @@ export default {
     '@embroider/macros',
     '@glimmer/tracking',
 
+    '@ember-data/legacy-compat/-private',
     '@ember-data/tracking/-private',
     '@ember-data/private-build-infra/deprecations',
     '@ember/-internals/metal',
diff --git a/tests/main/app/services/store.ts b/tests/main/app/services/store.ts
new file mode 100644
index 00000000000..f41e1d3d9a3
--- /dev/null
+++ b/tests/main/app/services/store.ts
@@ -0,0 +1 @@
+export { default } from 'ember-data/store';
diff --git a/tests/main/tests/acceptance/relationships/belongs-to-test.js b/tests/main/tests/acceptance/relationships/belongs-to-test.js
index 4ea1a02c1b7..0c793859ec2 100644
--- a/tests/main/tests/acceptance/relationships/belongs-to-test.js
+++ b/tests/main/tests/acceptance/relationships/belongs-to-test.js
@@ -12,7 +12,7 @@ import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { LEGACY_SUPPORT } from '@ember-data/model/-private';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store, { recordIdentifierFor } from '@ember-data/store';
+import { recordIdentifierFor } from '@ember-data/store';
 
 import { implicitRelationshipsFor } from '../../helpers/accessors';
 
@@ -228,7 +228,6 @@ module('async belongs-to rendering tests', function (hooks) {
         },
       })
     );
-    owner.register('service:store', Store);
     store = owner.lookup('service:store');
     adapter = store.adapterFor('application');
   });
diff --git a/tests/main/tests/acceptance/relationships/has-many-test.js b/tests/main/tests/acceptance/relationships/has-many-test.js
index 33dae04cf28..f9ef08c2edf 100644
--- a/tests/main/tests/acceptance/relationships/has-many-test.js
+++ b/tests/main/tests/acceptance/relationships/has-many-test.js
@@ -18,7 +18,6 @@ import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { LEGACY_SUPPORT } from '@ember-data/model/-private';
 import { DEPRECATE_ARRAY_LIKE } from '@ember-data/private-build-infra/deprecations';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/deprecated-test';
 
 class Person extends Model {
@@ -207,7 +206,6 @@ module('async has-many rendering tests', function (hooks) {
     owner.register('model:person', Person);
     owner.register('adapter:application', TestAdapter);
     owner.register('serializer:application', JSONAPISerializer);
-    owner.register('service:store', Store);
     store = owner.lookup('service:store');
     adapter = store.adapterFor('application');
   });
@@ -694,7 +692,6 @@ module('autotracking has-many', function (hooks) {
     owner.register('model:person', Person);
     owner.register('adapter:application', TestAdapter);
     owner.register('serializer:application', JSONAPISerializer);
-    owner.register('service:store', Store);
     store = owner.lookup('service:store');
   });
 
diff --git a/tests/main/tests/acceptance/relationships/tracking-record-state-test.js b/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
index cde3be0ab27..1bdbcc6779b 100644
--- a/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
+++ b/tests/main/tests/acceptance/relationships/tracking-record-state-test.js
@@ -11,7 +11,6 @@ import { resolve } from 'rsvp';
 import { setupRenderingTest } from 'ember-qunit';
 
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 class Tag {
   @tracked rev = 0;
@@ -20,10 +19,6 @@ class Tag {
 module('tracking state flags on a record', function (hooks) {
   setupRenderingTest(hooks);
 
-  hooks.beforeEach(function () {
-    this.owner.register('service:store', Store);
-  });
-
   function resolveAsync(initializer) {
     return function (target, key, desc) {
       const tag = new Tag();
diff --git a/tests/main/tests/acceptance/tracking-model-id-test.js b/tests/main/tests/acceptance/tracking-model-id-test.js
index 8b9d77e3d3b..005eb8453c3 100644
--- a/tests/main/tests/acceptance/tracking-model-id-test.js
+++ b/tests/main/tests/acceptance/tracking-model-id-test.js
@@ -10,7 +10,6 @@ import { setupRenderingTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 
 class Widget extends Model {
   @attr() name;
@@ -60,7 +59,6 @@ module('acceptance/tracking-model-id - tracking model id', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:widget', Widget);
     owner.register('component:widget-list', WidgetList);
     owner.register('template:components/widget-list', layout);
diff --git a/tests/main/tests/acceptance/tracking-promise-flags-test.js b/tests/main/tests/acceptance/tracking-promise-flags-test.js
index 9603d27e2b5..50187219dda 100644
--- a/tests/main/tests/acceptance/tracking-promise-flags-test.js
+++ b/tests/main/tests/acceptance/tracking-promise-flags-test.js
@@ -7,7 +7,6 @@ import { setupRenderingTest } from 'ember-qunit';
 
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
 import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/deprecated-test';
 
 class Widget extends Model {
@@ -19,7 +18,6 @@ module('acceptance/tracking-promise-flags', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:widget', Widget);
     owner.register(
       'serializer:application',
diff --git a/tests/main/tests/integration/identifiers/cache-test.ts b/tests/main/tests/integration/identifiers/cache-test.ts
index 42c547657bc..1e13e188633 100644
--- a/tests/main/tests/integration/identifiers/cache-test.ts
+++ b/tests/main/tests/integration/identifiers/cache-test.ts
@@ -2,7 +2,6 @@ import { module, test } from 'qunit';
 
 import { setupTest } from 'ember-qunit';
 
-import Store from '@ember-data/store';
 import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
 module('Integration | Identifiers - cache', function (hooks) {
@@ -10,7 +9,6 @@ module('Integration | Identifiers - cache', function (hooks) {
   let store, cache;
 
   hooks.beforeEach(function () {
-    this.owner.register(`service:store`, Store);
     store = this.owner.lookup('service:store');
     cache = store.identifierCache;
   });
diff --git a/tests/main/tests/integration/identifiers/configuration-test.ts b/tests/main/tests/integration/identifiers/configuration-test.ts
index 4e6fe62333a..66a57835213 100644
--- a/tests/main/tests/integration/identifiers/configuration-test.ts
+++ b/tests/main/tests/integration/identifiers/configuration-test.ts
@@ -44,7 +44,6 @@ module('Integration | Identifiers - configuration', function (hooks) {
     }
 
     owner.register('model:user', User);
-    owner.register('service:store', Store);
 
     let localIdInc = 9000;
     const generationMethod = (resource: ResourceData | { type: string }) => {
diff --git a/tests/main/tests/integration/identifiers/lid-reflection-test.ts b/tests/main/tests/integration/identifiers/lid-reflection-test.ts
index 41587cf43ad..7fb84789354 100644
--- a/tests/main/tests/integration/identifiers/lid-reflection-test.ts
+++ b/tests/main/tests/integration/identifiers/lid-reflection-test.ts
@@ -7,7 +7,7 @@ import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import Store, { recordIdentifierFor } from '@ember-data/store';
+import { recordIdentifierFor } from '@ember-data/store';
 import type { Snapshot } from '@ember-data/store/-private';
 
 module('Integration | Identifiers - lid reflection', function (hooks: NestedHooks) {
@@ -16,7 +16,6 @@ module('Integration | Identifiers - lid reflection', function (hooks: NestedHook
 
   hooks.beforeEach(function () {
     const { owner } = this;
-    owner.register(`service:store`, Store);
 
     class User extends Model {
       @attr declare name: string;
diff --git a/tests/main/tests/integration/identifiers/new-records-test.ts b/tests/main/tests/integration/identifiers/new-records-test.ts
index 5c59ab29b2a..15dad45af39 100644
--- a/tests/main/tests/integration/identifiers/new-records-test.ts
+++ b/tests/main/tests/integration/identifiers/new-records-test.ts
@@ -3,7 +3,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr } from '@ember-data/model';
-import Store, { recordIdentifierFor } from '@ember-data/store';
+import { recordIdentifierFor } from '@ember-data/store';
 
 module('Integration | Identifiers - creating new records', function (hooks) {
   setupTest(hooks);
@@ -11,7 +11,6 @@ module('Integration | Identifiers - creating new records', function (hooks) {
 
   hooks.beforeEach(function () {
     const { owner } = this;
-    owner.register(`service:store`, Store);
 
     class User extends Model {
       @attr() name;
diff --git a/tests/main/tests/integration/identifiers/polymorphic-scenarios-test.ts b/tests/main/tests/integration/identifiers/polymorphic-scenarios-test.ts
index 0b8bc19a8d0..9fdba4ebe92 100644
--- a/tests/main/tests/integration/identifiers/polymorphic-scenarios-test.ts
+++ b/tests/main/tests/integration/identifiers/polymorphic-scenarios-test.ts
@@ -7,7 +7,6 @@ import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 type RID = { type: string; id: string };
 
@@ -61,7 +60,6 @@ module('Integration | Identifiers - single-table-inheritance polymorphic scenari
       owner.register('model:ferrari', Ferrari);
       owner.register('model:bmw', Bmw);
       owner.register('model:dealership', Dealership);
-      owner.register('service:store', Store);
 
       store = owner.lookup('service:store');
     });
diff --git a/tests/main/tests/integration/identifiers/record-identifier-for-test.ts b/tests/main/tests/integration/identifiers/record-identifier-for-test.ts
index 9dbf6f564ba..3dd56aa4663 100644
--- a/tests/main/tests/integration/identifiers/record-identifier-for-test.ts
+++ b/tests/main/tests/integration/identifiers/record-identifier-for-test.ts
@@ -7,7 +7,7 @@ import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import Model, { attr } from '@ember-data/model';
-import Store, { recordIdentifierFor } from '@ember-data/store';
+import { recordIdentifierFor } from '@ember-data/store';
 
 module('Integration | Identifiers - recordIdentifierFor', function (hooks) {
   setupTest(hooks);
@@ -15,7 +15,6 @@ module('Integration | Identifiers - recordIdentifierFor', function (hooks) {
 
   hooks.beforeEach(function () {
     const { owner } = this;
-    owner.register(`service:store`, Store);
 
     class User extends Model {
       @attr() name;
diff --git a/tests/main/tests/integration/identifiers/scenarios-test.ts b/tests/main/tests/integration/identifiers/scenarios-test.ts
index 51a028d93ec..5e5f0591142 100644
--- a/tests/main/tests/integration/identifiers/scenarios-test.ts
+++ b/tests/main/tests/integration/identifiers/scenarios-test.ts
@@ -7,7 +7,8 @@ import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import Model, { attr } from '@ember-data/model';
-import Store, {
+import type Store from '@ember-data/store';
+import {
   recordIdentifierFor,
   setIdentifierForgetMethod,
   setIdentifierGenerationMethod,
@@ -293,7 +294,6 @@ module('Integration | Identifiers - scenarios', function (hooks) {
       owner.register('adapter:application', TestAdapter);
       owner.register('serializer:application', TestSerializer);
       owner.register('model:user', User);
-      owner.register('service:store', Store);
 
       calls = {
         findRecord: 0,
diff --git a/tests/main/tests/integration/multiple-stores-test.js b/tests/main/tests/integration/multiple-stores-test.js
index 8545b0efb3f..1ba4d27934f 100644
--- a/tests/main/tests/integration/multiple-stores-test.js
+++ b/tests/main/tests/integration/multiple-stores-test.js
@@ -2,13 +2,13 @@
 // because the ember-data/store uses DefaultRecordData while @ember-data/store does not
 import { module, test } from 'qunit';
 
+import Store from 'ember-data/store';
 import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import RESTAdapter from '@ember-data/adapter/rest';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
-import Store from '@ember-data/store';
 
 module('integration/multiple_stores - Multiple Stores Tests', function (hooks) {
   setupTest(hooks);
diff --git a/tests/main/tests/integration/records/create-record-test.js b/tests/main/tests/integration/records/create-record-test.js
index 4ff92011d0f..e87870d68ad 100644
--- a/tests/main/tests/integration/records/create-record-test.js
+++ b/tests/main/tests/integration/records/create-record-test.js
@@ -8,7 +8,6 @@ import { setupTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 
 class Person extends Model {
   @hasMany('pet', { inverse: 'owner', async: false })
@@ -34,7 +33,6 @@ module('Store.createRecord() coverage', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     owner.register('model:pet', Pet);
     store = owner.lookup('service:store');
diff --git a/tests/main/tests/integration/records/edit-record-test.js b/tests/main/tests/integration/records/edit-record-test.js
index ec159bffad9..55804918ef0 100644
--- a/tests/main/tests/integration/records/edit-record-test.js
+++ b/tests/main/tests/integration/records/edit-record-test.js
@@ -3,7 +3,6 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 class Person extends Model {
   @hasMany('pet', { inverse: 'owner', async: false })
@@ -29,7 +28,6 @@ module('Editing a Record', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     owner.register('model:pet', Pet);
     store = owner.lookup('service:store');
diff --git a/tests/main/tests/integration/records/load-test.js b/tests/main/tests/integration/records/load-test.js
index 37ede8e72b3..7ecffd5df19 100644
--- a/tests/main/tests/integration/records/load-test.js
+++ b/tests/main/tests/integration/records/load-test.js
@@ -9,7 +9,6 @@ import { setupTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
 function _isLoading(cache, identifier) {
@@ -39,7 +38,6 @@ module('integration/load - Loading Records', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     store = owner.lookup('service:store');
   });
diff --git a/tests/main/tests/integration/records/reload-test.js b/tests/main/tests/integration/records/reload-test.js
index abd10984adb..86e2f6ab997 100644
--- a/tests/main/tests/integration/records/reload-test.js
+++ b/tests/main/tests/integration/records/reload-test.js
@@ -8,7 +8,6 @@ import { setupTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 
 module('integration/reload - Reloading Records', function (hooks) {
   let store;
@@ -27,7 +26,6 @@ module('integration/reload - Reloading Records', function (hooks) {
     }
 
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     owner.register(
       'serializer:application',
diff --git a/tests/main/tests/integration/relationships/belongs-to-test.js b/tests/main/tests/integration/relationships/belongs-to-test.js
index 6d0c814041c..fee6d8cd0f2 100644
--- a/tests/main/tests/integration/relationships/belongs-to-test.js
+++ b/tests/main/tests/integration/relationships/belongs-to-test.js
@@ -8,7 +8,6 @@ import { setupTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/deprecated-test';
 import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
@@ -34,7 +33,6 @@ module('integration/relationship/belongs-to BelongsTo Relationships (new-style)'
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     owner.register('model:pet', Pet);
     owner.register(
diff --git a/tests/main/tests/integration/relationships/inverse-relationship-load-test.js b/tests/main/tests/integration/relationships/inverse-relationship-load-test.js
index 26a2535845b..07acff34fec 100644
--- a/tests/main/tests/integration/relationships/inverse-relationship-load-test.js
+++ b/tests/main/tests/integration/relationships/inverse-relationship-load-test.js
@@ -6,7 +6,6 @@ import { setupTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/deprecated-test';
 
 module('inverse relationship load test', function (hooks) {
@@ -15,7 +14,6 @@ module('inverse relationship load test', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     store = owner.lookup('service:store');
     owner.register(
       'serializer:application',
diff --git a/tests/main/tests/integration/relationships/relationship-links-test.js b/tests/main/tests/integration/relationships/relationship-links-test.js
index c5260e46c27..78fefc55b9c 100644
--- a/tests/main/tests/integration/relationships/relationship-links-test.js
+++ b/tests/main/tests/integration/relationships/relationship-links-test.js
@@ -6,7 +6,6 @@ import { resolve } from 'rsvp';
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr, hasMany } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 module('JSON:API links access on relationships', function (hooks) {
   setupTest(hooks);
@@ -14,7 +13,6 @@ module('JSON:API links access on relationships', function (hooks) {
 
   hooks.beforeEach(function () {
     const { owner } = this;
-    owner.register('service:store', Store);
     store = owner.lookup('service:store');
   });
 
diff --git a/tests/main/tests/integration/store/model-name-test.js b/tests/main/tests/integration/store/model-name-test.js
index d703aa6b783..113d7ac9c02 100644
--- a/tests/main/tests/integration/store/model-name-test.js
+++ b/tests/main/tests/integration/store/model-name-test.js
@@ -6,7 +6,6 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 function startsWith(str, substr) {
   if (typeof str.startsWith === 'function') {
@@ -37,7 +36,6 @@ module('@ember-data/model klass.modelName', function (hooks) {
     owner.register('model:animal', Animal);
     owner.register('model:pet', Pet);
     owner.register('service:animal-helper', AnimalHelper);
-    owner.register('sercice:store', Store);
     const store = owner.lookup('service:store');
     const animalHelper = owner.lookup('service:animal-helper');
 
diff --git a/tests/main/tests/integration/store/package-import-test.js b/tests/main/tests/integration/store/package-import-test.js
index 438e346972c..47b932ac0c5 100644
--- a/tests/main/tests/integration/store/package-import-test.js
+++ b/tests/main/tests/integration/store/package-import-test.js
@@ -6,15 +6,12 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
 
 class Person extends Model {
   @attr()
   name;
 }
 
-class CustomStore extends Store {}
-
 module('integration/store/package-import', function (hooks) {
   setupTest(hooks);
 
@@ -25,7 +22,6 @@ module('integration/store/package-import', function (hooks) {
 
     owner.register('model:person', Person);
     owner.unregister('service:store');
-    owner.register('service:store', CustomStore);
     store = owner.lookup('service:store');
   });
 
diff --git a/tests/main/tests/unit/modules-test.js b/tests/main/tests/unit/modules-test.js
deleted file mode 100644
index 5c88152c2a5..00000000000
--- a/tests/main/tests/unit/modules-test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { module, test } from 'qunit';
-
-import Adapter from '@ember-data/adapter';
-import AdapterError, { AbortError, InvalidError, TimeoutError } from '@ember-data/adapter/error';
-import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import RESTAdapter from '@ember-data/adapter/rest';
-import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
-import Serializer from '@ember-data/serializer';
-import JSONSerializer from '@ember-data/serializer/json';
-import JSONAPISerializer from '@ember-data/serializer/json-api';
-import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
-import Transform from '@ember-data/serializer/transform';
-import Store from '@ember-data/store';
-
-module('unit/modules - public modules', function () {
-  test('ember-data/transform', function (assert) {
-    assert.ok(Transform);
-  });
-
-  test('ember-data/adapter', function (assert) {
-    assert.ok(Adapter);
-  });
-
-  test('ember-data/adapters/json-api', function (assert) {
-    assert.ok(JSONAPIAdapter);
-  });
-
-  test('ember-data/adapters/rest', function (assert) {
-    assert.ok(RESTAdapter);
-  });
-
-  test('ember-data/attr', function (assert) {
-    assert.ok(attr);
-  });
-
-  test('ember-data/relationships', function (assert) {
-    assert.ok(belongsTo);
-    assert.ok(hasMany);
-  });
-
-  test('ember-data/store', function (assert) {
-    assert.ok(Store);
-  });
-
-  test('ember-data/model', function (assert) {
-    assert.ok(Model);
-  });
-
-  test('ember-data/mixins/embedded-records', function (assert) {
-    assert.ok(EmbeddedRecordsMixin);
-  });
-
-  test('ember-data/serializer', function (assert) {
-    assert.ok(Serializer);
-  });
-
-  test('ember-data/serializers/json-api', function (assert) {
-    assert.ok(JSONAPISerializer);
-  });
-
-  test('ember-data/serializers/json', function (assert) {
-    assert.ok(JSONSerializer);
-  });
-
-  test('ember-data/serializers/rest', function (assert) {
-    assert.ok(RESTSerializer);
-  });
-
-  test('ember-data/adapters/errors', function (assert) {
-    assert.ok(AdapterError);
-    assert.ok(InvalidError);
-    assert.ok(TimeoutError);
-    assert.ok(AbortError);
-  });
-});
diff --git a/tests/main/tests/unit/store/asserts-test.js b/tests/main/tests/unit/store/asserts-test.js
index cd3aa5adc72..8f3d14246f7 100644
--- a/tests/main/tests/unit/store/asserts-test.js
+++ b/tests/main/tests/unit/store/asserts-test.js
@@ -13,7 +13,6 @@ module('unit/store/asserts - DS.Store methods produce useful assertion messages'
   hooks.beforeEach(function () {
     let { owner } = this;
     owner.register('model:foo', Model.extend());
-    owner.register('service:store', Store);
   });
 
   const MODEL_NAME_METHODS = [
diff --git a/tests/main/tests/unit/store/async-leak-test.js b/tests/main/tests/unit/store/async-leak-test.js
index 3f181f93231..fed91a3103b 100644
--- a/tests/main/tests/unit/store/async-leak-test.js
+++ b/tests/main/tests/unit/store/async-leak-test.js
@@ -9,7 +9,6 @@ import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model, { attr } from '@ember-data/model';
 import { DEPRECATE_RSVP_PROMISE } from '@ember-data/private-build-infra/deprecations';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
-import Store from '@ember-data/store';
 import test from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
 class Person extends Model {
@@ -23,7 +22,6 @@ module('unit/store async-waiter and leak detection', function (hooks) {
 
   hooks.beforeEach(function () {
     let { owner } = this;
-    owner.register('service:store', Store);
     owner.register('model:person', Person);
     owner.register(
       'serializer:application',