diff --git a/.gitignore b/.gitignore
index a9cf60f215..6fa8c0bd5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,7 @@ pip-log.txt
 cover
 cover-master
 .tox
-nosetests.xml
-.testrepository
+.stestr/
 .venv
 
 # Functional test
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000000..b9f28a44c5
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./magnum/tests/unit}
+top_dir=./
+
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 00bae195da..a6a3d89bc9 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -153,6 +153,7 @@ taskflow==2.16.0
 Tempita==0.5.2
 tenacity==4.9.0
 testrepository==0.0.18
+stestr==2.0.0
 testresources==2.0.1
 testscenarios==0.4
 testtools==2.2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b0a2d0f4c2..209b0c4b9e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -19,5 +19,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 pytz>=2013.6 # MIT
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index 799ac18487..0000000000
--- 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 testr --slowest --testr-args="$TESTRARGS"
-else
-    python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
-fi
diff --git a/tox.ini b/tox.ini
index 422f683b54..87a3cd3700 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ passenv = TEMPEST_* OS_TEST_*
 commands =
   find . -type f -name "*.py[c|o]" -delete
   rm -f .testrepository/times.dbm
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:debug]
 basepython = python3
@@ -42,7 +42,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-k8s]
 sitepackages = True
@@ -53,7 +53,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-k8s-ironic]
 sitepackages = True
@@ -64,7 +64,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-k8s-coreos]
 sitepackages = True
@@ -75,7 +75,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-swarm]
 sitepackages = True
@@ -86,7 +86,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-swarm-mode]
 sitepackages = True
@@ -97,7 +97,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:functional-mesos]
 sitepackages = True
@@ -108,7 +108,7 @@ deps =
   {[testenv]deps}
 commands =
   find . -type f -name "*.py[c|o]" -delete
-  bash tools/pretty_tox.sh '{posargs}'
+  stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3