diff --git a/.gitignore b/.gitignore
index 20a46bf1..1e68448e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,10 +24,10 @@ lib64
 pip-log.txt
 
 # Unit test / coverage reports
-.coverage
-.tox
+.coverage*
+coverage.xml
 nosetests.xml
-.testrepository
+.tox
 .venv
 
 # Translations
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c4..00000000
--- 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:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 9bdd4cec..cbdc6581 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,13 +2,12 @@ sphinx>=2.0.0,!=2.1.0 # BSD
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 
 # The below is rewquired to build testing module reference
 
 # Include horizon as test requirement
-horizon
+horizon>=17.1.0  # Apache-2.0
 
 selenium>=2.50.1 # Apache-2.0
 xvfbwrapper>=0.1.3 #license: MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 961f1f20..9b9e5358 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 nodeenv>=0.9.4 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 pycodestyle>=2.0.0,<2.7.0 # MIT
diff --git a/tox.ini b/tox.ini
index c8b4841b..de3518ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 3.1.0
+minversion = 3.18.0
 skipsdist = True
 envlist = py3,pep8
 ignore_basepython_conflict=true
@@ -67,7 +67,7 @@ commands =
 
 [testenv:pdf-docs]
 deps = {[testenv:docs]deps}
-whitelist_externals = make
+allowlist_externals = make
 commands =
   sphinx-build -W -b latex doc/source doc/build/pdf
   make -C doc/build/pdf