diff --git a/packages/ember-glimmer/tests/integration/event-dispatcher-test.js b/packages/ember-glimmer/tests/integration/event-dispatcher-test.js
index abe3b58f698..a1aee9bec53 100644
--- a/packages/ember-glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/ember-glimmer/tests/integration/event-dispatcher-test.js
@@ -56,6 +56,8 @@ moduleFor('EventDispatcher', class extends RenderingTest {
       template: `<input id="is-done" type="checkbox">`
     });
 
+
+    expectDeprecation(/`eventManager` has been deprecated/);
     this.render(`{{x-foo}}`);
 
     this.runTask(() => this.$('#is-done').trigger('click'));
@@ -90,6 +92,7 @@ moduleFor('EventDispatcher', class extends RenderingTest {
       template: `<input id="is-done" type="checkbox">`
     });
 
+    expectDeprecation(/`eventManager` has been deprecated/);
     this.render(`{{x-foo}}`);
 
     this.runTask(() => this.$('#is-done').trigger('click'));
@@ -139,8 +142,7 @@ moduleFor('EventDispatcher#setup', class extends RenderingTest {
     this.$('div').trigger('myevent');
   }
 
-  ['@test canDispatchToEventManager is deprecated'](assert) {
-    this.dispatcher.canDispatchToEventManager = null;
+  ['@test eventManager is deprecated'](assert) {
     this.registerComponent('x-foo', {
       ComponentClass: Component.extend({
         eventManager: {
@@ -150,11 +152,8 @@ moduleFor('EventDispatcher#setup', class extends RenderingTest {
       template: `<p>Hello!</p>`
     });
 
-    expectDeprecation(() => {
-      this.render(`{{x-foo}}`);
-    }, '[DEPRECATED] `canDispatchToEventManager` has been deprecated.');
-
-    this.$('div').trigger('myevent');
+    expectDeprecation(/`eventManager` has been deprecated/);
+    this.render(`{{x-foo}}`);
   }
 
   ['@test canDispatchToEventManager is deprecated in EventDispatcher'](assert) {
@@ -162,9 +161,8 @@ moduleFor('EventDispatcher#setup', class extends RenderingTest {
       canDispatchToEventManager: null
     });
 
-    expectDeprecation(() => {
-      MyDispatcher.create();
-    }, '[DEPRECATED] `canDispatchToEventManager` has been deprecated.');
+    expectDeprecation(/`canDispatchToEventManager` has been deprecated/);
+    MyDispatcher.create();
   }
 
   ['@test a rootElement can be specified'](assert) {
diff --git a/packages/ember-views/lib/mixins/view_support.js b/packages/ember-views/lib/mixins/view_support.js
index 53412226298..c1fc9e51579 100644
--- a/packages/ember-views/lib/mixins/view_support.js
+++ b/packages/ember-views/lib/mixins/view_support.js
@@ -539,11 +539,11 @@ export default Mixin.create({
       let dispatcher = owner && owner.lookup('event_dispatcher:main');
 
       deprecate(
-        `[DEPRECATED] \`canDispatchToEventManager\` has been deprecated.`,
-        !('canDispatchToEventManager' in dispatcher),
+        `\`eventManager\` has been deprecated in ${this}.`,
+        false,
         {
           id: 'ember-views.event-dispatcher.canDispatchToEventManager',
-          until: '3.0.0'
+          until: '2.16.0'
         }
       );
 
diff --git a/packages/ember-views/lib/system/event_dispatcher.js b/packages/ember-views/lib/system/event_dispatcher.js
index 65d8713cc8f..909c7623278 100644
--- a/packages/ember-views/lib/system/event_dispatcher.js
+++ b/packages/ember-views/lib/system/event_dispatcher.js
@@ -139,11 +139,11 @@ export default EmberObject.extend({
     assert('EventDispatcher should never be instantiated in fastboot mode. Please report this as an Ember bug.', environment.hasDOM);
 
     deprecate(
-      `[DEPRECATED] \`canDispatchToEventManager\` has been deprecated.`,
+      `\`canDispatchToEventManager\` has been deprecated in ${this}.`,
       !('canDispatchToEventManager' in this),
       {
         id: 'ember-views.event-dispatcher.canDispatchToEventManager',
-        until: '3.0.0'
+        until: '2.16.0'
       }
     );
   },