diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index c37b9fce16..7e8658045e 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -282,6 +282,9 @@ def add_user_to_default_group(user, group):
 
 @receiver(post_save, sender=User)
 def update_user_information(sender, instance, created, **kwargs):
+    if not settings.MITX_FEATURES['ENABLE_DISCUSSION_SERVICE']:
+        # Don't try--it won't work, and it will fill the logs with lots of errors
+        return
     try:
         cc_user = cc.User.from_django_user(instance)
         cc_user.save()
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 7cab4cb52c..b55cf2af5f 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -16,6 +16,9 @@ from path import path
 # can test everything else :)
 MITX_FEATURES['DISABLE_START_DATES'] = True
 
+# Until we have discussion actually working in test mode, just turn it off
+MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
+
 # Need wiki for courseware views to work. TODO (vshnayder): shouldn't need it.
 WIKI_ENABLED = True