diff --git a/packages/ember-glimmer/lib/environment.js b/packages/ember-glimmer/lib/environment.js
index 21f9192e695..5ef97f90527 100644
--- a/packages/ember-glimmer/lib/environment.js
+++ b/packages/ember-glimmer/lib/environment.js
@@ -57,7 +57,7 @@ import { FACTORY_FOR } from 'container';
 import { default as ActionModifierManager } from './modifiers/action';
 
 function instrumentationPayload(name) {
-  return { object: name };
+  return { object: `component:${name}` };
 }
 
 export default class Environment extends GlimmerEnvironment {
diff --git a/packages/ember-glimmer/tests/integration/components/instrumentation-compile-test.js b/packages/ember-glimmer/tests/integration/components/instrumentation-compile-test.js
new file mode 100644
index 00000000000..a5edf9d894e
--- /dev/null
+++ b/packages/ember-glimmer/tests/integration/components/instrumentation-compile-test.js
@@ -0,0 +1,99 @@
+import { moduleFor, RenderingTest } from '../../utils/test-case';
+import { Component } from '../../utils/helpers';
+import {
+  instrumentationSubscribe,
+  instrumentationReset,
+  set
+} from 'ember-metal';
+
+moduleFor('Components compile instrumentation', class extends RenderingTest {
+  constructor() {
+    super();
+
+    this.resetEvents();
+
+    instrumentationSubscribe('render.compile', {
+      before: (name, timestamp, payload) => {
+        if (payload.view !== this.component) {
+          this.actual.before.push(payload);
+        }
+      },
+      after: (name, timestamp, payload) => {
+        if (payload.view !== this.component) {
+          this.actual.after.push(payload);
+        }
+      }
+    });
+  }
+
+  resetEvents() {
+    this.expected = {
+      before: [],
+      after: []
+    };
+
+    this.actual = {
+      before: [],
+      after: []
+    };
+  }
+
+  teardown() {
+    this.assert.deepEqual(this.actual.before, [], 'No unexpected events (before)');
+    this.assert.deepEqual(this.actual.after, [], 'No unexpected events (after)');
+    super.teardown();
+    instrumentationReset();
+  }
+
+  ['@test zomg'](assert) { assert.ok(true); }
+
+  ['@test it should only receive an instrumentation event for initial render'](assert) {
+    let testCase = this;
+
+    let BaseClass = Component.extend({
+      tagName: '',
+
+      willRender() {
+        testCase.expected.before.push(this);
+        testCase.expected.after.unshift(this);
+      }
+    });
+
+    this.registerComponent('x-bar', {
+      template: '[x-bar: {{bar}}]',
+      ComponentClass: BaseClass.extend()
+    });
+
+    this.render(`[-top-level: {{foo}}] {{x-bar bar=bar}}`, {
+      foo: 'foo', bar: 'bar'
+    });
+
+    this.assertText('[-top-level: foo] [x-bar: bar]');
+
+    this.assertEvents('after initial render');
+
+    this.runTask(() => this.rerender());
+
+    this.assertEvents('after no-op rerender');
+  }
+
+  assertEvents(label) {
+    let { actual, expected } = this;
+    this.assert.strictEqual(actual.before.length, actual.after.length, `${label}: before and after callbacks should be balanced`);
+
+    this._assertEvents(`${label} (before):`, actual.before, expected.before);
+    this._assertEvents(`${label} (after):`, actual.before, expected.before);
+
+    this.resetEvents();
+  }
+
+  _assertEvents(label, actual, expected) {
+    this.assert.equal(actual.length, expected.length, `${label}: expected ${expected.length} and got ${actual.length}`);
+
+    actual.forEach((payload, i) => this.assertPayload(payload, expected[i]));
+  }
+
+  assertPayload(payload, component) {
+    this.assert.equal(payload.object, component._debugContainerKey, 'payload.object');
+  }
+});