diff --git a/tox.ini b/tox.ini
index 307ea0d1c9..e0fcf78c08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,7 +58,7 @@ ignore-path = .venv,.tox,.git,dist,doc,*egg-info,tools,etc,build,*.po,*.pot,inte
 
 [flake8]
 show-source = True
-ignore = E129,E402,E731,F601,F821,H301,H404,H405,H501,W503,W504,W605
+ignore = E402,E731,F601,F821,H301,H404,H405,H501,W503,W504,W605
 enable-extensions = H203,H106
 import-order-style = pep8
 builtins = _
diff --git a/trove/guestagent/datastore/manager.py b/trove/guestagent/datastore/manager.py
index 42285e4178..79cd73b801 100644
--- a/trove/guestagent/datastore/manager.py
+++ b/trove/guestagent/datastore/manager.py
@@ -511,7 +511,7 @@ class Manager(periodic_task.PeriodicTasks):
                         exposed)
 
                     if (gl_def[self.GUEST_LOG_TYPE_LABEL] ==
-                        guest_log.LogType.USER):
+                            guest_log.LogType.USER):
                         guestlog.enabled = self.is_log_enabled(log_name)
                         guestlog.status = (guest_log.LogStatus.Enabled
                                            if guestlog.enabled
diff --git a/trove/guestagent/datastore/mysql_common/manager.py b/trove/guestagent/datastore/mysql_common/manager.py
index d5488678b1..43580d0aac 100644
--- a/trove/guestagent/datastore/mysql_common/manager.py
+++ b/trove/guestagent/datastore/mysql_common/manager.py
@@ -286,7 +286,7 @@ class MySqlManager(manager.Manager):
 
         volume_stats = self.get_filesystem_stats(context, None)
         if (volume_stats.get('total', 0.0) <
-            replica_info['dataset']['dataset_size']):
+                replica_info['dataset']['dataset_size']):
             raise exception.InsufficientSpaceForReplica(
                 replica_info.update({
                     'slave_volume_size': volume_stats.get('total', 0.0)
diff --git a/trove/instance/service.py b/trove/instance/service.py
index f5a9a1f55f..c804665831 100644
--- a/trove/instance/service.py
+++ b/trove/instance/service.py
@@ -558,7 +558,7 @@ class InstanceController(wsgi.Controller):
 
         name = body['instance'].get('name')
         if ((name and len(body['instance'].keys()) > 2) or
-            (not name and len(body['instance'].keys()) >= 2)):
+                (not name and len(body['instance'].keys()) >= 2)):
             raise exception.BadRequest("Only one attribute (except 'name') is "
                                        "allowed to update.")