diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8199e03e..49d79fe0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.8.4
 ================
+- Added str representation of GridFSProxy (#424)
 - Update transform to handle docs erroneously passed to unset (#416)
 - Fixed indexing - turn off _cls (#414)
 - Fixed dereference threading issue in ComplexField.__get__ (#412)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 39a6caa1..826e1258 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1082,8 +1082,8 @@ class GridFSProxy(object):
 
     def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, self.grid_id)
-        
-    def __unicode__(self):
+
+    def __str__(self):
         name = getattr(self.get(), 'filename', self.grid_id) if self.get() else '(no file)'
         return '<%s: %s>' % (self.__class__.__name__, name)
 
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index d0445008..ba601dea 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -53,11 +53,12 @@ class FileTest(unittest.TestCase):
         content_type = 'text/plain'
 
         putfile = PutFile()
-        putfile.the_file.put(text, content_type=content_type)
+        putfile.the_file.put(text, content_type=content_type, filename="hello")
         putfile.save()
 
         result = PutFile.objects.first()
         self.assertTrue(putfile == result)
+        self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello>")
         self.assertEqual(result.the_file.read(), text)
         self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.delete()  # Remove file from GridFS