diff --git a/config/ember-try.js b/config/ember-try.js
index 0f2c6b13..6ec00068 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const getChannelURL = require('ember-source-channel-url')
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup')
 
 module.exports = async function () {
   return {
@@ -47,7 +48,9 @@ module.exports = async function () {
             '@ember/jquery': '^0.5.1'
           }
         }
-      }
+      },
+      embroiderSafe(),
+      embroiderOptimized()
     ]
   }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 3d4097d1..62e27b3f 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
+const { maybeEmbroider } = require('@embroider/test-setup')
 
 module.exports = function (defaults) {
   const app = new EmberAddon(defaults, {
@@ -52,5 +53,5 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree()
+  return maybeEmbroider(app)
 }
diff --git a/package-lock.json b/package-lock.json
index c6ab898d..00af8f71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "@babel/preset-env": "^7.16.0",
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^2.6.0",
+        "@embroider/test-setup": "0.50.1",
         "@glimmer/component": "^1.0.0",
         "@glimmer/tracking": "^1.0.0",
         "broccoli-asset-rev": "^3.0.0",
@@ -2537,6 +2538,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/@embroider/test-setup": {
+      "version": "0.50.1",
+      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.50.1.tgz",
+      "integrity": "sha512-xERHPKpH4cOHa3WF1+rKOUPIjiAdGXOvkxizbRkTo9wmwcrSCg4+BubAEP2OA/rYoljrRjr+ggqfzCU4hfZjFg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": "12.* || 14.* || >= 16"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
@@ -26441,6 +26455,16 @@
         }
       }
     },
+    "@embroider/test-setup": {
+      "version": "0.50.1",
+      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.50.1.tgz",
+      "integrity": "sha512-xERHPKpH4cOHa3WF1+rKOUPIjiAdGXOvkxizbRkTo9wmwcrSCg4+BubAEP2OA/rYoljrRjr+ggqfzCU4hfZjFg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.21",
+        "resolve": "^1.20.0"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz",
diff --git a/package.json b/package.json
index 065e9396..3462cdc9 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,11 @@
     "doc": "doc",
     "test": "tests"
   },
-  "files": ["blueprints", "config/environment.js", "index.js"],
+  "files": [
+    "blueprints",
+    "config/environment.js",
+    "index.js"
+  ],
   "scripts": {
     "build": "ember build",
     "deploy": "ember deploy production",
@@ -51,6 +55,7 @@
     "@babel/preset-env": "^7.16.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
+    "@embroider/test-setup": "0.50.1",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "broccoli-asset-rev": "^3.0.0",
@@ -104,10 +109,14 @@
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "demoURL": "https://jeffjewiss.github.io/ember-cli-postcss",
-    "before": ["broccoli-asset-rev"]
+    "before": [
+      "broccoli-asset-rev"
+    ]
   },
   "standard": {
-    "ignore": ["testem.js"]
+    "ignore": [
+      "testem.js"
+    ]
   },
   "volta": {
     "node": "14.18.2"