diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf46231f..74effe24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,20 +31,20 @@ jobs:
       - run: yarn install --non-interactive
       - run: yarn test:ember
 
-  test-node:
-    name: Tests / Node
-    runs-on: ubuntu-latest
+  # test-node:
+  #   name: Tests / Node
+  #   runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v1
+  #   steps:
+  #     - uses: actions/checkout@v1
+  #     - uses: volta-cli/action@v1
 
-      - run: yarn install --non-interactive
-      - uses: paambaati/codeclimate-action@v2.5.5
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        with:
-          coverageCommand: yarn node-test
+  #     - run: yarn install --non-interactive
+  #     - uses: paambaati/codeclimate-action@v2.5.5
+  #       env:
+  #         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+  #       with:
+  #         coverageCommand: yarn node-test
 
   test-float:
     name: Tests / floating dependencies
@@ -72,6 +72,8 @@ jobs:
           - ember-canary
           - ember-default-with-jquery
           - ember-classic
+          - embroider-safe
+          # - embroider-optimized
 
     steps:
       - uses: actions/checkout@v1
diff --git a/config/ember-try.js b/config/ember-try.js
index f14ac7f5..72f0ea60 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 {
@@ -74,6 +75,8 @@ module.exports = async function () {
           },
         },
       },
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
index ba0649dc..989e6e6b 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, {
@@ -14,5 +15,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/index.js b/index.js
index c38fab53..3b1c59e4 100644
--- a/index.js
+++ b/index.js
@@ -29,6 +29,11 @@ module.exports = {
     this._super.included.apply(this, arguments);
   },
 
+  // postBuild(result) {
+  //   this.manifest.build(result);
+  //   this.browserconfig.build(result);
+  // },
+
   treeForPublic() {
     let manifest = this.manifest.toTree();
     let browserconfig = this.browserconfig.toTree();
diff --git a/package.json b/package.json
index 46f24cd7..31cde3a6 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@embroider/test-setup": "^0.35.1",
     "@glimmer/component": "^1.0.3",
     "@glimmer/tracking": "^1.0.3",
     "babel-eslint": "^10.1.0",
diff --git a/yarn.lock b/yarn.lock
index ac7e2d93..12258756 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1223,6 +1223,14 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/test-setup@^0.35.1":
+  version "0.35.1"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.35.1.tgz#34999b383aa7ab4bcd7c30c7e26c1ca970fc074a"
+  integrity sha512-QXXKmPZp91ge/3KCLSbDzV35K05NZqMNZEnHc1XIcJcAb3tbmcN5nPk+hzV4PIT685FcvTIk60aw+dy1FJ0kNw==
+  dependencies:
+    lodash "^4.17.20"
+    resolve "^1.17.0"
+
 "@eslint/eslintrc@^0.2.2":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"