diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index c1ce39d..c92ff7d 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -5,12 +5,13 @@ envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,corn
 [common]
 testtools=
     nose
-    coverage
+    coverage < 3.99
     pbr
     webtest
 basedeps=
     transaction
     pecan
+    cloud_sptheme
     Sphinx
     Flask
 
@@ -64,7 +65,7 @@ deps =
     https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
 
 commands=
-    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
+    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py --verbose {posargs}
     {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
     {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
@@ -105,7 +106,7 @@ deps=
     pbr
     nose
     webtest < 1.4.99
-    coverage
+    coverage < 3.99
     simplejson
     suds
     lxml
@@ -120,7 +121,7 @@ deps=
     pbr
     nose
     webtest < 1.4.99
-    coverage
+    coverage < 3.99
     simplejson
     suds
     lxml
@@ -134,7 +135,7 @@ basepython=python2.6
 deps=
     pbr
     nose
-    coverage
+    coverage < 3.99
     simplejson
 commands=
     {envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
@@ -150,7 +151,7 @@ deps=
     pbr
     nose
     webtest
-    coverage
+    coverage < 3.99
     cornice
 commands=
     {envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs}
@@ -191,7 +192,7 @@ commands=
 [testenv:coverage]
 basepython=python
 deps=
-    coverage
+    coverage < 3.99
 setenv=
     COVERAGE_FILE=.coverage
 commands=
diff --git a/tox.ini b/tox.ini
index 849e1c4..d6a8771 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,13 @@ envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,corn
 [common]
 testtools = 
 	nose
-	coverage
+	coverage < 3.99
 	pbr
 	webtest
 basedeps = 
 	transaction
 	pecan
-    cloud_sptheme
+	cloud_sptheme
 	Sphinx
 	Flask
 
@@ -24,7 +24,7 @@ deps =
 	pbr
 	nose
 	webtest < 1.4.99
-	coverage
+	coverage < 3.99
 	simplejson
 	suds
 	lxml
@@ -39,7 +39,7 @@ deps =
 	pbr
 	nose
 	webtest < 1.4.99
-	coverage
+	coverage < 3.99
 	simplejson
 	suds
 	lxml
@@ -53,7 +53,7 @@ basepython = python2.6
 deps = 
 	pbr
 	nose
-	coverage
+	coverage < 3.99
 	simplejson
 commands = 
 	{envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
@@ -68,7 +68,7 @@ deps =
 	pbr
 	nose
 	webtest
-	coverage
+	coverage < 3.99
 	cornice
 commands = 
 	{envbindir}/nosetests tests/test_cornice.py --with-xunit --xunit-file nosetests-{envname}.xml --verbose --with-coverage --cover-package wsmeext {posargs}
@@ -109,7 +109,7 @@ commands =
 [testenv:coverage]
 basepython = python
 deps = 
-	coverage
+	coverage < 3.99
 setenv = 
 	COVERAGE_FILE=.coverage
 commands = 
@@ -733,7 +733,7 @@ basepython = python2.7
 
 [testenv:py32-sa6-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -746,7 +746,7 @@ basepython = python3.2
 
 [testenv:py32-sa6]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -759,7 +759,7 @@ basepython = python3.2
 
 [testenv:py32-sa6-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -771,7 +771,7 @@ basepython = python3.2
 
 [testenv:py32-sa6-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -783,7 +783,7 @@ basepython = python3.2
 
 [testenv:py32-sa7-lxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -796,7 +796,7 @@ basepython = python3.2
 
 [testenv:py32]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -809,7 +809,7 @@ basepython = python3.2
 
 [testenv:py32-sa7-nolxml-json]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps = 
@@ -821,7 +821,7 @@ basepython = python3.2
 
 [testenv:py32-nolxml]
 commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 deps =