diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f482f3c..89868b47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
           - ember-release
           - ember-beta
           - ember-canary
-          # - embroider-safe
-          # - embroider-optimized
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v3
diff --git a/package.json b/package.json
index 6909c2ef..6f3b655a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3",
-    "@embroider/test-setup": "^2.1.1",
+    "@embroider/test-setup": "^3.0.2",
     "@fortawesome/ember-fontawesome": "^1.0.0",
     "@fortawesome/free-brands-svg-icons": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
@@ -109,8 +109,8 @@
     "webpack": "^5.78.0"
   },
   "peerDependencies": {
-    "ember-source": ">= 3.28.0",
-    "ember-data": "*"
+    "ember-data": "*",
+    "ember-source": ">= 3.28.0"
   },
   "peerDependenciesMeta": {
     "ember-data": {
diff --git a/yarn.lock b/yarn.lock
index cd4ab0df..afdd8feb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1565,10 +1565,10 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@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==
+"@embroider/test-setup@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-3.0.2.tgz#cfd42a0f61d573396897b958005547d174769188"
+  integrity sha512-cq/xp06CAB8rAGnObeJux7qALnAX2MatMVLjWyGDr3ogS5lHTNXZVCv4ltTM3pJ8EsZWpPM32dtUZqSJFkGibQ==
   dependencies:
     lodash "^4.17.21"
     resolve "^1.20.0"