1 files changed, 14 insertions, 13 deletions

diff --git a/tox.ini b/tox.ini
index 299cbba63..60133f667 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,24 @@
 [tox]
-envlist = {py34,py35,py36}{,-coverage,-diffcov}{,-pg}{,-mysql},qa
-recreate = True
+envlist = {py34,py35,py36}-{nocov,cov,diffcov}{,-mysql,-pg},qa
+#recreate = True
 skip_missing_interpreters = True
 
 [testenv]
 commands =
-    python -m nose2 -v {posargs}
-    {coverage,diffcov}: python -m coverage run {[coverage]rc} -m nose2 -v {posargs}
-    {coverage,diffcov}: python -m coverage combine {[coverage]rc}
-    coverage: python -m coverage html {[coverage]rc}
-    coverage: python -m coverage report -m {[coverage]rc}
+    nocov: python -m nose2 -v {posargs}
+    cov,diffcov: python -m coverage run {[coverage]rc} -m nose2 {posargs}
+    cov,diffcov: python -m coverage combine {[coverage]rc}
+    cov: python -m coverage html {[coverage]rc}
+    cov: python -m coverage report -m {[coverage]rc} --fail-under=93
     diffcov: python -m coverage xml {[coverage]rc}
     diffcov: diff-cover coverage.xml --html-report diffcov.html
-    diffcov: diff-cover coverage.xml
+    diffcov: diff-cover coverage.xml --fail-under=100
 #sitepackages = True
 usedevelop = True
 deps =
-     falcon
-     {coverage,diffcov}: coverage
+     flufl.testing
+     nose2
+     cov,diffcov: coverage
      pg: psycopg2
      mysql: pymysql
      diffcov: diff_cover
@@ -25,9 +26,9 @@ passenv =
     MAILMAN_*
     PYTHON*
 setenv =
-    coverage: COVERAGE_PROCESS_START={[coverage]rcfile}
-    coverage: COVERAGE_OPTIONS="-p"
-    coverage: COVERAGE_FILE={toxinidir}/.coverage
+    cov: COVERAGE_PROCESS_START={[coverage]rcfile}
+    cov: COVERAGE_OPTIONS="-p"
+    cov: COVERAGE_FILE={toxinidir}/.coverage
 
 [testenv:qa]
 basepython = python3