diff --git a/README.rst b/README.rst
index 2027dec0..e34925f6 100644
--- a/README.rst
+++ b/README.rst
@@ -384,8 +384,8 @@ Changelog
 Authors
 =======
 
-`Jakub Roztocil`_  (`@jkbrzt`_) created HTTPie and `these fine people`_ have
-contributed.
+`Jakub Roztocil`_  (`@jakubroztocil`_) created HTTPie and `these fine people`_
+have contributed.
 
 
 .. _suite of tests: https://github.com/jkbr/httpie/blob/master/tests/tests.py
@@ -400,7 +400,7 @@ contributed.
 .. _the repository: https://github.com/jkbr/httpie
 .. _these fine people: https://github.com/jkbr/httpie/contributors
 .. _Jakub Roztocil: http://roztocil.name
-.. _@jkbrzt: https://twitter.com/jkbrzt
+.. _@jakubroztocil: https://twitter.com/jakubroztocil
 .. _existing issues: https://github.com/jkbr/httpie/issues?state=open
 .. _0.1.6: https://github.com/jkbr/httpie/compare/0.1.4...0.1.6
 .. _0.2.0: https://github.com/jkbr/httpie/compare/0.1.6...0.2.0
diff --git a/httpie/input.py b/httpie/input.py
index f837c3c9..25d7e5a2 100644
--- a/httpie/input.py
+++ b/httpie/input.py
@@ -97,28 +97,19 @@ class Parser(argparse.ArgumentParser):
         self._parse_items(args)
 
         if not env.stdin_isatty:
-            self._body_from_file(args, env.stdin)
+            self._body_from_file(args, env.stdin.read())
 
         if args.auth and not args.auth.has_password():
             # Stdin already read (if not a tty) so it's save to prompt.
             args.auth.prompt_password()
 
-        if args.files:
-            # Will be read multiple times.
-            for name in args.files:
-                args.files[name] = args.files[name].read()
-
         if args.prettify == PRETTIFY_STDOUT_TTY_ONLY:
             args.prettify = env.stdout_isatty
 
         return args
 
     def _body_from_file(self, args, data):
-        """Use the content of `f` as the `request.data`.
-
-        There can only be one source of request data.
-
-        """
+        """There can only be one source of request data."""
         if args.data:
             self.error('Request body (from stdin or a file) and request '
                        'data (key=value) cannot be mixed.')
@@ -192,14 +183,14 @@ class Parser(argparse.ArgumentParser):
                     ' --form is used. File fields: %s'
                     % ','.join(args.files.keys()))
 
-            f = list(args.files.values())[0]
-            self._body_from_file(args, f)
+            fn, data = list(args.files.values())[0]
+            self._body_from_file(args, data)
 
             # Reset files
             args.files = {}
 
             if 'Content-Type' not in args.headers:
-                mime, encoding = mimetypes.guess_type(f.name, strict=False)
+                mime, encoding = mimetypes.guess_type(fn, strict=False)
                 if mime:
                     content_type = mime
                     if encoding:
@@ -414,7 +405,8 @@ def parse_items(items, data=None, headers=None, files=None, params=None):
             target = params
         elif item.sep == SEP_FILES:
             try:
-                value = open(os.path.expanduser(value), 'r')
+                with open(os.path.expanduser(value), 'r') as f:
+                    value = (os.path.basename(f.name), f.read())
             except IOError as e:
                 raise ParseError(
                     'Invalid argument "%s": %s' % (item.orig, e))
diff --git a/httpie/output.py b/httpie/output.py
index 96c6d01d..bcdc85c5 100644
--- a/httpie/output.py
+++ b/httpie/output.py
@@ -11,7 +11,7 @@ from pygments.lexers import get_lexer_for_mimetype
 from pygments.formatters.terminal import TerminalFormatter
 from pygments.formatters.terminal256 import Terminal256Formatter
 from pygments.util import ClassNotFound
-from requests.compat import is_windows, bytes
+from requests.compat import is_windows
 
 from . import solarized
 from .models import Environment
diff --git a/tests/tests.py b/tests/tests.py
index 117685be..8f1de69d 100755
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -60,21 +60,18 @@ def httpbin(path):
     return HTTPBIN_URL + path
 
 
-class BytesResponse(bytes):
-
+class ResponseMixin(object):
     exit_status = None
     stderr = None
     json = None
 
-    def __eq__(self, other):
-        return super(BytesResponse, self).__eq__(other)
 
-class StrResponse(str):
-    exit_status = None
-    stderr = None
-    json = None
-    def __eq__(self, other):
-        return super(StrResponse, self).__eq__(other)
+class BytesResponse(bytes, ResponseMixin):
+    pass
+
+
+class StrResponse(str, ResponseMixin):
+    pass
 
 
 def http(*args, **kwargs):
@@ -543,7 +540,7 @@ class MultipartFormDataFileUploadTest(BaseTestCase):
         self.assertIn('HTTP/1.1 200', r)
         self.assertIn('Content-Disposition: form-data; name="foo"', r)
         self.assertIn('Content-Disposition: form-data; name="test-file";'
-                      ' filename="test-file"', r)
+                      ' filename="%s"' % os.path.basename(TEST_FILE_PATH), r)
         self.assertEqual(r.count(TEST_FILE_CONTENT), 2)
         self.assertIn('"foo": "bar"', r)