diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index d683f48708..58299fd313 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -6,8 +6,12 @@ Specific overrides to the base prod settings to make development easier.
 import logging
 from os.path import abspath, dirname, join
 
+from openedx.core.lib.features_setting_proxy import FeaturesProxy
+
 from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
+FEATURES = FeaturesProxy(globals())
+
 # Don't use S3 in devstack, fall back to filesystem
 STORAGES['default']['BACKEND'] = 'django.core.files.storage.FileSystemStorage'
 COURSE_IMPORT_EXPORT_STORAGE = 'django.core.files.storage.FileSystemStorage'
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index aa015d452e..dd7097df71 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -14,8 +14,11 @@ from edx_django_utils.plugins import add_plugins
 
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
 
+from openedx.core.lib.features_setting_proxy import FeaturesProxy
+
 from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
+FEATURES = FeaturesProxy(globals())
 # Don't use S3 in devstack, fall back to filesystem
 STORAGES['default']['BACKEND'] = 'django.core.files.storage.FileSystemStorage'
 ORA2_FILEUPLOAD_BACKEND = 'django'