diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 00000000..cc3c24ea
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=py.test --subunit $LISTOPT solar
+test_id_option=--bar $IDFILE
+test_list_option=--collectonly
diff --git a/.travis.yml b/.travis.yml
index 570cc00b..929cd7e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ install:
     - pip-accel install coveralls
     - pip-accel install -r test-requirements.txt
 script:
-    - py.test --cov=solar -s solar
+    - tox -e py27
 services:
     - riak
 after_success:
diff --git a/test-requirements.txt b/test-requirements.txt
index 04572781..ad437db8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,3 +3,5 @@ hacking==0.7
 pytest-cov
 pytest-mock
 tox
+pytest-subunit
+os-testr
diff --git a/tox.ini b/tox.ini
index b2795f6f..a3b0ca29 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,9 +7,9 @@ envlist = py27,pep8
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
 deps = -r{toxinidir}/test-requirements.txt
-commands =
-    py.test {posargs:solar/solar/test}
+commands = ostestr --serial
 
 [testenv:pep8]
 deps = hacking==0.7