diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 8b9ab5a4cc1..ce6e3c9ae93 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -903,7 +903,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -919,7 +919,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -928,7 +928,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
@@ -944,7 +944,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 522f52df176..175c114b66a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -1,4 +1,10 @@
-import { moduleFor, RenderingTestCase, classes, runTask } from 'internal-test-helpers';
+import {
+  moduleFor,
+  RenderingTestCase,
+  classes,
+  runTask,
+  defineComponent,
+} from 'internal-test-helpers';
 import { ENV } from '@ember/-internals/environment';
 import { setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
@@ -7,13 +13,12 @@ import EmberObject from '@ember/object';
 import { Component } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
 
-class TemplateOnlyComponentsTest extends RenderingTestCase {
-  registerTemplateOnlyComponent(name, template) {
-    super.registerComponent(name, { template, ComponentClass: null });
-  }
-}
-
 if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
+  class TemplateOnlyComponentsTest extends RenderingTestCase {
+    registerTemplateOnlyComponent(name, template) {
+      this.owner.register(`component:${name}`, defineComponent(null, template));
+    }
+  }
   moduleFor(
     'Components test: template-only components (glimmer components)',
     class extends TemplateOnlyComponentsTest {
@@ -158,6 +163,15 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
     }
   );
 } else {
+  class TemplateOnlyComponentsTest extends RenderingTestCase {
+    registerTemplateOnlyComponent(name, template) {
+      this.owner.register(
+        `component:${name}`,
+        defineComponent(null, template, Component.extend({}))
+      );
+    }
+  }
+
   moduleFor(
     'Components test: template-only components (curly components)',
     class extends TemplateOnlyComponentsTest {
diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index 240804bc0b6..3b760ecf187 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -21,7 +21,10 @@ moduleFor(
         return;
       }
 
-      this.add('component:expand-it', defineComponent({}, '<p>hello {{yield}}</p>'));
+      this.add(
+        'component:expand-it',
+        defineComponent({}, '<p>hello {{yield}}</p>', Component.extend({}))
+      );
       this.addTemplate('application', 'Hello world {{#expand-it}}world{{/expand-it}}');
 
       return this.visit('/').then(() => {