diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..32dc624
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,7 @@
+[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:-./valence/tests/unit} $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 8ac56c5..5894cef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ install_command =
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:common-constraints]
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
diff --git a/valence/tests/functional/__init__.py b/valence/tests/functional/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/valence/tests/test_functional.py b/valence/tests/functional/test_functional.py
similarity index 100%
rename from valence/tests/test_functional.py
rename to valence/tests/functional/test_functional.py
diff --git a/valence/tests/unit/__init__.py b/valence/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/valence/tests/test_units.py b/valence/tests/unit/test_units.py
similarity index 100%
rename from valence/tests/test_units.py
rename to valence/tests/unit/test_units.py