diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate
index d80d80e5d8..a23f7da500 100755
--- a/bin/swift-dispersion-populate
+++ b/bin/swift-dispersion-populate
@@ -76,8 +76,9 @@ def report(success):
         return
     next_report = time() + 5
     eta, eta_unit = compute_eta(begun, created, need_to_create)
-    print '\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries' % (item_type,
-          created, need_to_create, round(eta), eta_unit, retries_done),
+    print ('\r\x1B[KCreating %s: %d of %d, %d%s left, %d retries'
+           % (item_type, created, need_to_create, round(eta), eta_unit,
+              retries_done)),
     stdout.flush()
 
 
diff --git a/bin/swift-dispersion-report b/bin/swift-dispersion-report
index b08d02717f..c437b847bf 100755
--- a/bin/swift-dispersion-report
+++ b/bin/swift-dispersion-report
@@ -126,7 +126,7 @@ def container_dispersion_report(coropool, connpool, account, container_ring,
             if not json_output:
                 print '\r\x1B[KQuerying containers: %d of %d, %d%s left, %d ' \
                       'retries' % (containers_queried[0], containers_listed,
-                      round(eta), eta_unit, retries_done[0]),
+                                   round(eta), eta_unit, retries_done[0]),
                 stdout.flush()
     container_parts = {}
     for container in containers:
@@ -145,7 +145,7 @@ def container_dispersion_report(coropool, connpool, account, container_ring,
     if not json_output:
         print '\r\x1B[KQueried %d containers for dispersion reporting, ' \
               '%d%s, %d retries' % (containers_listed, round(elapsed),
-              elapsed_unit, retries_done[0])
+                                    elapsed_unit, retries_done[0])
         if containers_listed - distinct_partitions:
             print 'There were %d overlapping partitions' % (
                   containers_listed - distinct_partitions)
@@ -255,7 +255,7 @@ def object_dispersion_report(coropool, connpool, account, object_ring,
     if not json_output:
         print '\r\x1B[KQueried %d objects for dispersion reporting, ' \
               '%d%s, %d retries' % (objects_listed, round(elapsed),
-              elapsed_unit, retries_done[0])
+                                    elapsed_unit, retries_done[0])
         if objects_listed - distinct_partitions:
             print 'There were %d overlapping partitions' % (
                   objects_listed - distinct_partitions)
diff --git a/swift/obj/auditor.py b/swift/obj/auditor.py
index 4c78d07af3..1e218a2a1b 100644
--- a/swift/obj/auditor.py
+++ b/swift/obj/auditor.py
@@ -79,7 +79,7 @@ class AuditorWorker(object):
             else:
                 description = _(' - %s') % device_dir_str
         self.logger.info(_('Begin object audit "%s" mode (%s%s)') %
-                        (mode, self.auditor_type, description))
+                         (mode, self.auditor_type, description))
         begin = reported = time.time()
         self.total_bytes_processed = 0
         self.total_files_processed = 0
diff --git a/test/functional/tests.py b/test/functional/tests.py
index 6e0dc1fb69..18b3d4716d 100644
--- a/test/functional/tests.py
+++ b/test/functional/tests.py
@@ -1170,27 +1170,28 @@ class TestFile(Base):
         for prefix in ('', '/'):
             # invalid source container
             file_item = self.env.container.file(Utils.create_name())
+            copy_from = ('%s%s/%s'
+                         % (prefix, Utils.create_name(), source_filename))
             self.assertRaises(ResponseError, file_item.write,
-                              hdrs={'X-Copy-From': '%s%s/%s' %
-                              (prefix,
-                               Utils.create_name(), source_filename)})
+                              hdrs={'X-Copy-From': copy_from})
             self.assert_status(404)
 
             # invalid source object
+            copy_from = ('%s%s/%s'
+                         % (prefix, self.env.container.name,
+                            Utils.create_name()))
             file_item = self.env.container.file(Utils.create_name())
             self.assertRaises(ResponseError, file_item.write,
-                              hdrs={'X-Copy-From': '%s%s/%s' %
-                              (prefix,
-                               self.env.container.name, Utils.create_name())})
+                              hdrs={'X-Copy-From': copy_from})
             self.assert_status(404)
 
             # invalid destination container
             dest_cont = self.env.account.container(Utils.create_name())
             file_item = dest_cont.file(Utils.create_name())
+            copy_from = ('%s%s/%s'
+                         % (prefix, self.env.container.name, source_filename))
             self.assertRaises(ResponseError, file_item.write,
-                              hdrs={'X-Copy-From': '%s%s/%s' %
-                              (prefix,
-                               self.env.container.name, source_filename)})
+                              hdrs={'X-Copy-From': copy_from})
             self.assert_status(404)
 
     def testCopyFromAccountHeader404s(self):
