diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a651424f..24b0f1c7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 importers:
 
@@ -97,8 +101,8 @@ importers:
         specifier: 3.1.1
         version: 3.1.1
       '@ember/test-helpers':
-        specifier: 2.9.3
-        version: 2.9.3(@babel/core@7.22.1)(ember-source@4.12.0)
+        specifier: 3.0.0
+        version: 3.0.0(ember-source@4.12.0)(webpack@5.84.1)
       '@embroider/test-setup':
         specifier: 3.0.1
         version: 3.0.1
@@ -125,7 +129,7 @@ importers:
         version: 4.12.1
       ember-cli-addon-docs:
         specifier: 5.2.0
-        version: 5.2.0(@babel/core@7.22.1)(@ember/test-helpers@2.9.3)(ember-data@4.12.0)(ember-fetch@8.1.2)(ember-source@4.12.0)(webpack@5.84.1)
+        version: 5.2.0(@babel/core@7.22.1)(@ember/test-helpers@3.0.0)(ember-data@4.12.0)(ember-fetch@8.1.2)(ember-source@4.12.0)(webpack@5.84.1)
       ember-cli-addon-docs-yuidoc:
         specifier: 1.0.0
         version: 1.0.0
@@ -182,7 +186,7 @@ importers:
         version: 7.0.0
       ember-qunit:
         specifier: 6.2.0
-        version: 6.2.0(@ember/test-helpers@2.9.3)(ember-source@4.12.0)(qunit@2.19.4)(webpack@5.84.1)
+        version: 6.2.0(@ember/test-helpers@3.0.0)(ember-source@4.12.0)(qunit@2.19.4)(webpack@5.84.1)
       ember-resolver:
         specifier: 10.1.0
         version: 10.1.0(@ember/string@3.1.1)(ember-source@4.12.0)
@@ -1975,26 +1979,24 @@ packages:
       - supports-color
     dev: true
 
-  /@ember/test-helpers@2.9.3(@babel/core@7.22.1)(ember-source@4.12.0):
-    resolution: {integrity: sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==}
-    engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*}
+  /@ember/test-helpers@3.0.0(ember-source@4.12.0)(webpack@5.84.1):
+    resolution: {integrity: sha512-NmzAEouZZmw7kXu+crZ8RN21Fz/Ka0j7uQLpVg3+pCLCfee2WnkFHWd7bBU4wiCS3D8V7tc5nGrojnLOyZw3hQ==}
+    engines: {node: 16.* || >= 18}
     peerDependencies:
-      ember-source: '>=3.8.0'
+      ember-source: ^4.0.0
     dependencies:
       '@ember/test-waiters': 3.0.2
       '@embroider/macros': 1.11.0
-      '@embroider/util': 1.11.0(ember-source@4.12.0)
       broccoli-debug: 0.6.5
       broccoli-funnel: 3.0.8
+      ember-auto-import: 2.6.3(webpack@5.84.1)
       ember-cli-babel: 7.26.11
       ember-cli-htmlbars: 6.2.0
-      ember-destroyable-polyfill: 2.0.3(@babel/core@7.22.1)
       ember-source: 4.12.0(@babel/core@7.22.1)(@glimmer/component@1.1.2)(webpack@5.84.1)
     transitivePeerDependencies:
-      - '@babel/core'
-      - '@glint/environment-ember-loose'
       - '@glint/template'
       - supports-color
+      - webpack
     dev: true
 
   /@ember/test-waiters@3.0.2:
@@ -8034,7 +8036,7 @@ packages:
       - supports-color
     dev: true
 
