diff --git a/pymongo/database.py b/pymongo/database.py
index 049ec1152..3f22f7f24 100644
--- a/pymongo/database.py
+++ b/pymongo/database.py
@@ -41,7 +41,7 @@ def _check_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 d1f465663..5ad199ae9 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -71,6 +71,7 @@ class TestDatabaseNoConnect(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"))