diff --git a/pymongo/helpers.py b/pymongo/helpers.py
index ae88e7b62..3be4527d9 100644
--- a/pymongo/helpers.py
+++ b/pymongo/helpers.py
@@ -263,7 +263,7 @@ def _check_database_name(name):
     if not name:
         raise InvalidName("database name cannot be the empty string")
 
-    for invalid_char in [" ", ".", "$", "/", "\\", "\x00"]:
+    for invalid_char in [' ', '.', '$', '/', '\\', '\x00', '"']:
         if invalid_char in name:
             raise InvalidName("database names cannot contain the "
                               "character %r" % invalid_char)
diff --git a/test/test_database.py b/test/test_database.py
index cf6983b89..ec4e895f5 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -68,6 +68,7 @@ class TestDatabase(unittest.TestCase):
     def test_name(self):
         self.assertRaises(TypeError, Database, self.client, 4)
         self.assertRaises(InvalidName, Database, self.client, "my db")
+        self.assertRaises(InvalidName, Database, self.client, 'my"db')
         self.assertRaises(InvalidName, Database, self.client, "my\x00db")
         self.assertRaises(InvalidName, Database,
                           self.client, u"my\u0000db")