diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index cbe47a1fe1..988856dbf4 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -43,10 +43,15 @@ CONTENTSTORE = {
     'OPTIONS': {
         'host': 'localhost',
         'db': 'xcontent',
+    },
+    # allow for additional options that can be keyed on a name, e.g. 'trashcan'
+    'ADDITIONAL_OPTIONS': {
+        'trashcan': {
+            'bucket': 'trash_fs'
+        }
     }
 }
 
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
diff --git a/common/lib/xmodule/xmodule/contentstore/django.py b/common/lib/xmodule/xmodule/contentstore/django.py
index 83a2508d96..f163348cc8 100644
--- a/common/lib/xmodule/xmodule/contentstore/django.py
+++ b/common/lib/xmodule/xmodule/contentstore/django.py
@@ -3,7 +3,7 @@ from importlib import import_module
 
 from django.conf import settings
 
-_CONTENTSTORE = None
+_CONTENTSTORE = {}
 
 
 def load_function(path):
@@ -17,13 +17,16 @@ def load_function(path):
     return getattr(import_module(module_path), name)
 
 
-def contentstore():
+def contentstore(name='default'):
     global _CONTENTSTORE
 
-    if _CONTENTSTORE is None:
+    if name not in _CONTENTSTORE:
         class_ = load_function(settings.CONTENTSTORE['ENGINE'])
         options = {}
         options.update(settings.CONTENTSTORE['OPTIONS'])
-        _CONTENTSTORE = class_(**options)
+        if 'ADDITIONAL_OPTIONS' in settings.CONTENTSTORE:
+            if name in settings.CONTENTSTORE['ADDITIONAL_OPTIONS']:
+                options.update(settings.CONTENTSTORE['ADDITIONAL_OPTIONS'][name])
+        _CONTENTSTORE[name] = class_(**options)
 
-    return _CONTENTSTORE
+    return _CONTENTSTORE[name]
diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 58fadb7957..7d96e132ee 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -1,4 +1,3 @@
-from bson.son import SON
 from pymongo import Connection
 import gridfs
 from gridfs.errors import NoFile
@@ -15,15 +14,16 @@ import os
 
 
 class MongoContentStore(ContentStore):
-    def __init__(self, host, db, port=27017, user=None, password=None, **kwargs):
+    def __init__(self, host, db, port=27017, user=None, password=None, bucket='fs', **kwargs):
         logging.debug('Using MongoDB for static content serving at host={0} db={1}'.format(host, db))
         _db = Connection(host=host, port=port, **kwargs)[db]
 
         if user is not None and password is not None:
             _db.authenticate(user, password)
 
-        self.fs = gridfs.GridFS(_db)
-        self.fs_files = _db["fs.files"]   # the underlying collection GridFS uses
+        self.fs = gridfs.GridFS(_db, bucket)
+
+        self.fs_files = _db[bucket + ".files"]   # the underlying collection GridFS uses
 
     def save(self, content):
         id = content.get_id()