diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2eb17f..b2d236e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,15 @@
 
 django-1.8:
   script:
-  - tox -e py27-django18
+  - tox -e py27-django18-coverage
 
 django-1.9:
   script:
-  - tox -e py27-django19
+  - tox -e py27-django19-coverage
 
 django-1.10:
   script:
-  - tox -e py27-django110
+  - tox -e py27-django110-coverage
 
 pep8:
   script:
diff --git a/tox.ini b/tox.ini
index cd43322..2f6444e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,53 +2,31 @@
 envlist = py27-django{18,19,110},pep8
 
 
-[base]
-deps =
-    mock
-    vcrpy
-    coverage
-devdeps =
-    -e../mailmanclient
-    -e../django-mailman3
-
-
 [testenv]
 usedevelop = True
 deps =
-    {[base]deps}
-    git+https://gitlab.com/mailman/mailmanclient.git
-    git+https://gitlab.com/mailman/django-mailman3.git
-    dev,record:Django>=1.8,<1.9
+    mock
+    vcrpy
+    coverage: coverage
+    head: git+https://gitlab.com/mailman/mailmanclient.git
+    head: git+https://gitlab.com/mailman/django-mailman3.git
+    dev,record: -e../mailmanclient
+    dev,record: -e../django-mailman3
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django-latest: https://github.com/django/django/archive/master.tar.gz
 commands =
-    coverage run example_project/manage.py test --settings=test_settings {posargs:postorius}
-    coverage report
+    python example_project/manage.py test --settings=test_settings {posargs:postorius}
+    coverage: coverage run example_project/manage.py test --settings=test_settings {posargs:postorius}
+    coverage: coverage html
+    coverage: coverage report
 setenv =
     PYTHONPATH = {toxinidir}
     record: POSTORIUS_VCR_RECORD_MODE = all
 
 
-[testenv:dev]
-deps =
-    {[base]deps}
-    {[base]devdeps}
-commands =
-    python example_project/manage.py test --settings=test_settings {posargs:postorius}
-
-
-[testenv:dev-record]
-deps =
-    {[base]deps}
-    {[base]devdeps}
-commands =
-    python example_project/manage.py test --settings=test_settings {posargs:postorius}
-
-
 [testenv:pep8]
-basepython = python2.7
 deps =
     flake8
 commands =