diff --git a/.gitignore b/.gitignore
index d178cdc8..4b9fae44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ pip-log.txt
 Thumbs.db
 .venv
 .idea
+.stestr
 out
 target
 *.iml
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..e8da8825
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./saharaclient/tests
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100755
index 4da4d7db..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 $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list