diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index fb1c5ba945..a9856a9886 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -421,7 +421,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
             'staff_access': staff_access,
             'studio_url': studio_url,
             'masquerade': masquerade,
-            'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
+            'xqa_server': settings.FEATURES.get('XQA_SERVER', "http://your_xqa_server.com"),
             'reverifications': fetch_reverify_banner_info(request, course_key),
         }
 
diff --git a/lms/djangoapps/lti_provider/tests/test_views.py b/lms/djangoapps/lti_provider/tests/test_views.py
index f5447916b0..10c622bd28 100644
--- a/lms/djangoapps/lti_provider/tests/test_views.py
+++ b/lms/djangoapps/lti_provider/tests/test_views.py
@@ -278,7 +278,7 @@ class RenderCoursewareTest(TestCase):
             'disable_footer': True,
             'disable_tabs': True,
             'staff_access': 'StaffAccess',
-            'xqa_server': 'http://example.com/xqa',
+            'xqa_server': 'http://your_xqa_server.com',
         }
         request = build_run_request()
         views.render_courseware(request, ALL_PARAMS.copy())
diff --git a/lms/djangoapps/lti_provider/views.py b/lms/djangoapps/lti_provider/views.py
index 491b200d07..cf49289af7 100644
--- a/lms/djangoapps/lti_provider/views.py
+++ b/lms/djangoapps/lti_provider/views.py
@@ -173,7 +173,7 @@ def render_courseware(request, lti_params):
         'disable_footer': True,
         'disable_tabs': True,
         'staff_access': staff,
-        'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://example.com/xqa'),
+        'xqa_server': settings.FEATURES.get('XQA_SERVER', 'http://your_xqa_server.com'),
     }
 
     return render_to_response('courseware/courseware.html', context)
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 0d0ee49aa3..b8060f230d 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -186,7 +186,7 @@ OPEN_ENDED_GRADING_INTERFACE = {
 ############################## LMS Migration ##################################
 FEATURES['ENABLE_LMS_MIGRATION'] = True
 FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = False   # require that user be in the staff_* group to be able to enroll
-FEATURES['USE_XQA_SERVER'] = 'http://xqa:server@content-qa.edX.mit.edu/xqa'
+FEATURES['XQA_SERVER'] = 'http://xqa:server@content-qa.edX.mit.edu/xqa'
 
 INSTALLED_APPS += ('lms_migration',)
 
diff --git a/lms/templates/courseware/xqa_interface.html b/lms/templates/courseware/xqa_interface.html
index 9322c4393a..1423612149 100644
--- a/lms/templates/courseware/xqa_interface.html
+++ b/lms/templates/courseware/xqa_interface.html
@@ -51,7 +51,7 @@ function sendlog(element_id, edit_link, staff_context){
                 $('#' + element_id + '_xqa_log_data').html(result);
         },
         error: function() {
-            alert('Error: cannot connect to XQA server. Check the value of the USE_XQA_SERVER feature.');
+            alert('Error: cannot connect to XQA server. Check the value of the XQA_SERVER setting.');
             console.log('error!');
         }
     });
@@ -78,7 +78,7 @@ function getlog(element_id, staff_context){
             $('#' + element_id + '_xqa_log_data').html(result);
         },
         error: function() {
-            alert('Error: cannot connect to XQA server. Check the value of the USE_XQA_SERVER feature.');
+            alert('Error: cannot connect to XQA server. Check the value of the XQA_SERVER setting.');
         }
     });
 
diff --git a/openedx/core/lib/xblock_utils.py b/openedx/core/lib/xblock_utils.py
index 98cddb8650..1fb1aea0b9 100644
--- a/openedx/core/lib/xblock_utils.py
+++ b/openedx/core/lib/xblock_utils.py
@@ -299,7 +299,7 @@ def add_staff_markup(user, has_instructor_access, block, view, frag, context):
         'element_id': block.location.html_id().replace('-', '_'),
         'edit_link': edit_link,
         'user': user,
-        'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
+        'xqa_server': settings.FEATURES.get('XQA_SERVER', "http://your_xqa_server.com"),
         'histogram': json.dumps(histogram),
         'render_histogram': render_histogram,
         'block_content': frag.content,