diff --git a/lms/djangoapps/courseware/tests/test_model_data.py b/lms/djangoapps/courseware/tests/test_model_data.py
index 83607cb6b1..f75e0cdb89 100644
--- a/lms/djangoapps/courseware/tests/test_model_data.py
+++ b/lms/djangoapps/courseware/tests/test_model_data.py
@@ -373,7 +373,7 @@ class StorageTestBase(object):
 
         exception = exception_context.exception
         self.assertEquals(len(exception.saved_field_names), 1)
-        self.assertEquals(exception.saved_field_names[0], 'other_existing_field')
+        self.assertIn(exception.saved_field_names[0], ('existing_field', 'other_existing_field'))
 
 
 class TestUserStateSummaryStorage(StorageTestBase, TestCase):