diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..a5228653
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=deckhand/tests/unit
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 0ac99632..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 ./ ${OS_TEST_PATH:-./deckhand/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/tools/run_pifpaf.sh b/tools/run_pifpaf.sh
index f7510c32..1fc9d1cc 100755
--- a/tools/run_pifpaf.sh
+++ b/tools/run_pifpaf.sh
@@ -20,4 +20,4 @@ set -eo pipefail
 
 TESTRARGS=$1
 
-python setup.py testr --slowest --testr-args="--subunit --concurrency=1 $TESTRARGS" | subunit-trace -f
+stestr run --concurrency=1 --slowest $TESTRARGS
diff --git a/tools/unit-tests.sh b/tools/unit-tests.sh
index cf710c6e..14e191de 100755
--- a/tools/unit-tests.sh
+++ b/tools/unit-tests.sh
@@ -33,8 +33,8 @@ export DATABASE_URL=postgresql+psycopg2://$(whoami):password@$POSTGRES_IP:5432/d
 set -e
 posargs=$@
 if [ ${#posargs} -ge 1 ]; then
-    ostestr --concurrency 1 --regex ${posargs}
+    stestr run --concurrency=1 ${posargs}
 else
-    ostestr --concurrency 1
+    stestr run --concurrency=1
 fi
 set +e
diff --git a/tox.ini b/tox.ini
index 6a757b73..2ee58565 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,8 @@ commands =
 [testenv:py27]
 commands =
     {[testenv]commands}
-    ostestr --regex '{posargs}'
+    stestr run {posargs}
+    stestr slowest
 
 [testenv:py27-postgresql]
 commands =
@@ -31,7 +32,8 @@ commands =
 [testenv:py35]
 commands =
     {[testenv]commands}
-    ostestr --regex '{posargs}'
+    stestr run {posargs}
+    stestr slowest
 
 [testenv:py35-postgresql]
 commands =