1 files changed, 8 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 8f255d2..2214c7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,10 @@ envlist=py27,py26,py34,py33,pypy,flakes
 commands=echo {posargs}
 
 [testenv]
-commands=py.test  --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+commands= py.test --timeout=60 {posargs}
+
 deps=pytest>=2.3.5
+    pytest-timeout
 
 [testenv:docs]
 basepython=python
@@ -14,15 +16,16 @@ changedir=doc
 deps=sphinx
      {[testenv]deps}
 commands=
-    py.test -v \
-        --junitxml={envlogdir}/junit-{envname}.xml \
-        check_sphinx.py {posargs}
+    py.test -v check_sphinx.py {posargs}
 
 [testenv:flakes]
+qwe = 123
 deps = pytest-flakes>=0.2
        pytest-pep8
 
-commands = py.test -x --flakes --pep8 tox tests
+commands = 
+    py.test --flakes -m flakes tox tests
+    py.test --pep8 -m pep8 tox tests
 
 [testenv:dev]
 # required to make looponfail reload on every source code change