diff --git a/test-requirements.txt b/test-requirements.txt
index 7c748fe6..e9681017 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,5 @@
 mock
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage>=3.6 # Apache-2.0
-testrepository>=0.0.18
+stestr!=2.3.0  # Apache-2.0
 testtools>=1.4.0 # MIT
-os-testr>=0.4.1 # Apache-2.0
 ddt
diff --git a/tox.ini b/tox.ini
index ae8d0c16..e5fde6a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,21 +2,22 @@
 envlist = py35,py34,py27,pep8
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
-         LANGUAGE=en_US
          LC_ALL=en_US.UTF-8
          TESTS_DIR=./proliantutils/tests/
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
 basepython = python2.7
 deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
+    hacking!=0.13.0,<0.14,>=0.12.0
 commands =
     flake8 proliantutils