diff --git a/packages/client/package.json b/packages/client/package.json
index 7b87ef8..52d50d8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@ember/optional-features": "~2.0.0",
     "@ember/test-helpers": "~2.9.3",
-    "@embroider/test-setup": "~1.8.3",
+    "@embroider/test-setup": "~2.1.1",
     "@glimmer/component": "~1.1.2",
     "@glimmer/tracking": "~1.1.2",
     "@types/ember-qunit": "~5.0.0",
diff --git a/packages/mock/package.json b/packages/mock/package.json
index f98a7c7..11c2da8 100644
--- a/packages/mock/package.json
+++ b/packages/mock/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@ember/optional-features": "~2.0.0",
     "@ember/test-helpers": "~2.9.3",
-    "@embroider/test-setup": "~1.8.3",
+    "@embroider/test-setup": "~2.1.1",
     "@glimmer/component": "~1.1.2",
     "@glimmer/tracking": "~1.1.2",
     "@types/ember-qunit": "~5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 7339592..94d4f09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1081,10 +1081,10 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/test-setup@~1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-1.8.3.tgz#445b9fe5a363ce50367ac2114750597f98d7806d"
-  integrity sha512-BCCbBG7UWkCw+cQ401Ip6LnqTRaQDeKImxR+e7Q4oP6H4EBj7p4iGR1z6fhMy4NNyXKPB6jk3bGa9bTiiNoEAw==
+"@embroider/test-setup@~2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-2.1.1.tgz#1cf613f479ed120fdc5d71cb834c8fb71514cce1"
+  integrity sha512-t81a2z2OEFAOZVbV7wkgiDuCyZ3ajD7J7J+keaTfNSRiXoQgeFFASEECYq1TCsH8m/R+xHMRiY59apF2FIeFhw==
   dependencies:
     lodash "^4.17.21"
     resolve "^1.20.0"