diff --git a/ember-cli-build.js b/ember-cli-build.js
index cac05d40..0cb7900c 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -17,6 +17,7 @@ module.exports = function (defaults) {
   const { maybeEmbroider } = require('@embroider/test-setup');
   return maybeEmbroider(app, {
     staticComponents: false,
+    staticHelpers: false,
     skipBabel: [
       {
         package: 'qunit',
diff --git a/package.json b/package.json
index d6b78989..d4aeba20 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",
-    "@embroider/test-setup": "^2.1.1",
+    "@embroider/test-setup": "^3.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 93d5fba0..b9d52f69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,10 +2180,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"