diff --git a/tox.ini b/tox.ini
index 5ed45fa..9676ac4 100755
--- a/tox.ini
+++ b/tox.ini
@@ -1,53 +1,53 @@
 [tox]
-minversion = 3.2.0
-envlist = py37,pep8
+envlist = py3,pep8
 skipsdist = True
-ignore_basepython_conflict = true
-
+sitepackages = False
+skip_missing_interpreters = True
 
 [testenv]
-basepython = python3
-usedevelop = True
 setenv =
+   VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
-   OS_STDOUT_CAPTURE=1
-   OS_STDERR_CAPTURE=1
-   OS_TEST_TIMEOUT=60
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-       -r{toxinidir}/test-requirements.txt
-commands = stestr run {posargs}
+   PYTHONHASHSEED=0
+   TERM=linux
 
-[testenv:lower-constraints]
-deps = -c{toxinidir}/lower-constraints.txt
-       -r{toxinidir}/test-requirements.txt
+deps =
+    flake8
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
+    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
+install_commands =
+    pip install {opts} {packages}
+
+
+[testenv:py3]
+basepython = python3
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
-commands = flake8 {posargs}
-
-[testenv:venv]
-commands = {posargs}
+commands =   
+    flake8
 
 [testenv:cover]
+basepython = python3
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 setenv =
-    VIRTUAL_ENV={envdir}
-    PYTHON=coverage run --source staffeln --parallel-mode
+    {[testenv]setenv}
+    PYTHON=coverage run
 commands =
-    stestr run {posargs}
+    coverage erase
+    stestr run --slowest {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml
+    coverage report
 
-[testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -W -b html doc/source doc/build/html
 
-[testenv:releasenotes]
-deps = {[testenv:docs]deps}
-commands =
-  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-
-[testenv:debug]
-commands = oslo_debug_helper {posargs}
+[testenv:venv]
+commands = {posargs}
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.