diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f356c61..5543060 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,12 +181,15 @@ jobs:
           ember-lts-3.16,
           ember-lts-3.20,
           ember-release,
-          ember-beta
+          ember-beta,
+          embroider-safe
         ]
         allow-failure: [false]
         include:
           - ember-try-scenario: ember-canary
             allow-failure: true
+          - ember-try-scenario: embroider-optimized
+            allow-failure: true
 
     steps:
     - uses: actions/checkout@v2
diff --git a/config/ember-try.js b/config/ember-try.js
index 3d639d0..4ce91ad 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 {
@@ -81,6 +82,8 @@ module.exports = async function () {
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
index ef74a45..17e36f1 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) {
   let app = new EmberAddon(defaults, {
@@ -33,5 +34,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 8159934..8d0b838 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1526,6 +1526,16 @@
         }
       }
     },
+    "@embroider/test-setup": {
+      "version": "0.35.1",
+      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.35.1.tgz",
+      "integrity": "sha512-QXXKmPZp91ge/3KCLSbDzV35K05NZqMNZEnHc1XIcJcAb3tbmcN5nPk+hzV4PIT685FcvTIk60aw+dy1FJ0kNw==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.20",
+        "resolve": "^1.17.0"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz",
diff --git a/package.json b/package.json
index 4d3a2f9..9204665 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.1.4",
+    "@embroider/test-setup": "^0.35.1",
     "@glimmer/tracking": "^1.0.3",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",