diff --git a/test/unit/common/middleware/test_account_quotas.py b/test/unit/common/middleware/test_account_quotas.py
index ef995b10fe..e8e461fd53 100644
--- a/test/unit/common/middleware/test_account_quotas.py
+++ b/test/unit/common/middleware/test_account_quotas.py
@@ -253,7 +253,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -267,7 +267,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -281,7 +281,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -294,7 +294,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -306,7 +306,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o3'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -318,7 +318,7 @@ class TestAccountQuota(unittest.TestCase):
         cache = FakeCache(None)
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': 'bad_path'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 412)
diff --git a/test/unit/common/middleware/test_list_endpoints.py b/test/unit/common/middleware/test_list_endpoints.py
index 2537d0ffdc..00dd426b93 100644
--- a/test/unit/common/middleware/test_list_endpoints.py
+++ b/test/unit/common/middleware/test_list_endpoints.py
@@ -105,7 +105,8 @@ class TestListEndpoints(unittest.TestCase):
     def FakeGetInfo(self, env, app, swift_source=None):
         info = {'status': 0, 'sync_key': None, 'meta': {},
                 'cors': {'allow_origin': None, 'expose_headers': None,
-                'max_age': None}, 'sysmeta': {}, 'read_acl': None,
+                         'max_age': None},
+                'sysmeta': {}, 'read_acl': None,
                 'object_count': None, 'write_acl': None, 'versions': None,
                 'bytes': None}
         info['storage_policy'] = self.policy_to_test
diff --git a/test/unit/common/middleware/test_quotas.py b/test/unit/common/middleware/test_quotas.py
index 56a7780e2e..85211257de 100644
--- a/test/unit/common/middleware/test_quotas.py
+++ b/test/unit/common/middleware/test_quotas.py
@@ -101,8 +101,8 @@ class TestContainerQuotas(unittest.TestCase):
 
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -114,8 +114,8 @@ class TestContainerQuotas(unittest.TestCase):
 
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -136,8 +136,8 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'bytes': 0, 'meta': {'quota-bytes': '100'}})
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -147,8 +147,8 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'bytes': 0, 'meta': {'quota-bytes': '100'}})
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -158,8 +158,8 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'bytes': 0, 'meta': {'quota-bytes': '100'}})
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o3'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -169,7 +169,7 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'bytes': 0, 'meta': {'quota-bytes': '100'}})
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': 'bad_path'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 412)
@@ -179,8 +179,8 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'bytes': 0, 'meta': {'quota-bytes': '100'}})
         req = Request.blank('/v1/a/c2/o3',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -201,8 +201,8 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'object_count': 1, 'meta': {'quota-count': '1'}})
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.object/a/c2/o2': {'length': 10},
-                            'swift.cache': cache},
+                                     'swift.object/a/c2/o2': {'length': 10},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -213,7 +213,7 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'object_count': 1, 'meta': {'quota-count': '1'}})
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
@@ -227,10 +227,10 @@ class TestContainerQuotas(unittest.TestCase):
                       'status': 200, 'object_count': 1}
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.container/a/c': a_c_cache,
-                            'swift.container/a2/c': a2_c_cache},
+                                     'swift.container/a/c': a_c_cache,
+                                     'swift.container/a2/c': a2_c_cache},
                             headers={'Destination': '/c/o',
-                            'Destination-Account': 'a2'})
+                                     'Destination-Account': 'a2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
         self.assertEquals(res.body, 'Upload exceeds quota.')
@@ -243,10 +243,10 @@ class TestContainerQuotas(unittest.TestCase):
                       'status': 200, 'object_count': 1}
         req = Request.blank('/v1/a2/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.container/a/c': a_c_cache,
-                            'swift.container/a2/c': a2_c_cache},
+                                     'swift.container/a/c': a_c_cache,
+                                     'swift.container/a2/c': a2_c_cache},
                             headers={'X-Copy-From': '/c2/o2',
-                            'X-Copy-From-Account': 'a'})
+                                     'X-Copy-From-Account': 'a'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 413)
         self.assertEquals(res.body, 'Upload exceeds quota.')
