diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py
index 10974b6aa0..75ad129e49 100644
--- a/ironic/common/keystone.py
+++ b/ironic/common/keystone.py
@@ -95,7 +95,8 @@ def get_service_url(service_type='baremetal', endpoint_type='internal'):
     ksclient = _get_ksclient()
 
     if not ksclient.has_service_catalog():
-        raise exception.KeystoneFailure(_('No keystone service catalog loaded'))
+        raise exception.KeystoneFailure(_('No Keystone service catalog '
+                                          'loaded'))
 
     try:
         endpoint = ksclient.service_catalog.url_for(service_type=service_type,
diff --git a/tox.ini b/tox.ini
index b5ed9dab5f..0065bf41ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,9 +46,8 @@ commands = {posargs}
 
 [flake8]
 # E711: ignored because it is normal to use "column == None" in sqlalchemy
-
-ignore = E12,E711
-select = E713
+# TODO(yuriyz): Analyze or fix the warnings blacklisted below
+ignore = E12,E111,E113,E131,E265,E711,F812,H305,H307,H405,H702,H904
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,*ironic/nova*
 
 [hacking]