diff --git a/.zuul.yaml b/.zuul.yaml
index 0faf0748..d50bd109 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,6 +10,8 @@
     name: openstack-infra/storyboard
     check:
       jobs:
+        - tox-cover:
+            timeout: 6000
         - storyboard-tox-sqlite
         - tox-pep8
         - tox-py27:
diff --git a/tox.ini b/tox.ini
index 4866d5f9..93ed1af6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,7 +43,14 @@ commands =
 
 [testenv:cover]
 basepython = python3
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+setenv =
+    VIRTUAL_ENV={envdir}
+    PYTHON=coverage run --source storyboard --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [flake8]
 # E125 and E128 are ignored on purpose, they are invalid pep8