diff --git a/test-requirements.txt b/test-requirements.txt
index 35a420e76..37f120da3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,4 +18,5 @@ python-subunit>=0.0.18
 testtools>=0.9.36,!=1.2.0
 testrepository>=0.0.18
 oslosphinx>=2.5.0  # Apache-2.0
+os-testr>=0.1.0
 tempest-lib>=0.5.0
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index c6ed23bac..000000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-
-TESTRARGS=$1
-
-# --until-failure is not compatible with --subunit see:
-#
-# https://bugs.launchpad.net/testrepository/+bug/1411804
-#
-# this work around exists until that is addressed
-if [[ "$TESTARGS" =~ "until-failure" ]]; then
-    python setup.py test --no-parallel --slowest --testr-args="$TESTRARGS"
-else
-    python setup.py test --no-parallel --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
-fi
diff --git a/tox.ini b/tox.ini
index 3060c8ad8..bcb1a9e6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,14 @@ install_command = pip install {opts} {packages}
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands =
-  bash tools/pretty_tox.sh '{posargs}'
+
+# Note, we set concurrency to 6 here as a default
+# ostestr will take the last entry for occurence
+# so if you want to increase/decrease this you
+# can simply add concurrency arg to your tox
+# call ie: 'tox -epy27 -- --concurrency=4'
+commands = ostestr --concurrency=6 {posargs}
+
 whitelist_externals = bash
 
 [tox:jenkins]