diff --git a/tests/settings.py b/tests/settings.py
index c1e7dee..e61ce92 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -3,6 +3,8 @@ import os
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'bidon_' + os.environ.get('JOB_NAME', '')
+        'TEST': {
+            'NAME': 'bidon-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-')[:63],
+        },
     }
 }
diff --git a/tox.ini b/tox.ini
index f0f3a40..3cee974 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,22 +1,20 @@
 [tox]
-
-toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/{env:JOB_NAME:bidon}/
-
-envlist = django18,django111
+toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/bidon/{env:BRANCH_NAME:}
+envlist = py2-django111-coverage-junit
 
 [testenv]
 usedevelop = True
-basepython = python2.7
 setenv =
   DJANGO_SETTINGS_MODULE=bidon.settings
   BIDON_SETTINGS_FILE=tests/settings.py
-passenv = JOB_NAME
+  BRANCH_NAME={env:BRANCH_NAME:}
+  coverage: COVERAGE=--cov-report xml --cov-report html --cov=bidon/
+  junit: JUNIT=--junitxml=junit-{envname}.xml
 deps =
-  django18: django>=1.8,<1.9
   django111: django>=1.11,<1.12
   psycopg2
   pytest-cov
   pytest-django
-  pytest<4.1
+  pytest
 commands =
-  py.test {posargs:tests/}
+  py.test {posargs: {env:COVERAGE:} {env:JUNIT:} tests/}