diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 94e44e4..17f1e42 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -105,7 +105,7 @@
         if resp.status == 413:
             body = json.loads(body)
             raise exceptions.OverLimit(body['overLimit']['message'])
-            
+
         if resp.status in (500, 501):
             body = json.loads(body)
             raise exceptions.ComputeFault(body['computeFault']['message'])
diff --git a/tempest/config.py b/tempest/config.py
index 2bbadc7..3511d5c 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -123,7 +123,6 @@
 class TempestConfig(object):
     """Provides OpenStack configuration information."""
 
-
     def __init__(self, conf_dir, conf_file):
         """
         Initialize a configuration from a conf directory and conf file.
diff --git a/tempest/exceptions.py b/tempest/exceptions.py
index b4d056d..d9babb2 100644
--- a/tempest/exceptions.py
+++ b/tempest/exceptions.py
@@ -16,11 +16,12 @@
 
     def __str__(self):
         return repr(self.message)
-        
-        
+
+
 class AuthenticationFailure(Exception):
     msg = ("Authentication with user %(user)s and password "
            "%(password)s failed.")
+
     def __init__(self, **kwargs):
         self.message = self.msg % kwargs
 
diff --git a/tempest/openstack.py b/tempest/openstack.py
index 271b5db..dcabd8d 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -54,7 +54,7 @@
                                               self.config.nova.api_key,
                                               self.auth_url,
                                               self.config.nova.tenant_name)
-            
+
         else:
             #Assuming basic/native authentication
             self.servers_client = ServersClient(self.config,
diff --git a/tempest/tests/test_image_metadata.py b/tempest/tests/test_image_metadata.py
index 7a15b32..b533a1b 100644
--- a/tempest/tests/test_image_metadata.py
+++ b/tempest/tests/test_image_metadata.py
@@ -27,7 +27,7 @@
     @classmethod
     def tearDownClass(cls):
         cls.servers_client.delete_server(cls.server['id'])
-        
+
     def setUp(self):
         meta = {'key1': 'value1', 'key2': 'value2'}
         name = rand_name('image')
@@ -77,7 +77,8 @@
     def test_update_image_metadata(self):
         """The metadata for the image should match the updated values"""
         meta = {'key1': 'alt1', 'key2': 'alt2'}
-        resp, metadata = self.client.update_image_metadata(self.image['id'], meta)
+        resp, metadata = self.client.update_image_metadata(self.image['id'],
+                                                           meta)
 
         resp, metadata = self.client.list_image_metadata(self.image['id'])
         self.assertEqual('alt1', metadata['key1'])