diff --git a/.mailmap b/.mailmap
index 516ae6f..926267f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
-# Format is:
-# <preferred e-mail> <other e-mail 1>
-# <preferred e-mail> <other e-mail 2>
+Alexey Zaytsev <azaytsev@mirantis.com>
+Anton Studenov <astudenov@mirantis.com>
+Ilya Shakhat <ishakhat@mirantis.com>
+Yaroslav Lobankov <ylobankov@mirantis.com>
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/HACKING.rst b/HACKING.rst
index f66f93f..29c8e4b 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,6 @@
 OS-Faults Style Commandments
 ============================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+- Step 1: Read the OpenStack Style Commandments
+  http://docs.openstack.org/developer/hacking/
+- Step 2: Read on
diff --git a/LICENSE b/LICENSE
index 68c771a..67db858 100644
--- a/LICENSE
+++ b/LICENSE
@@ -173,4 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
diff --git a/babel.cfg b/babel.cfg
index 15cd6cb..efceab8 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,2 +1 @@
 [python: **.py]
-
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index f1ff63b..83b1ffa 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -1,6 +1,7 @@
-============================================
- os_faults Release Notes
-============================================
+=======================
+OS-Faults Release Notes
+=======================
+
 
 .. toctree::
    :maxdepth: 1
diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst
index cd22aab..875030f 100644
--- a/releasenotes/source/unreleased.rst
+++ b/releasenotes/source/unreleased.rst
@@ -1,5 +1,5 @@
-==============================
- Current Series Release Notes
-==============================
+============================
+Current Series Release Notes
+============================
 
 .. release-notes::
diff --git a/setup.cfg b/setup.cfg
index 33b82a9..56d4ab7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,4 +49,4 @@ output_file = os_faults/locale/os_faults.pot
 [build_releasenotes]
 all_files = 1
 build-dir = releasenotes/build
-source-dir = releasenotes/source
\ No newline at end of file
+source-dir = releasenotes/source
diff --git a/tox.ini b/tox.ini
index 0242f94..2ae467a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,9 +63,8 @@ install_command = {[testenv:common-constraints]install_command}
 commands = oslo_debug_helper {posargs}
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
-show-source = True
+# E123 skipped because it is ignored by default in the default pep8.
+# E125 skipped until https://github.com/jcrocholl/pep8/issues/126 is resolved.
 ignore = E123,E125
-builtins = _
+show-source = True
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build