Merge branch 'release-0.2.2'0.2.2

1 files changed, 2 insertions, 2 deletions

diff --git a/tox.ini b/tox.ini
index a9107c71..e041515d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@ envlist = py26,py27
 
 [testenv]
 deps = -r{toxinidir}/pkg/requirements.pip
-       -r{toxinidir}/pkg/test-requirements.pip
+       -r{toxinidir}/pkg/requirements-testing.pip
 sitepackages = True
-commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad
+commands = xvfb-run nosetests leap --first-package-wins --exclude=soledad*
 
 [testenv:pep8]
 deps = pep8==1.1