diff --git a/gridfs/grid_file.py b/gridfs/grid_file.py
index 08bedf02c..ac1a73eb8 100644
--- a/gridfs/grid_file.py
+++ b/gridfs/grid_file.py
@@ -139,7 +139,7 @@ class GridFile(object):
     name = __create_property("filename")
     content_type = __create_property("contentType")
     length = __create_property("length", True)
-    chunk_size = __create_property("filename", True)
+    chunk_size = __create_property("chunkSize", True)
     upload_date = __create_property("uploadDate", True)
     aliases = __create_property("aliases")
     next = __create_property("next", True)
diff --git a/test/test_grid_file.py b/test/test_grid_file.py
index 9cc55080b..002b2199c 100644
--- a/test/test_grid_file.py
+++ b/test/test_grid_file.py
@@ -16,6 +16,7 @@
 """
 
 import unittest
+import datetime
 
 import qcheck
 from test_connection import get_connection
@@ -54,6 +55,7 @@ class TestGridFile(unittest.TestCase):
         self.assertEqual(self.db._chunks.find().count(), 0)
 
         file = GridFile({"filename": "test"}, self.db)
+        self.assertEqual(file.next, None)
         self.assertEqual(file.read(), "")
         file.close()
 
@@ -89,7 +91,15 @@ class TestGridFile(unittest.TestCase):
         self.assertRaises(TypeError, GridFile, {}, self.db, "r", [])
 
         self.assertRaises(IOError, GridFile, {"filename": "mike"}, self.db)
-        self.assertTrue(GridFile({"filename": "test"}, self.db))
+
+        a = GridFile({"filename": "test"}, self.db)
+        self.assertEqual(a.length, 0)
+        self.assertEqual(a.content_type, None)
+        self.assertEqual(a.name, "test")
+        self.assertEqual(a.chunk_size, 256000)
+        self.assertTrue(isinstance(a.upload_date, datetime.datetime))
+        self.assertEqual(a.aliases, None)
+        self.assertEqual(a.next, None)
 
 if __name__ == "__main__":
     unittest.main()