diff --git a/config_tempest/tests/test_tempest_config.py b/config_tempest/tests/test_config_tempest.py
similarity index 88%
rename from config_tempest/tests/test_tempest_config.py
rename to config_tempest/tests/test_config_tempest.py
index adc07aee..68d6894a 100644
--- a/config_tempest/tests/test_tempest_config.py
+++ b/config_tempest/tests/test_config_tempest.py
@@ -13,13 +13,13 @@
 # under the License.
 
 """
-test_tempest_config
+test_config_tempest
 ----------------------------------
 
-Tests for `tempest_config` module.
+Tests for `config_tempest` module.
 """
 
-from tempest_config.tests import base
+from config_tempest.tests import base
 
 
 class TestTempest_config(base.TestCase):
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
index 1728a61c..5fcfaebc 100644
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1,4 +1,3 @@
 ============
 Contributing
 ============
-.. include:: ../../CONTRIBUTING.rst
diff --git a/tox.ini b/tox.ini
index c8889926..52cb3bbe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
 commands = flake8 {posargs}
@@ -19,7 +19,7 @@ commands = flake8 {posargs}
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 commands = python setup.py build_sphinx