diff --git a/.zuul.yaml b/.zuul.yaml
index 9ce7ef75..fd15308f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,7 @@
 - project:
     templates:
       - check-requirements
+      - openstack-cover-jobs
       - openstack-python-jobs
       - openstack-python35-jobs-nonvoting
       - release-notes-jobs-python3
diff --git a/tox.ini b/tox.ini
index 0ed1879f..9cb012be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -52,8 +52,14 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py test --coverage --testr-args='{posargs}'
-           coverage report
+setenv =
+    VIRTUAL_ENV={envdir}
+    PYTHON=coverage run --source masakari --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 basepython = python3