@@ -266,7 +266,7 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'object_count': 1, 'meta': {'quota-count': '2'}})
         req = Request.blank('/v1/a/c/o',
                             environ={'REQUEST_METHOD': 'PUT',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'x-copy-from': '/c2/o2'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
@@ -276,7 +276,7 @@ class TestContainerQuotas(unittest.TestCase):
         cache = FakeCache({'object_count': 1, 'meta': {'quota-count': '2'}})
         req = Request.blank('/v1/a/c2/o2',
                             environ={'REQUEST_METHOD': 'COPY',
-                            'swift.cache': cache},
+                                     'swift.cache': cache},
                             headers={'Destination': '/c/o'})
         res = req.get_response(app)
         self.assertEquals(res.status_int, 200)
diff --git a/test/unit/common/middleware/test_tempurl.py b/test/unit/common/middleware/test_tempurl.py
index be82ec6857..c2d96518c5 100644
--- a/test/unit/common/middleware/test_tempurl.py
+++ b/test/unit/common/middleware/test_tempurl.py
@@ -920,10 +920,11 @@ class TestTempURL(unittest.TestCase):
         self.assertTrue('swift.auth_scheme' not in environ)
 
         # Rejected by TempURL
+        environ = {'REQUEST_METHOD': 'PUT',
+                   'QUERY_STRING':
+                   'temp_url_sig=dummy&temp_url_expires=1234'}
         req = self._make_request('/v1/a/c/o', keys=['abc'],
-                                 environ={'REQUEST_METHOD': 'PUT',
-                                 'QUERY_STRING':
-                                 'temp_url_sig=dummy&temp_url_expires=1234'})
+                                 environ=environ)
         resp = req.get_response(self.tempurl)
         self.assertEquals(resp.status_int, 401)
         self.assertTrue('Temp URL invalid' in resp.body)
diff --git a/test/unit/common/ring/test_ring.py b/test/unit/common/ring/test_ring.py
index 05e13c91cb..3fbdd2538e 100644
--- a/test/unit/common/ring/test_ring.py
+++ b/test/unit/common/ring/test_ring.py
@@ -313,8 +313,8 @@ class TestRing(TestRingBase):
 
     def test_reload_old_style_pickled_ring(self):
         devs = [{'id': 0, 'zone': 0,
-                'weight': 1.0, 'ip': '10.1.1.1',
-                'port': 6000},
+                 'weight': 1.0, 'ip': '10.1.1.1',
+                 'port': 6000},
                 {'id': 1, 'zone': 0,
                  'weight': 1.0, 'ip': '10.1.1.1',
                  'port': 6000},
@@ -382,72 +382,72 @@ class TestRing(TestRingBase):
         self.assertEquals(part, 0)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a1')
         self.assertEquals(part, 0)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a4')
         self.assertEquals(part, 1)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[1],
-                          self.intended_devs[4]])])
+                                     self.intended_devs[4]])])
 
         part, nodes = self.ring.get_nodes('aa')
         self.assertEquals(part, 1)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[1],
-                          self.intended_devs[4]])])
+                                     self.intended_devs[4]])])
 
         part, nodes = self.ring.get_nodes('a', 'c1')
         self.assertEquals(part, 0)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a', 'c0')
         self.assertEquals(part, 3)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[1],
-                          self.intended_devs[4]])])
+                                     self.intended_devs[4]])])
 
         part, nodes = self.ring.get_nodes('a', 'c3')
         self.assertEquals(part, 2)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a', 'c2')
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a', 'c', 'o1')
         self.assertEquals(part, 1)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[1],
-                          self.intended_devs[4]])])
+                                     self.intended_devs[4]])])
 
         part, nodes = self.ring.get_nodes('a', 'c', 'o5')
         self.assertEquals(part, 0)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a', 'c', 'o0')
         self.assertEquals(part, 0)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
         part, nodes = self.ring.get_nodes('a', 'c', 'o2')
         self.assertEquals(part, 2)
         self.assertEquals(nodes, [dict(node, index=i) for i, node in
                           enumerate([self.intended_devs[0],
-                          self.intended_devs[3]])])
+                                     self.intended_devs[3]])])
 
     def add_dev_to_ring(self, new_dev):
         self.ring.devs.append(new_dev)
diff --git a/test/unit/container/test_server.py b/test/unit/container/test_server.py
index 835e56e1d9..5fd3da3402 100644
--- a/test/unit/container/test_server.py
+++ b/test/unit/container/test_server.py
@@ -319,13 +319,13 @@ class TestContainerController(unittest.TestCase):
 
     def test_PUT(self):
         req = Request.blank(
-            '/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT',
-            'HTTP_X_TIMESTAMP': '1'})
+            '/sda1/p/a/c',
+            environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
         resp = req.get_response(self.controller)
         self.assertEquals(resp.status_int, 201)
         req = Request.blank(
-            '/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT',
-            'HTTP_X_TIMESTAMP': '2'})
+            '/sda1/p/a/c',
+            environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '2'})
         resp = req.get_response(self.controller)
         self.assertEquals(resp.status_int, 202)
 
