diff --git a/README.rst b/README.rst
index 0cda3c2..be42da1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,9 @@
-===============================
-cyborg-tempest-plugin
-===============================
+=====================
+Cyborg Tempest Plugin
+=====================
 
-This is a cyorg tempest plugin package. Tests can be run as a tempest plugin against any cyborg-enabled OpenStack cloud.
+This is a cyorg tempest plugin package. Tests can be run as a tempest plugin
+against any cyborg-enabled OpenStack cloud.
 
 Please fill here a long description which must be at least 3 lines wrapped on
 80 cols, so that distribution package maintainers can use it in their packages.
diff --git a/cyborg_tempest_plugin/README.rst b/cyborg_tempest_plugin/README.rst
deleted file mode 100644
index 1a540b5..0000000
--- a/cyborg_tempest_plugin/README.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-===============================================
-Tempest Integration of Cyborg Tempest Plugin
-===============================================
-
-This directory contains Tempest tests to cover the Cyborg Tempest Plugin project.
-
diff --git a/requirements.txt b/requirements.txt
index 1d18dd3..db20340 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=2.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+oslo.config>=5.2.0 # Apache-2.0
+six>=1.10.0 # MIT
+oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.utils>=3.33.0 # Apache-2.0
+testtools>=2.2.0 # MIT
+testscenarios>=0.4 # Apache-2.0/BSD
+tempest>=17.1.0 # Apache-2.0
+requests>=2.14.2 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 7a9c357..32cfa12 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = cyborg-tempest-plugin
-summary = This is a cyorg tempest plugin package. Tests can be run as a tempest plugin against any cyborg-enabled OpenStack cloud.
+summary = OpenStack Acceleration Tempest Plugin 
 description-file =
     README.rst
 author = OpenStack
@@ -18,6 +18,10 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
 
+keywords =
+    setup
+    distutils
+
 [files]
 packages =
     cyborg_tempest_plugin
@@ -25,3 +29,20 @@ packages =
 [entry_points]
 tempest.test_plugins =
     plugin_name = cyborg_tempest_plugin.plugin:CyborgTempestPlugin
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
+
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
+[wheel]
+universal = 1
diff --git a/test-requirements.txt b/test-requirements.txt
index e2afc81..fb67eac 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,3 +9,7 @@ python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+# releasenotes
+reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d0f815a..2d29457 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
@@ -16,12 +16,15 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
+basepython = python3
 commands = flake8 {posargs}
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [testenv:cover]
+basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
     PYTHON=coverage run --source cyborg-tempest-plugin --parallel-mode
@@ -32,15 +35,18 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
+basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
+basepython = python3
 deps = {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:debug]
+basepython = python3
 commands = oslo_debug_helper {posargs}
 
 [flake8]