diff --git a/tox.ini b/tox.ini
index f0c8d8dbe..fbce39e87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,7 @@
-[project]
-distpaths=
-    py
-    setup.py
-    distribute_setup.py
-    README.txt
-    MANIFEST.in
-    LICENSE
-    doc
-    testing
-    conftest.py
-
-testpaths=
-    testing
-    conftest.py
-    
 [test]
-command=py.test --confcutdir=. --junitxml=junit-%(envname)s.xml testing/
+changedir=testing
+command=py.test -n3 --basetemp=%(envtmpdir)s --confcutdir=.. --junitxml=junit-%(envname)s.xml 
+deps=pytest-xdist
 [testenv:py24]
 python=python2.4
 [testenv:py25]
@@ -24,6 +10,6 @@ python=python2.5
 python=python2.6
 [testenv:jython]
 python=jython
-command=py.test-jython --confcutdir=. --junitxml=junit-%(envname)s.xml testing/
+command=py.test-jython -n3 --basetemp=%(envtmpdir)s --confcutdir=.. --junitxml=junit-%(envname)s.xml
 [testenv:py31]
 python=python3.1