--- a/tox.ini	Thu May 26 15:38:39 2016 +0200
+++ b/tox.ini	Fri Sep 23 16:04:32 2016 +0200
@@ -1,45 +1,24 @@
 [tox]
 envlist =
   check-manifest,flake8,
-  py27-{cubicweb,dataimport,devtools,entities,etwist,ext,hooks,server,migractions,sobjects,web,wsgi},
-  py34-{cubicweb,dataimport,devtools,entities,ext,hooks,server,migractions,sobjects,web,wsgi}
+  py{27,34}-{server,web,misc}
 
 [testenv]
 sitepackages = True
 whitelist_externals =
   /usr/bin/touch
 deps =
-  -rdev-requirements.txt
-  cubicweb: -r{toxinidir}/cubicweb/test/requirements.txt
-  devtools: -r{toxinidir}/cubicweb/devtools/test/requirements.txt
-  entities: -r{toxinidir}/cubicweb/entities/test/requirements.txt
-  etwist: -r{toxinidir}/cubicweb/etwist/test/requirements.txt
-  ext: -r{toxinidir}/cubicweb/ext/test/requirements.txt
-  hooks: -r{toxinidir}/cubicweb/hooks/test/requirements.txt
-  server: -r{toxinidir}/cubicweb/server/test/requirements.txt
-  migractions: -r{toxinidir}/cubicweb/server/test/requirements.txt
-  sobjects: -r{toxinidir}/cubicweb/sobjects/test/requirements.txt
-  web: -r{toxinidir}/cubicweb/web/test/requirements.txt
-  wsgi: -r{toxinidir}/cubicweb/wsgi/test/requirements.txt
+  -r{toxinidir}/requirements/dev.txt
+  misc: -r{toxinidir}/requirements/test-misc.txt
+  server: -r{toxinidir}/requirements/test-server.txt
+  web: -r{toxinidir}/requirements/test-web.txt
 commands =
-  py34-cubicweb: touch {envdir}/share/cubicweb/cubes/__init__.py
-  py34-server: touch {envdir}/share/cubicweb/cubes/__init__.py
-  py34-migractions: touch {envdir}/share/cubicweb/cubes/__init__.py
-  py34-sobjects: touch {envdir}/share/cubicweb/cubes/__init__.py
-  py34-web: touch {envdir}/share/cubicweb/cubes/__init__.py
-  cubicweb: {envpython} -m pip install --upgrade --no-deps --quiet git+git://github.com/logilab/yapps@master#egg=yapps
-  cubicweb: {envpython} -m pytest {toxinidir}/cubicweb/test {posargs}
-  dataimport: {envpython} -m pytest {toxinidir}/cubicweb/dataimport/test {posargs}
-  devtools: {envpython} -m pytest {toxinidir}/cubicweb/devtools/test {posargs}
-  entities: {envpython} -m pytest {toxinidir}/cubicweb/entities/test {posargs}
-  etwist: {envpython} -m pytest {toxinidir}/cubicweb/etwist/test {posargs}
-  ext: {envpython} -m pytest {toxinidir}/cubicweb/ext/test {posargs}
-  hooks: {envpython} -m pytest {toxinidir}/cubicweb/hooks/test {posargs}
-  server: {envpython} -m pytest {toxinidir}/cubicweb/server/test {posargs} --ignore={toxinidir}/cubicweb/server/test/unittest_migractions.py
-  migractions: {envpython} -m pytest {toxinidir}/cubicweb/server/test/unittest_migractions.py {posargs}
-  sobjects: {envpython} -m pytest {toxinidir}/cubicweb/sobjects/test {posargs}
-  web: {envpython} -m pytest {toxinidir}/cubicweb/web/test {posargs}
-  wsgi: {envpython} -m pytest {toxinidir}/cubicweb/wsgi/test {posargs}
+  py34: touch {envdir}/share/cubicweb/cubes/__init__.py
+  misc: {envpython} -m pip install --upgrade --no-deps --quiet git+git://github.com/logilab/yapps@master#egg=yapps
+  misc: {envpython} -m pytest {posargs} {toxinidir}/cubicweb/test {toxinidir}/cubicweb/dataimport/test {toxinidir}/cubicweb/devtools/test {toxinidir}/cubicweb/entities/test {toxinidir}/cubicweb/ext/test {toxinidir}/cubicweb/hooks/test {toxinidir}/cubicweb/sobjects/test {toxinidir}/cubicweb/wsgi/test
+  py27-misc: {envpython} -m pytest {posargs} {toxinidir}/cubicweb/etwist/test
+  server: {envpython} -m pytest {posargs} {toxinidir}/cubicweb/server/test
+  web: {envpython} -m pytest {posargs} {toxinidir}/cubicweb/web/test
 
 [testenv:flake8]
 skip_install = true
@@ -160,3 +139,5 @@
   cubicweb/web/views/json.py,
   cubicweb/web/views/searchrestriction.py,
   cubicweb/xy.py,
+
+# vim: wrap sts=2 sw=2