diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py
index 85d79cd762..abe92ac0e6 100644
--- a/zerver/tests/test_upload.py
+++ b/zerver/tests/test_upload.py
@@ -35,7 +35,7 @@ from PIL import Image
 
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
-from six.moves import StringIO as _StringIO
+from six.moves import StringIO
 import mock
 import os
 import io
@@ -56,9 +56,6 @@ def destroy_uploads():
     if os.path.exists(settings.LOCAL_UPLOADS_DIR):
         shutil.rmtree(settings.LOCAL_UPLOADS_DIR)
 
-class StringIO(_StringIO):
-    name = ''  # https://github.com/python/typeshed/issues/598
-
 class FileUploadTest(UploadSerializeMixin, ZulipTestCase):
 
     def test_rest_endpoint(self):