diff --git a/.gitignore b/.gitignore
index 3d9f18821..b9ae40e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ develop-eggs/
 .tox
 AUTHORS
 ChangeLog
-.testrepository
 .stestr
 .coverage
 cover
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 56ba15e36..000000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-120} \
-             ${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
\ No newline at end of file
diff --git a/lower-constraints.txt b/lower-constraints.txt
index eaf0161e2..49dc2abc4 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -125,7 +125,6 @@ stevedore==1.28.0
 sympy==1.1.1
 Tempita==0.5.2
 tenacity==4.9.0
-testrepository==0.0.20
 testresources==2.0.1
 testscenarios==0.5.0
 testtools==2.3.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b2223f2b3..5a46dd59e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,6 @@ coverage>=4.5.1 # Apache-2.0
 python-subunit>=1.2.0 # Apache-2.0/BSD
 oslotest>=3.3.0 # Apache-2.0
 requests-mock>=1.4.0 # Apache-2.0
-testrepository>=0.0.20 # Apache-2.0/BSD
 testscenarios>=0.5.0 # Apache-2.0/BSD
 testtools>=2.3.0 # MIT
 stestr>=2.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index fde43e57b..506f4ac0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,6 @@ install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.opens
 whitelist_externals = find
 setenv =
    VIRTUAL_ENV={envdir}
-   OS_TEST_PATH=vitrage/tests/unit
-   DISCOVER_DIRECTORY=vitrage/tests
 deps = -r{toxinidir}/test-requirements.txt
 commands =
     stestr run --serial '{posargs}'
@@ -42,8 +40,13 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
+setenv =
+    PYTHON=coverage run --source $project --parallel-mode
 commands =
-    python setup.py testr --coverage --testr-args='{posargs}'
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
     coverage report
 
 [testenv:docs]