diff --git a/.testr.conf b/.testr.conf
index cc3c24ea..ec11e3b3 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=py.test --subunit $LISTOPT solar
-test_id_option=--bar $IDFILE
+test_command=py.test ./solar --subunit $LISTOPT $IDOPTION
+test_id_option=--subunit-load-list=$IDFILE
 test_list_option=--collectonly
diff --git a/tox.ini b/tox.ini
index 848d48af..a2b85eac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr --serial
+commands = ostestr
 
 [testenv:pep8]
 deps = hacking==0.10.2