diff --git a/tests/base.py b/tests/base.py
index <HASH>..<HASH> 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -207,7 +207,7 @@ class TestCase(unittest.TestCase, model_importer.ModelImporter):
         if assetstoreType == 'gridfs':
             # Name this as '_auto' to prevent conflict with assetstores created
             # within test methods
-            gridfsDbName = 'girder_test_%s_assetstore_auto' % assetstoreName
+            gridfsDbName = 'girder_test_%s_assetstore_auto' % assetstoreName.replace('.', '_')
             dropGridFSDatabase(gridfsDbName)
             self.assetstore = Assetstore().createGridFsAssetstore(name='Test', db=gridfsDbName)
         elif assetstoreType == 'gridfsrs':
Ensure the tests assetstore has a valid name.

Modify the auto-generated assetstore name used when the assetstore is
gridfs.  This allows plugin tests to specify a gridfs assetstore in
setUp.