diff --git a/package.json b/package.json
index ee24533e427..7daf6282038 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@babel/plugin-transform-typescript": "^7.18.8",
     "@ember/edition-utils": "^1.2.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.1.2",
     "@types/ember": "^4.0.0",
     "@types/ember-qunit": "^5.0.0",
diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
index ca608039a3a..2baebfc33b2 100644
--- a/packages/-ember-data/package.json
+++ b/packages/-ember-data/package.json
@@ -43,7 +43,7 @@
     "@babel/plugin-transform-typescript": "^7.18.8",
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.1.2",
     "@types/ember": "^4.0.0",
     "@types/ember-qunit": "^5.0.0",
diff --git a/packages/adapter/package.json b/packages/adapter/package.json
index f98cd78385e..c971108a8f0 100644
--- a/packages/adapter/package.json
+++ b/packages/adapter/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
diff --git a/packages/debug/package.json b/packages/debug/package.json
index 50f0c02de12..01d1feb7419 100644
--- a/packages/debug/package.json
+++ b/packages/debug/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
diff --git a/packages/model/package.json b/packages/model/package.json
index 8e65263bee3..a17710853ed 100644
--- a/packages/model/package.json
+++ b/packages/model/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
diff --git a/packages/record-data/package.json b/packages/record-data/package.json
index e231926fc50..708e9bc60d0 100644
--- a/packages/record-data/package.json
+++ b/packages/record-data/package.json
@@ -33,7 +33,7 @@
     "@ember-data/model": "4.5.0-alpha.4",
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
diff --git a/packages/serializer/package.json b/packages/serializer/package.json
index c80fd29c71e..94c26cf1bc7 100644
--- a/packages/serializer/package.json
+++ b/packages/serializer/package.json
@@ -29,7 +29,7 @@
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-blueprint-test-helpers": "^0.19.1",
diff --git a/packages/store/package.json b/packages/store/package.json
index 22e5992b309..ac5e6ca37cd 100644
--- a/packages/store/package.json
+++ b/packages/store/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@types/ember": "^4.0.0",
     "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-adapter-encapsulation-test-app/package.json b/packages/unpublished-adapter-encapsulation-test-app/package.json
index 3fc100f322e..0b69e976025 100644
--- a/packages/unpublished-adapter-encapsulation-test-app/package.json
+++ b/packages/unpublished-adapter-encapsulation-test-app/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-debug-encapsulation-test-app/package.json b/packages/unpublished-debug-encapsulation-test-app/package.json
index f79874e6dc9..8636e12def9 100644
--- a/packages/unpublished-debug-encapsulation-test-app/package.json
+++ b/packages/unpublished-debug-encapsulation-test-app/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-fastboot-test-app/package.json b/packages/unpublished-fastboot-test-app/package.json
index 07a87ab7826..30f4e430965 100644
--- a/packages/unpublished-fastboot-test-app/package.json
+++ b/packages/unpublished-fastboot-test-app/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "@types/ember": "^4.0.0",
diff --git a/packages/unpublished-model-encapsulation-test-app/package.json b/packages/unpublished-model-encapsulation-test-app/package.json
index da6591237fa..0066c538df0 100644
--- a/packages/unpublished-model-encapsulation-test-app/package.json
+++ b/packages/unpublished-model-encapsulation-test-app/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-record-data-encapsulation-test-app/package.json b/packages/unpublished-record-data-encapsulation-test-app/package.json
index 2ce50f9ba0c..2c33f236fb9 100644
--- a/packages/unpublished-record-data-encapsulation-test-app/package.json
+++ b/packages/unpublished-record-data-encapsulation-test-app/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-relationship-performance-test-app/package.json b/packages/unpublished-relationship-performance-test-app/package.json
index 792129e1dd1..e46a78d7725 100644
--- a/packages/unpublished-relationship-performance-test-app/package.json
+++ b/packages/unpublished-relationship-performance-test-app/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.5.0",
     "ember-cli-app-version": "^5.0.0",
