diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index a149ce65b2..b5dfc3c4fe 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -179,6 +179,7 @@ class AuthTestCase(ContentStoreTestCase):
 
 TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
 TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
+TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
 
 @override_settings(MODULESTORE=TEST_DATA_MODULESTORE)
 class EditTestCase(ContentStoreTestCase):
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 678eb1ccf0..3de344b156 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -57,7 +57,7 @@ def mongo_store_config(data_dir):
         'OPTIONS': {
             'default_class': 'xmodule.raw_module.RawDescriptor',
             'host': 'localhost',
-            'db': 'xmodule',
+            'db': 'test_xmodule',
             'collection': 'modulestore',
             'fs_root': data_dir,
             'render_template': 'mitxmako.shortcuts.render_to_string',