diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index d9ada0038e..cf1d786b72 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -649,11 +649,11 @@ class CapaModule(XModule):
         #       'success' will always be incorrect
         event_info['correct_map'] = correct_map.get_dict()
         event_info['success'] = success
-	event_info['attempts'] = self.attempts
+        event_info['attempts'] = self.attempts
         self.system.track_function('save_problem_check', event_info)
 
-	if hasattr(self.system, 'psychometrics_handler'):  	# update PsychometricsData using callback
-		self.system.psychometrics_handler(self.get_instance_state())
+        if hasattr(self.system, 'psychometrics_handler'):  	# update PsychometricsData using callback
+            self.system.psychometrics_handler(self.get_instance_state())
 
         # render problem into HTML
         html = self.get_problem_html(encapsulate=False)
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index c569309af9..453365f73b 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -341,8 +341,11 @@ class CapaModuleTest(unittest.TestCase):
 
         # Simulate that all answers are marked correct, no matter
         # what the input is, by patching CorrectMap.is_correct()
-        with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct:
+        # Also simulate rendering the HTML
+        with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct,\
+                patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
             mock_is_correct.return_value = True
+            mock_html.return_value = "Test HTML"
 
             # Check the problem
             get_request_dict = { CapaFactory.input_key(): '3.14' }
@@ -351,6 +354,9 @@ class CapaModuleTest(unittest.TestCase):
         # Expect that the problem is marked correct
         self.assertEqual(result['success'], 'correct')
 
+        # Expect that we get the (mocked) HTML
+        self.assertEqual(result['contents'], 'Test HTML')
+
         # Expect that the number of attempts is incremented by 1
         self.assertEqual(module.attempts, 2)