diff --git a/packages/model/src/-private/schema-provider.ts b/packages/model/src/-private/schema-provider.ts
index 381e6c567df..7b012b1db02 100644
--- a/packages/model/src/-private/schema-provider.ts
+++ b/packages/model/src/-private/schema-provider.ts
@@ -1,4 +1,5 @@
 import { getOwner } from '@ember/application';
+import { deprecate } from '@ember/debug';
 
 import type Store from '@ember-data/store';
 import type { SchemaService } from '@ember-data/store/types';
@@ -17,7 +18,6 @@ import type {
 import type { FactoryCache, Model, ModelFactory, ModelStore } from './model';
 import _modelForMixin from './model-for-mixin';
 import { normalizeModelName } from './util';
-import { deprecate } from '@ember/debug';
 
 type AttributesSchema = ReturnType<Exclude<SchemaService['attributesDefinitionFor'], undefined>>;
 type RelationshipsSchema = ReturnType<Exclude<SchemaService['relationshipsDefinitionFor'], undefined>>;
diff --git a/tests/main/tests/unit/custom-class-support/custom-class-model-test.ts b/tests/main/tests/unit/custom-class-support/custom-class-model-test.ts
index d431a9799a0..d83f92b9b3e 100644
--- a/tests/main/tests/unit/custom-class-support/custom-class-model-test.ts
+++ b/tests/main/tests/unit/custom-class-support/custom-class-model-test.ts
@@ -247,14 +247,16 @@ module('unit/model - Custom Class Model', function (hooks: NestedHooks) {
     assert.verifySteps(['TestSchema:fields', 'TestSchema:fields'], 'population of record on create');
     await person.save();
     assert.verifySteps(
-      [
-        'TestSchema:hasResource',
-        'TestSchema:hasResource',
-        'TestSchema:hasResource',
-        'TestSchema:fields',
-        'TestSchema:fields',
-        'TestSchema:fields',
-      ],
+      DEBUG
+        ? [
+            'TestSchema:hasResource',
+            'TestSchema:hasResource',
+            'TestSchema:hasResource',
+            'TestSchema:fields',
+            'TestSchema:fields',
+            'TestSchema:fields',
+          ]
+        : ['TestSchema:hasResource', 'TestSchema:fields', 'TestSchema:fields', 'TestSchema:fields'],
       'update of record on save completion'
     );
   });