diff --git a/.gitignore b/.gitignore
index c68e626..a2e616b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,26 @@
-*.swp
+*.log
+subunit.log
+.autogenerated
+*.py[co]
+
+# Packages
 dist/
-.tox
 *.egg
 *.egg-info
-*.py[co]
 .DS_Store
-*.log
-.testrepository
-subunit.log
 build
-.autogenerated
+
+# Unit test
 .coverage
 cover/
 coverage.xml
+.stestr
+.testrepository
+.tox
+.venv
+
+# Sphinx
 doc/source/api/
+
+# Editors
+*.swp
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..c2c8a3a
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./tests/
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 081907d..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 3add9f4..da05f8c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,5 +2,5 @@ hacking>=0.10.0,<0.11
 
 coverage>=3.6
 mock>=1.0
-testrepository>=0.0.17
+stestr>=2.0.0 # Apache-2.0
 testtools>=0.9.32
diff --git a/tox.ini b/tox.ini
index 4d84089..030f05b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ setenv = VIRTUAL_ENV={envdir}
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args="{posargs}"
+commands = stestr run --slowest {posargs}
 passenv = *_proxy *_PROXY
 
 [testenv:pep8]