diff --git a/openstack_dashboard/api/swift.py b/openstack_dashboard/api/swift.py
index 6328914f1c..2f20b03f30 100644
--- a/openstack_dashboard/api/swift.py
+++ b/openstack_dashboard/api/swift.py
@@ -286,6 +286,7 @@ def swift_upload_object(request, container_name, object_name,
     etag = swift_api(request).put_object(container_name,
                                          object_name,
                                          object_file,
+                                         content_length=size,
                                          headers=headers)
 
     obj_info = {'name': object_name, 'bytes': size, 'etag': etag}
diff --git a/openstack_dashboard/test/api_tests/swift_tests.py b/openstack_dashboard/test/api_tests/swift_tests.py
index 9bba7c80e0..3f244dc30b 100644
--- a/openstack_dashboard/test/api_tests/swift_tests.py
+++ b/openstack_dashboard/test/api_tests/swift_tests.py
@@ -184,16 +184,18 @@ class SwiftApiTests(test.APITestCase):
         headers = {'X-Object-Meta-Orig-Filename': fake_name}
 
         swift_api = self.stub_swiftclient()
+        test_file = FakeFile()
         swift_api.put_object(container.name,
                              obj.name,
                              IsA(FakeFile),
+                             content_length=test_file.size,
                              headers=headers)
         self.mox.ReplayAll()
 
         api.swift.swift_upload_object(self.request,
                                       container.name,
                                       obj.name,
-                                      FakeFile())
+                                      test_file)
 
     def test_swift_upload_object_without_file(self):
         container = self.containers.first()
@@ -203,6 +205,7 @@ class SwiftApiTests(test.APITestCase):
         swift_api.put_object(container.name,
                              obj.name,
                              None,
+                             content_length=0,
                              headers={})
         self.mox.ReplayAll()