diff --git a/packages/ember-htmlbars/lib/env.js b/packages/ember-htmlbars/lib/env.js
index 938599701ec..b2f1bb98056 100644
--- a/packages/ember-htmlbars/lib/env.js
+++ b/packages/ember-htmlbars/lib/env.js
@@ -91,7 +91,6 @@ registerKeyword('component', componentKeyword);
 registerKeyword('partial', partial);
 registerKeyword('input', input);
 registerKeyword('textarea', textarea);
-registerKeyword('collection', collection);
 registerKeyword('legacy-yield', legacyYield);
 registerKeyword('mut', mut);
 registerKeyword('@mut', privateMut);
@@ -99,6 +98,7 @@ registerKeyword('each', each);
 registerKeyword('readonly', readonly);
 
 if (_Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+  registerKeyword('collection', collection);
   registerKeyword('view', view);
 }
 
diff --git a/packages/ember-htmlbars/tests/helpers/collection_test.js b/packages/ember-htmlbars/tests/helpers/collection_test.js
index ce00816bf52..6715333ade7 100644
--- a/packages/ember-htmlbars/tests/helpers/collection_test.js
+++ b/packages/ember-htmlbars/tests/helpers/collection_test.js
@@ -36,7 +36,7 @@ function firstGrandchild(view) {
   return get(get(view, 'childViews').objectAt(0), 'childViews').objectAt(0);
 }
 
-QUnit.module('collection helper', {
+QUnit.module('collection helper [LEGACY]', {
   setup() {
     originalViewKeyword = registerKeyword('view',  viewKeyword);