diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index 1decc4fc87..bc2a61a8ea 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -16,6 +16,7 @@ os.environ['SERVICE_VARIANT'] = 'bok_choy'
 os.environ['CONFIG_ROOT'] = path(__file__).abspath().dirname()  #pylint: disable=E1120
 
 from .aws import *  # pylint: disable=W0401, W0614
+from xmodule.x_module import prefer_xmodules
 
 
 ######################### Testing overrides ####################################
@@ -48,5 +49,8 @@ for log_name, log_level in LOG_OVERRIDES:
 # Use the auto_auth workflow for creating users and logging them in
 FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
 
+# Enable XBlocks
+XBLOCK_SELECT_FUNCTION = prefer_xmodules
+
 # Unfortunately, we need to use debug mode to serve staticfiles
 DEBUG = True
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 851ae22dd6..ae8f5bacf0 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -4,6 +4,7 @@ Settings for bok choy tests
 
 import os
 from path import path
+from xmodule.x_module import prefer_xmodules
 
 
 CONFIG_ROOT = path(__file__).abspath().dirname()  #pylint: disable=E1120
@@ -59,5 +60,8 @@ LOG_OVERRIDES = [
 for log_name, log_level in LOG_OVERRIDES:
     logging.getLogger(log_name).setLevel(log_level)
 
+# Enable XBlocks
+XBLOCK_SELECT_FUNCTION = prefer_xmodules
+
 # Unfortunately, we need to use debug mode to serve staticfiles
 DEBUG = True