diff --git a/tox.ini b/tox.ini
index c888992..74c85e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,9 +32,22 @@
 commands = oslo_debug_helper {posargs}
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
-show-source = True
-ignore = E123,E125
-builtins = _
-exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
+# E125 continuation line does not distinguish itself from next logical line
+# E126 continuation line over-indented for hanging indent
+# E128 continuation line under-indented for visual indent
+# E129 visually indented line with same indent as next logical line
+# E265 block comment should start with '# '
+# H404 multi line docstring should start with a summary
+# H405 multi line docstring summary not separated with an empty line
+# N530 direct neutron imports not allowed
+# TODO(ihrachys) figure out what to do with N534 and N536
+# N534 Untranslated exception message
+# N536 Use assertIsNone rather than assertEqual to check for None values
+ignore = E125,E126,E128,E129,E265,H404,H405,N530,N534,N536
+# H106: Don't put vim configuration in source files
+# H203: Use assertIs(Not)None to check for None
+# H904: Delay string interpolations at logging calls
+enable-extensions=H106,H203,H904
+show-source = true
+exclude = ./.*,build,dist,doc
+import-order-style = pep8