2 files changed, 19 insertions, 44 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 087a1c6bb..ee8db9134 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 sqlite:
   script:
-  - tox
+  - tox -e py34,py35
 
 pgsql:
   services:
diff --git a/tox.ini b/tox.ini
index e2f6f0bb1..d874f77a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,56 +1,31 @@
 [tox]
-envlist = py34,py35
+envlist = {py34,py35}{,-coverage,-diffcov}{,-pg}
 recreate = True
 skip_missing_interpreters = True
 
 [testenv]
-commands = python -m nose2 -v
+commands =
+    python -m nose2 -v
+    {coverage,diffcov}: python -m coverage run {[coverage]rc} -m nose2 -v
+    {coverage,diffcov}: python -m coverage combine {[coverage]rc}
+    coverage: python -m coverage html {[coverage]rc}
+    coverage: python -m coverage report -m {[coverage]rc}
+    diffcov: python -m coverage xml {[coverage]rc}
+    diffcov: diff-cover coverage.xml --html-report diffcov.html
+    diffcov: diff-cover coverage.xml
 #sitepackages = True
 usedevelop = True
+deps =
+     {coverage,diffcov}: coverage
+     pg: psycopg2
+     diffcov: diff_cover
 passenv=
     MAILMAN_*
-
-# This environment requires you to set up PostgreSQL and create a .cfg file
-# somewhere outside of the source tree.
-[testenv:pg]
-basepython = python3
-commands = python -m nose2 -v
-usedevelop = True
-deps = psycopg2
+setenv =
+    coverage: COVERAGE_PROCESS_START={[coverage]rcfile}
+    coverage: COVERAGE_OPTIONS="-p"
+    coverage: COVERAGE_FILE={toxinidir}/.coverage
 
 [coverage]
 rcfile = {toxinidir}/coverage.ini
 rc = --rcfile={[coverage]rcfile}
-
-[testenv:coverage]
-basepython = python3
-commands =
-    python -m coverage run {[coverage]rc} -m nose2 -v
-    python -m coverage combine {[coverage]rc}
-    python -m coverage html {[coverage]rc}
-    python -m coverage report -m {[coverage]rc}
-#sitepackages = True
-usedevelop = True
-deps = coverage
-setenv =
-    COVERAGE_PROCESS_START={[coverage]rcfile}
-    COVERAGE_OPTIONS="-p"
-    COVERAGE_FILE={toxinidir}/.coverage
-
-[testenv:diffcov]
-basepython = python3
-commands =
-    python -m coverage run {[coverage]rc} -m nose2 -v
-    python -m coverage combine {[coverage]rc}
-    python -m coverage xml {[coverage]rc}
-    diff-cover coverage.xml --html-report diffcov.html
-    diff-cover coverage.xml
-#sitepackages = True
-usedevelop = True
-deps =
-    coverage
-    diff_cover
-setenv =
-    COVERAGE_PROCESS_START={[coverage]rcfile}
-    COVERAGE_OPTIONS="-p"
-    COVERAGE_FILE={toxinidir}/.coverage