diff --git a/cms/envs/common.py b/cms/envs/common.py
index 93efbdb523..b2b7dcda2a 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -227,6 +227,13 @@ FEATURES = {
     # course and that can be read from themes
     'ENABLE_OTHER_COURSE_SETTINGS': False,
 
+    # Write new CSM history to the extended table.
+    # This will eventually default to True and may be
+    # removed since all installs should have the separate
+    # extended history table. This is needed in the LMS and CMS
+    # for migration consistency.
+    'ENABLE_CSMH_EXTENDED': True,
+
     # Enable support for content libraries. Note that content libraries are
     # only supported in courses using split mongo.
     'ENABLE_CONTENT_LIBRARIES': True,
@@ -1292,6 +1299,7 @@ INSTALLED_APPS = [
     'openedx.core.djangoapps.oauth_dispatch.apps.OAuthDispatchAppConfig',
     'oauth_provider',
     'courseware',
+    'coursewarehistoryextended',
     'survey.apps.SurveyConfig',
     'lms.djangoapps.verify_student.apps.VerifyStudentConfig',
     'completion',
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 374dcfa935..cf7bd8a7c1 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -251,10 +251,6 @@ PROFILE_IMAGE_BACKEND = {
     },
 }
 
-# Make sure we test with the extended history table
-FEATURES['ENABLE_CSMH_EXTENDED'] = True
-INSTALLED_APPS.append('coursewarehistoryextended')
-
 BADGING_BACKEND = 'lms.djangoapps.badges.backends.tests.dummy_backend.DummyBackend'
 
 # Configure the LMS to use our stub eCommerce implementation
diff --git a/lms/envs/common.py b/lms/envs/common.py
index fdc0279a46..fd14163cf2 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -364,7 +364,7 @@ FEATURES = {
     # This will eventually default to True and may be
     # removed since all installs should have the separate
     # extended history table.
-    'ENABLE_CSMH_EXTENDED': False,
+    'ENABLE_CSMH_EXTENDED': True,
 
     # Read from both the CSMH and CSMHE history tables.
     # This is the default, but can be disabled if all history
@@ -2273,6 +2273,7 @@ INSTALLED_APPS = [
 
     # Our courseware
     'courseware',
+    'coursewarehistoryextended',
     'student.apps.StudentConfig',
 
     'static_template_view',
diff --git a/lms/envs/production.py b/lms/envs/production.py
index 554dccbed2..0652f11dce 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -920,10 +920,6 @@ CREDENTIALS_GENERATION_ROUTING_KEY = ENV_TOKENS.get('CREDENTIALS_GENERATION_ROUT
 # Queue to use for award program certificates
 PROGRAM_CERTIFICATES_ROUTING_KEY = ENV_TOKENS.get('PROGRAM_CERTIFICATES_ROUTING_KEY', DEFAULT_PRIORITY_QUEUE)
 
-# The extended StudentModule history table
-if FEATURES.get('ENABLE_CSMH_EXTENDED'):
-    INSTALLED_APPS.append('coursewarehistoryextended')
-
 API_ACCESS_MANAGER_EMAIL = ENV_TOKENS.get('API_ACCESS_MANAGER_EMAIL')
 API_ACCESS_FROM_EMAIL = ENV_TOKENS.get('API_ACCESS_FROM_EMAIL')
 
diff --git a/lms/envs/test.py b/lms/envs/test.py
index b5e0e0c8e7..32a5307d28 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -202,10 +202,6 @@ if os.environ.get('DISABLE_MIGRATIONS'):
     # to Django 1.9, which allows setting MIGRATION_MODULES to None in order to skip migrations.
     MIGRATION_MODULES = NoOpMigrationModules()
 
-# Make sure we test with the extended history table
-FEATURES['ENABLE_CSMH_EXTENDED'] = True
-INSTALLED_APPS.append('coursewarehistoryextended')
-
 CACHES = {
     # This is the cache used for most things.
     # In staging/prod envs, the sessions also live here.