@@ -359,14 +359,14 @@ class TestContainerController(unittest.TestCase):
         with mock.patch("swift.container.server.ContainerBroker",
                         InterceptedCoBr):
             req = Request.blank(
-                '/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT',
-                'HTTP_X_TIMESTAMP': '1'})
+                '/sda1/p/a/c',
+                environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
             resp = req.get_response(self.controller)
             self.assertEqual(resp.status_int, 201)
             state[0] = "race"
             req = Request.blank(
-                '/sda1/p/a/c', environ={'REQUEST_METHOD': 'PUT',
-                'HTTP_X_TIMESTAMP': '1'})
+                '/sda1/p/a/c',
+                environ={'REQUEST_METHOD': 'PUT', 'HTTP_X_TIMESTAMP': '1'})
             resp = req.get_response(self.controller)
             self.assertEqual(resp.status_int, 202)
 
diff --git a/test/unit/container/test_sync.py b/test/unit/container/test_sync.py
index 9251e6c378..2b1637ed7e 100644
--- a/test/unit/container/test_sync.py
+++ b/test/unit/container/test_sync.py
@@ -861,9 +861,10 @@ class TestContainerSync(unittest.TestCase):
             def fake_get_object(acct, con, obj, headers, acceptable_statuses):
                 self.assertEqual(headers['X-Backend-Storage-Policy-Index'],
                                  '0')
-                return (200, {'other-header': 'other header value',
-                        'etag': '"etagvalue"', 'x-timestamp': '1.2',
-                        'content-type': 'text/plain; swift_bytes=123'},
+                return (200,
+                        {'other-header': 'other header value',
+                         'etag': '"etagvalue"', 'x-timestamp': '1.2',
+                         'content-type': 'text/plain; swift_bytes=123'},
                         iter('contents'))
 
             cs.swift.get_object = fake_get_object
@@ -881,12 +882,13 @@ class TestContainerSync(unittest.TestCase):
                 self.assertEquals(headers['X-Newest'], True)
                 self.assertEquals(headers['X-Backend-Storage-Policy-Index'],
                                   '0')
-                return (200, {'date': 'date value',
-                        'last-modified': 'last modified value',
-                        'x-timestamp': '1.2',
-                        'other-header': 'other header value',
-                        'etag': '"etagvalue"',
-                        'content-type': 'text/plain; swift_bytes=123'},
+                return (200,
+                        {'date': 'date value',
+                         'last-modified': 'last modified value',
+                         'x-timestamp': '1.2',
+                         'other-header': 'other header value',
+                         'etag': '"etagvalue"',
+                         'content-type': 'text/plain; swift_bytes=123'},
                         iter('contents'))
 
             cs.swift.get_object = fake_get_object
diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index 7ef75fb102..b0bfe7471e 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -1283,7 +1283,7 @@ class TestECDiskFileManager(DiskFileManagerMixin, unittest.TestCase):
 
                      # ...even when other older files are in dir
                      [('%s.durable' % older, False, False),
-                     ('%s.ts' % much_older, False, False)],
+                      ('%s.ts' % much_older, False, False)],
 
                      # isolated .data files are cleaned up when stale
                      [('%s#2.data' % older, False, False),
@@ -1333,11 +1333,11 @@ class TestECDiskFileManager(DiskFileManagerMixin, unittest.TestCase):
                       '0000000006.00000.durable'],
 
                      ['0000000007.00000.meta',
-                     '0000000006.00000#1.data'],
+                      '0000000006.00000#1.data'],
 
                      ['0000000007.00000.meta',
-                     '0000000006.00000.durable',
-                     '0000000005.00000#1.data']
+                      '0000000006.00000.durable',
+                      '0000000005.00000#1.data']
                      ]
         for files in scenarios:
             class_under_test = self._get_diskfile(POLICIES.default)
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
index 83cb05cfce..4df97040ac 100644
--- a/test/unit/proxy/test_server.py
+++ b/test/unit/proxy/test_server.py
@@ -5036,7 +5036,7 @@ class TestObjectController(unittest.TestCase):
             req = Request.blank('/v1/a/c/o',
                                 environ={'REQUEST_METHOD': 'COPY'},
                                 headers={'Transfer-Encoding': 'chunked',
-                                'Content-Type': 'foo/bar'})
+                                         'Content-Type': 'foo/bar'})
             req.body_file = ChunkedFile(11)
             self.app.memcache.store = {}
             self.app.update_request(req)
@@ -7114,9 +7114,10 @@ class TestContainerController(unittest.TestCase):
                                              'Content-Type': 'text/plain'})
         self.assertEqual(controller._convert_policy_to_index(req), None)
         # negative test
-        req = Request.blank('/a/c', headers={'Content-Length': '0',
-                            'Content-Type': 'text/plain',
-                            'X-Storage-Policy': 'nada'})
+        req = Request.blank('/a/c',
+                            headers={'Content-Length': '0',
+                                     'Content-Type': 'text/plain',
+                                     'X-Storage-Policy': 'nada'})
         self.assertRaises(HTTPException, controller._convert_policy_to_index,
                           req)
         # storage policy two is deprecated