diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 78528ec..019004c 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -33,8 +33,8 @@ for psycopg2 (PyMySQL is a pure-Python implementation and so needs no
 additional system packages).  For Ubuntu/Debian they are python-dev, and
 libpq-dev.  For Fedora/CentOS - gcc, python-devel and postgresql-devel.
 There is also a separate env for testing with MySQL-python. If you are suppose
-to run these tests as well, you need to install libmysqlclient-dev on Ubuntu/Debian
-or mysql-devel for Fedora/CentOS.
+to run these tests as well, you need to install libmysqlclient-dev on
+Ubuntu/Debian or mysql-devel for Fedora/CentOS.
 
 The oslo.db unit tests system allows to run unittests on real databases. At the
 moment it supports MySQL, PostgreSQL and SQLite.
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index 8cb3146..ac7b6bc 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1 +1 @@
-.. include:: ../../CONTRIBUTING.rst
\ No newline at end of file
+.. include:: ../../CONTRIBUTING.rst
diff --git a/tox.ini b/tox.ini
index 5f791e7..4f6bd72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,14 +49,9 @@ commands =
     python setup.py build_sphinx
 
 [flake8]
-# H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
-# TODO(pblaho): enable H305 when hacking is patched
-# H305 skipped b/c of hacking is confused with oslo.* namespace
-# see https://bugs.launchpad.net/hacking/+bug/1329363
-
+ignore = E123,E125
 show-source = True
-ignore = E123,E125,H305,H307,H803,H904
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [hacking]