diff --git a/packages/unpublished-serializer-encapsulation-test-app/package.json b/packages/unpublished-serializer-encapsulation-test-app/package.json
index ac16ee1771d..d1a801645e9 100644
--- a/packages/unpublished-serializer-encapsulation-test-app/package.json
+++ b/packages/unpublished-serializer-encapsulation-test-app/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@ember-data/unpublished-test-infra": "4.5.0-alpha.4",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/packages/unpublished-test-infra/package.json b/packages/unpublished-test-infra/package.json
index 1d1d4223cb7..25b9d1be2a6 100644
--- a/packages/unpublished-test-infra/package.json
+++ b/packages/unpublished-test-infra/package.json
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
-    "@ember/test-helpers": "~2.7.0",
+    "@ember/test-helpers": "~2.8.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-merge-trees": "^4.2.0",
diff --git a/yarn.lock b/yarn.lock
index cac7d75df7b..0a1ff2a6192 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1040,12 +1040,14 @@
   dependencies:
     ember-cli-babel "^7.26.6"
 
-"@ember/test-helpers@~2.7.0":
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-2.7.0.tgz#d8e08b614cdd5eac647689d655e78e1de725f474"
-  integrity sha512-eWFtw5+sbci1Fw+E+HoyaMxY126LvK7jul6i8tad48zlWoxrOalbhJhz1mKqIo4daHbqIZWuFgQhOib4QfTKCQ==
+"@ember/test-helpers@~2.8.1":
+  version "2.8.1"
+  resolved "https://registry.npmjs.org/@ember/test-helpers/-/test-helpers-2.8.1.tgz#20f2e30d48172c2ff713e1db7fbec5352f918d4e"
+  integrity sha512-jbsYwWyAdhL/pdPu7Gb3SG1gvIXY70FWMtC/Us0Kmvk82Y+5YUQ1SOC0io75qmOGYQmH7eQrd/bquEVd+4XtdQ==
   dependencies:
     "@ember/test-waiters" "^3.0.0"
+    "@embroider/macros" "^1.6.0"
+    "@embroider/util" "^1.6.0"
     broccoli-debug "^0.6.5"
     broccoli-funnel "^3.0.8"
     ember-cli-babel "^7.26.6"
@@ -1062,7 +1064,7 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.3":
+"@embroider/macros@1.8.3", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.2.0", "@embroider/macros@^1.6.0", "@embroider/macros@^1.8.3":
   version "1.8.3"
   resolved "https://registry.npmjs.org/@embroider/macros/-/macros-1.8.3.tgz#2f0961ab8871f6ad819630208031d705b357757e"
   integrity sha512-gnIOfTL/pUkoD6oI7JyWOqXlVIUgZM+CnbH10/YNtZr2K0hij9eZQMdgjOZZVgN0rKOFw9dIREqc1ygrJHRYQA==
@@ -1090,6 +1092,15 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
+"@embroider/util@^1.6.0":
+  version "1.8.3"
+  resolved "https://registry.npmjs.org/@embroider/util/-/util-1.8.3.tgz#7267a2b6fcbf3e56712711441159ab373f9bee7a"
+  integrity sha512-FvsPzsb9rNeveSnIGnsfLkWWBdSM5QIA9lDVtckUktRnRnBWZHm5jDxU/ST//pWMhZ8F0DucRlFWE149MTLtuQ==
+  dependencies:
+    "@embroider/macros" "1.8.3"
+    broccoli-funnel "^3.0.5"
+    ember-cli-babel "^7.23.1"
+
 "@eslint/eslintrc@^1.3.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
@@ -4109,7 +4120,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
   version "3.0.8"
   resolved "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
   integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
@@ -7057,8 +7068,7 @@ eslint-module-utils@^2.7.3:
     find-up "^2.1.0"
 
 "eslint-plugin-ember-data@link:./packages/unpublished-eslint-rules":
-  version "0.0.0"
-  uid ""
+  version "4.5.0-alpha.4"
 
 eslint-plugin-ember@^10.5.8, eslint-plugin-ember@^10.6.1:
   version "10.6.1"