diff --git a/.gitreview b/.gitreview
index 698048f..44590d7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/openstack.git
+project=openstack/tripleo-common-tempest-plugin.git
diff --git a/tox.ini b/tox.ini
index 3c2a3ba..d9bae1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py35,py27,pep8,api,functional
+envlist = py35,py27,pep8
 skipsdist = True
 
 [testenv]
@@ -9,30 +9,7 @@ usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 commands =
     find . -type f -name "*.py[c|o]" -delete
-    ostestr --slowest --regex 'tripleo_common_tempest_plugin.api.*' {posargs}
-
-whitelist_externals = find
-
-[testenv:api]
-basepython = python3.5
-setenv = VIRTUAL_ENV={envdir}
-         PYTHONHASHSEED=0
-         OS_TEST_PATH=tripleo_common_tempest_plugin/api
-commands =
-    find . -type f -name "*.py[c|o]" -delete
-    ostestr --slowest --regex 'tripleo_common_tempest_plugin.functional.*' {posargs}
-
-[testenv:functional]
-basepython = python3.5
-setenv = VIRTUAL_ENV={envdir}
-         PYTHONHASHSEED=0
-         OS_TEST_PATH=tripleo_common_tempest_plugin/functional
-# By default ostestr will set concurrency to ncpu, to specify something else
-# use the concurrency=<n> option.
-# e.g.: 'tox -efunctional -- --concurrency=4'
-commands =
-    find . -type f -name "*.py[c|o]" -delete
-    ostestr --slowest {posargs}
+    ostestr --slowest --regex 'tripleo_common_tempest_plugin.*' {posargs}
 
 whitelist_externals = find
 
@@ -47,10 +24,6 @@ commands = {posargs}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]
-# Temporarily disable complaints about docstring for public module/class/method
-# H106 Don’t put vim configuration in source files
-# H203 Use assertIs(Not)None to check for None
-ignore = D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D300,D301,D400,D401
 enable-extensions=H106,H203
 show-source = true
 exclude=.venv,.git,.tox,*lib/python*,*egg,tools,build,releasenotes
diff --git a/tripleo_common_tempest_plugin/tests/scenario/workflows/test_access.py b/tripleo_common_tempest_plugin/tests/scenario/workflows/test_access.py
index 8029691..05e81bf 100644
--- a/tripleo_common_tempest_plugin/tests/scenario/workflows/test_access.py
+++ b/tripleo_common_tempest_plugin/tests/scenario/workflows/test_access.py
@@ -15,9 +15,6 @@
 from tempest.lib import decorators
 from tempest import test
 
-from tripleo_common_tempest_plugin.tests import base
-
-
 
 class AccessWorkflowTestCase(test.BaseTestCase):