@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./cinderclient/tests/unit}
+top_dir=./
@@ -12,6 +12,10 @@ setenv =
     VIRTUAL_ENV={envdir}
     BRANCH_NAME=master
     CLIENT_NAME=python-cinderclient
+    OS_TEST_PATH=./cinderclient/tests/unit
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
 passenv = *_proxy *_PROXY
 
 deps = -r{toxinidir}/requirements.txt
@@ -33,9 +37,14 @@ whitelist_externals = bash
 commands = {posargs}
 
 [testenv:cover]
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source cinderclient --parallel-mode
 commands =
-    python setup.py testr --coverage --testr-args='{posargs}'
-    coverage report
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 commands=
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[DEFAULT]`
	`2`	`+test_path=${OS_TEST_PATH:-./cinderclient/tests/unit}`
	`3`	`+top_dir=./`