diff --git a/tests/995_test_swift.py b/tests/995_test_swift.py
index 8cdade2..c81b3cb 100644
--- a/tests/995_test_swift.py
+++ b/tests/995_test_swift.py
@@ -71,7 +71,7 @@
     def test_001_create_container(self):
         path = "%s/%s/" % (self.swift['storage_url'], "test_container")
         http = httplib2.Http(disable_ssl_certificate_validation=True)
-        headers = { 'X-Storage-Token': '%s' % (self.swift['x-storage-token'])}
+        headers = {'X-Storage-Token': '%s' % (self.swift['x-storage-token'])}
         response, content = http.request(path, 'PUT', headers=headers)
         self.assertEqual(response.status, 201)
     test_001_create_container.tags = ['swift']
diff --git a/tests/998_test_nova.py b/tests/998_test_nova.py
index 6451008..a3bce14 100644
--- a/tests/998_test_nova.py
+++ b/tests/998_test_nova.py
@@ -61,11 +61,11 @@
         if 'vmnet' in data['server']['addresses']:
             ref = data['server']['addresses']['vmnet']
             if len(ref) > 0:
-                addr_name = 'vmnet'            
+                addr_name = 'vmnet'
         if 'public' in data['server']['addresses']:
             ref = data['server']['addresses']['public']
             if len(ref) > 0:
-                addr_name = 'public' 
+                addr_name = 'public'
         ref = data['server']['addresses'][addr_name]
         netaddr = ref[0]['addr']
 
diff --git a/tests/__init__.py b/tests/__init__.py
index b100258..9dcb9be 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -29,6 +29,7 @@
 CONFIG_DATA = {}
 KEYSTONE_DATA = {}
 
+
 class skip_test(object):
     """Decorator that skips a test."""
     def __init__(self, msg):
@@ -79,7 +80,8 @@
 
 class FunctionalTest(unittest2.TestCase):
     def setUp(self):
-        global GLANCE_DATA, NOVA_DATA, SWIFT_DATA, RABBITMQ_DATA, KEYSTONE_DATA, CONFIG_DATA
+        global GLANCE_DATA, NOVA_DATA, SWIFT_DATA, RABBITMQ_DATA
+        global KEYSTONE_DATA, CONFIG_DATA
         # Define config dict
         self.config = CONFIG_DATA
         # Define service specific dicts
@@ -101,7 +103,7 @@
             self.swift['account'] = self.config['swift']['account']
             self.swift['username'] = self.config['swift']['username']
             self.swift['password'] = self.config['swift']['password']
-            self.swift['ver'] = 'v1.0'  # need to find a better way to get this.
+            self.swift['ver'] = 'v1.0'  # need to find a better way to get this
 
         # Glance Setup
         self.glance['host'] = self.config['glance']['host']