diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97ea165..479d31f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -278,6 +278,12 @@ importers:
       '@rollup/plugin-babel':
         specifier: ^6.1.0
         version: 6.1.0(@babel/core@7.29.0)(rollup@4.60.1)
+      babel-plugin-debug-macros:
+        specifier: ^0.3.4
+        version: 0.3.4(@babel/core@7.29.0)
+      babel-plugin-ember-polyfill-get-and-set-owner-from-ember-owner:
+        specifier: ^1.0.4
+        version: 1.0.4(@babel/core@7.29.0)
       babel-plugin-ember-template-compilation:
         specifier: ^3.1.0
         version: 3.1.0
@@ -2158,6 +2164,11 @@ packages:
     resolution: {integrity: sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
+  babel-plugin-ember-polyfill-get-and-set-owner-from-ember-owner@1.0.4:
+    resolution: {integrity: sha512-kZQdMKC0Ec+SsDZ/Lv/Ic1f23FJkZI5rDjRz+00l3JWbEeU9/tex0aCYs16VvuT1O1XG8c3xJNx6+ZXliBkYPQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   babel-plugin-ember-template-compilation@3.1.0:
     resolution: {integrity: sha512-kk7cGyblE9n4MB98rqw2wuUW7YLD5FM+Tr97gNSYL4e8DBMQndLuWaWNx1wfd7o00NjFhhoTR+HZs2nj23g2Lw==}
     engines: {node: '>= 18.*'}
@@ -7743,6 +7754,10 @@ snapshots:
     dependencies:
       ember-rfc176-data: 0.3.18
 
+  babel-plugin-ember-polyfill-get-and-set-owner-from-ember-owner@1.0.4(@babel/core@7.29.0):
+    dependencies:
+      '@babel/core': 7.29.0
+
   babel-plugin-ember-template-compilation@3.1.0:
     dependencies:
       '@glimmer/syntax': 0.95.0
diff --git a/test-app/.try.mjs b/test-app/.try.mjs
index 085d877..a04a1d9 100644
--- a/test-app/.try.mjs
+++ b/test-app/.try.mjs
@@ -17,10 +17,10 @@ module.exports = async function (defaults) {
 };
 
   const ember4 = {
-    '@ember/test-helpers': '^4.0.0',
+    '@ember/test-helpers': '^5.0.0',
     '@ember/test-waiters': '^3.1.0',
     '@embroider/compat': '^4.0.3',
-    'ember-qunit': '^8.0.0',
+    'ember-qunit': '^9.0.0',
     'ember-cli': '~4.12.0',
   };
 
diff --git a/test-app/babel.config.mjs b/test-app/babel.config.mjs
index 441415c..c0f7b2a 100644
--- a/test-app/babel.config.mjs
+++ b/test-app/babel.config.mjs
@@ -4,6 +4,8 @@ import { buildMacros } from '@embroider/macros/babel';
 
 const macros = buildMacros();
 
+const isCompatBuild = !!process.env.ENABLE_COMPAT_BUILD;
+
 export default {
   plugins: [
     [
@@ -44,6 +46,17 @@ export default {
       },
     ],
     ...macros.babelMacros,
+    ...(isCompatBuild
+      ? [
+          [
+            'babel-plugin-debug-macros',
+            {
+              flags: [{ source: '@glimmer/env', flags: { DEBUG: true } }],
+            },
+          ],
+          'babel-plugin-ember-polyfill-get-and-set-owner-from-ember-owner',
+        ]
+      : []),
   ],
 
   generatorOpts: {
diff --git a/test-app/package.json b/test-app/package.json
index aa70314..6919dee 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -35,6 +35,8 @@
     "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-transform-runtime": "^7.29.0",
     "@babel/plugin-transform-typescript": "^7.28.6",
+    "babel-plugin-debug-macros": "^0.3.4",
+    "babel-plugin-ember-polyfill-get-and-set-owner-from-ember-owner": "^1.0.4",
     "@ember/string": "^4.0.1",
     "@ember/test-helpers": "^5.4.1",
     "@embroider/core": "^4.4.7",