diff --git a/test_repo/compute/__init__.py b/test_repo/compute/__init__.py
index dd8b1e4e..59ab77fa 100644
--- a/test_repo/compute/__init__.py
+++ b/test_repo/compute/__init__.py
@@ -13,4 +13,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-
diff --git a/test_repo/compute/admin/actions/test_create_backup.py b/test_repo/compute/admin/actions/test_create_backup.py
index b1b4e74d..72eabe77 100644
--- a/test_repo/compute/admin/actions/test_create_backup.py
+++ b/test_repo/compute/admin/actions/test_create_backup.py
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.drivers.unittest.decorators import tags
 from cloudcafe.compute.common.types import BackupTypes
 from test_repo.compute.fixtures import ComputeAdminFixture
 
diff --git a/test_repo/compute/admin/actions/test_lock_server.py b/test_repo/compute/admin/actions/test_lock_server.py
index c4fccf8a..5bbedbd0 100644
--- a/test_repo/compute/admin/actions/test_lock_server.py
+++ b/test_repo/compute/admin/actions/test_lock_server.py
@@ -54,4 +54,3 @@ class LockServerTests(ComputeAdminFixture):
     def test_cannot_resize_locked_server(self):
         with self.assertRaises(ActionInProgress):
             self.servers_client.resize(self.server.id, self.flavor_ref)
-
diff --git a/test_repo/compute/admin/actions/test_migrate_server.py b/test_repo/compute/admin/actions/test_migrate_server.py
index 2de010e0..b49d8c7e 100644
--- a/test_repo/compute/admin/actions/test_migrate_server.py
+++ b/test_repo/compute/admin/actions/test_migrate_server.py
@@ -17,6 +17,7 @@ limitations under the License.
 from cloudcafe.compute.common.types import NovaServerStatusTypes
 from test_repo.compute.fixtures import ComputeAdminFixture
 
+
 class MigrateServerTests(ComputeAdminFixture):
 
     @classmethod
diff --git a/test_repo/compute/admin/actions/test_pause_server.py b/test_repo/compute/admin/actions/test_pause_server.py
index 78fa921b..23cdeaef 100644
--- a/test_repo/compute/admin/actions/test_pause_server.py
+++ b/test_repo/compute/admin/actions/test_pause_server.py
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.drivers.unittest.decorators import tags
 from test_repo.compute.fixtures import ComputeAdminFixture
 
 
@@ -28,6 +27,8 @@ class PauseServerTests(ComputeAdminFixture):
 
     def test_pause_unpause_server(self):
         self.admin_servers_client.pause_server(self.server.id)
-        self.admin_server_behaviors.wait_for_server_status(self.server.id, 'PAUSED')
+        self.admin_server_behaviors.wait_for_server_status(
+            self.server.id, 'PAUSED')
         self.admin_servers_client.unpause_server(self.server.id)
-        self.admin_server_behaviors.wait_for_server_status(self.server.id, 'ACTIVE')
+        self.admin_server_behaviors.wait_for_server_status(
+            self.server.id, 'ACTIVE')
diff --git a/test_repo/compute/admin/actions/test_reset_server_state.py b/test_repo/compute/admin/actions/test_reset_server_state.py
index a37fbee6..6918c638 100644
--- a/test_repo/compute/admin/actions/test_reset_server_state.py
+++ b/test_repo/compute/admin/actions/test_reset_server_state.py
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.drivers.unittest.decorators import tags
 from test_repo.compute.fixtures import ComputeAdminFixture
 
+
 class ResetServerStateTests(ComputeAdminFixture):
 
     @classmethod
@@ -29,10 +29,12 @@ class ResetServerStateTests(ComputeAdminFixture):
 
         # Set the active server into error status
         self.admin_servers_client.reset_state(self.server.id, 'error')
-        current_server = self.admin_servers_client.get_server(self.server.id).entity
+        current_server = self.admin_servers_client.get_server(
+            self.server.id).entity
         self.assertEqual(current_server.status.lower(), 'error')
 
         # Reset the server's error status back to active
         self.admin_servers_client.reset_state(self.server.id, 'active')
-        current_server = self.admin_servers_client.get_server(self.server.id).entity
+        current_server = self.admin_servers_client.get_server(
+            self.server.id).entity
         self.assertEqual(current_server.status.lower(), 'active')
diff --git a/test_repo/compute/admin/actions/test_stop_server.py b/test_repo/compute/admin/actions/test_stop_server.py
index d2685c3b..9e8f8c98 100644
--- a/test_repo/compute/admin/actions/test_stop_server.py
+++ b/test_repo/compute/admin/actions/test_stop_server.py
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.drivers.unittest.decorators import tags
 from test_repo.compute.fixtures import ComputeAdminFixture
 
+
 class StopServerTests(ComputeAdminFixture):
 
     @classmethod
diff --git a/test_repo/compute/admin/actions/test_suspend_server.py b/test_repo/compute/admin/actions/test_suspend_server.py
index 7b07d4a3..ab390292 100644
--- a/test_repo/compute/admin/actions/test_suspend_server.py
+++ b/test_repo/compute/admin/actions/test_suspend_server.py
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.drivers.unittest.decorators import tags
 from test_repo.compute.fixtures import ComputeAdminFixture
 
+
 class SuspendServerTests(ComputeAdminFixture):
 
     @classmethod
diff --git a/test_repo/compute/admin/test_create_flavor.py b/test_repo/compute/admin/test_create_flavor.py
index 2d94e5d2..ed6109f9 100644
--- a/test_repo/compute/admin/test_create_flavor.py
+++ b/test_repo/compute/admin/test_create_flavor.py
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from random import randint
-
 from cafe.drivers.unittest.decorators import tags
 from cloudcafe.common.tools.datagen import rand_name
 from cloudcafe.compute.common.exceptions import ActionInProgress
diff --git a/test_repo/compute/admin/test_delete_flavor.py b/test_repo/compute/admin/test_delete_flavor.py
index b5b80cf3..b487a54d 100644
--- a/test_repo/compute/admin/test_delete_flavor.py
+++ b/test_repo/compute/admin/test_delete_flavor.py
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from random import randint
-
 from cafe.drivers.unittest.decorators import tags
 from cloudcafe.common.tools.datagen import rand_name
 from cloudcafe.compute.common.exceptions import BadRequest, ItemNotFound