-  /ember-cli-addon-docs@5.2.0(@babel/core@7.22.1)(@ember/test-helpers@2.9.3)(ember-data@4.12.0)(ember-fetch@8.1.2)(ember-source@4.12.0)(webpack@5.84.1):
+  /ember-cli-addon-docs@5.2.0(@babel/core@7.22.1)(@ember/test-helpers@3.0.0)(ember-data@4.12.0)(ember-fetch@8.1.2)(ember-source@4.12.0)(webpack@5.84.1):
     resolution: {integrity: sha512-+7pRAC1qtDtm9tasOYU6OzJSh24iLZP8ouY4ZtGztCi8RV1LHTeNFq3YziSvs+QedpexS2nBTG4kPFCZpKSnFg==}
     engines: {node: 14.* || 16.* || >= 18}
     peerDependencies:
@@ -8072,7 +8074,7 @@ packages:
       ember-concurrency: 2.3.7(@babel/core@7.22.1)
       ember-data: 4.12.0(@babel/core@7.22.1)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@4.12.0)(webpack@5.84.1)
       ember-fetch: 8.1.2
-      ember-keyboard: 8.2.0(@babel/core@7.22.1)(@ember/test-helpers@2.9.3)(ember-source@4.12.0)
+      ember-keyboard: 8.2.0(@babel/core@7.22.1)(@ember/test-helpers@3.0.0)(ember-source@4.12.0)
       ember-modal-dialog: 4.1.2(ember-source@4.12.0)(ember-tether@2.0.1)
       ember-responsive: 5.0.0
       ember-router-generator: 2.0.0
@@ -8922,7 +8924,7 @@ packages:
       - supports-color
     dev: true
 
-  /ember-keyboard@8.2.0(@babel/core@7.22.1)(@ember/test-helpers@2.9.3)(ember-source@4.12.0):
+  /ember-keyboard@8.2.0(@babel/core@7.22.1)(@ember/test-helpers@3.0.0)(ember-source@4.12.0):
     resolution: {integrity: sha512-h2kuS2irtIyvNbAMkGDlDTB4TPXwgmC6Nu9bIuGWoCjkGdgJbUg0VegfyRJ1TlxbIHlAelbqVpE8UhfgY5wEag==}
     engines: {node: 12.* || 14.* || >= 16}
     peerDependencies:
@@ -8931,7 +8933,7 @@ packages:
       '@ember/test-helpers':
         optional: true
     dependencies:
-      '@ember/test-helpers': 2.9.3(@babel/core@7.22.1)(ember-source@4.12.0)
+      '@ember/test-helpers': 3.0.0(ember-source@4.12.0)(webpack@5.84.1)
       '@embroider/addon-shim': 1.8.5
       ember-destroyable-polyfill: 2.0.3(@babel/core@7.22.1)
       ember-modifier: 4.1.0(ember-source@4.12.0)
@@ -9028,7 +9030,7 @@ packages:
       - supports-color
     dev: true
 
-  /ember-qunit@6.2.0(@ember/test-helpers@2.9.3)(ember-source@4.12.0)(qunit@2.19.4)(webpack@5.84.1):
+  /ember-qunit@6.2.0(@ember/test-helpers@3.0.0)(ember-source@4.12.0)(qunit@2.19.4)(webpack@5.84.1):
     resolution: {integrity: sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==}
     engines: {node: 14.* || 16.* || >= 18}
     peerDependencies:
@@ -9036,7 +9038,7 @@ packages:
       ember-source: '>=3.28'
       qunit: ^2.13.0
     dependencies:
-      '@ember/test-helpers': 2.9.3(@babel/core@7.22.1)(ember-source@4.12.0)
+      '@ember/test-helpers': 3.0.0(ember-source@4.12.0)(webpack@5.84.1)
       broccoli-funnel: 3.0.8
       broccoli-merge-trees: 3.0.2
       common-tags: 1.8.2
diff --git a/test-app/package.json b/test-app/package.json
index c5b9adc9a..762360228 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/string": "3.1.1",
-    "@ember/test-helpers": "2.9.3",
+    "@ember/test-helpers": "3.0.0",
     "@embroider/test-setup": "3.0.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",