diff --git a/tests/pecantest/test/tests/test_ws.py b/tests/pecantest/test/tests/test_ws.py
index ea8732f..2d1d242 100644
--- a/tests/pecantest/test/tests/test_ws.py
+++ b/tests/pecantest/test/tests/test_ws.py
@@ -180,7 +180,7 @@ class TestWS(FunctionalTest):
             '/authors/913',
         )
         self.assertEqual(res.status_int, 200)
-        self.assertEqual(res.body, '"foo"')
+        self.assertEqual(res.body, b'"foo"')
         self.assertEqual(res.content_length, 5)
 
     def test_non_default_response_return_type_no_content(self):
@@ -188,7 +188,7 @@ class TestWS(FunctionalTest):
             '/authors/912',
         )
         self.assertEqual(res.status_int, 204)
-        self.assertEqual(res.body, '')
+        self.assertEqual(res.body, b'')
         self.assertEqual(res.content_length, 0)
 
     def test_serversideerror(self):
diff --git a/tests/test_flask.py b/tests/test_flask.py
index 789908c..6890349 100644
--- a/tests/test_flask.py
+++ b/tests/test_flask.py
@@ -105,7 +105,7 @@ class FlaskrTestCase(unittest.TestCase):
 
     def test_multiply(self):
         r = self.app.get('/multiply?a=2&b=5')
-        assert r.data == '10'
+        assert r.data == b'10', r.data
 
     def test_get_model(self):
         resp = self.app.get('/models/test')
@@ -118,9 +118,8 @@ class FlaskrTestCase(unittest.TestCase):
     def test_array_parameter(self):
         resp = self.app.get('/models?q.op=%3D&q.attr=name&q.value=second')
         assert resp.status_code == 200
-        print resp.data
         self.assertEquals(
-            resp.data, '[{"name": "second"}]'
+            resp.data, b'[{"name": "second"}]'
         )
 
     def test_post_model(self):
@@ -154,9 +153,9 @@ class FlaskrTestCase(unittest.TestCase):
             headers={'Accept': 'application/xml'}
         )
         assert r.status_code == 403, r.status_code
-        assert r.data == ('<error><faultcode>Client</faultcode>'
-                          '<faultstring>403: Forbidden</faultstring>'
-                          '<debuginfo /></error>')
+        assert r.data == (b'<error><faultcode>Client</faultcode>'
+                          b'<faultstring>403: Forbidden</faultstring>'
+                          b'<debuginfo /></error>')
 
     def test_custom_non_http_clientside_error(self):
         r = self.app.get(
@@ -171,20 +170,17 @@ class FlaskrTestCase(unittest.TestCase):
             headers={'Accept': 'application/xml'}
         )
         assert r.status_code == 412, r.status_code
-        assert r.data == ('<error><faultcode>Client</faultcode>'
-                          '<faultstring>FOO!</faultstring>'
-                          '<debuginfo /></error>')
+        assert r.data == (b'<error><faultcode>Client</faultcode>'
+                          b'<faultstring>FOO!</faultstring>'
+                          b'<debuginfo /></error>')
 
     def test_serversideerror(self):
         r = self.app.get('/divide_by_zero')
         assert r.status_code == 500
         data = json.loads(r.data)
-        self.assertEquals(
-            data,
-            {"debuginfo": None,
-             "faultcode": "Server",
-             "faultstring": "integer division or modulo by zero"}
-        )
+        self.assertEquals(data['debuginfo'], None)
+        self.assertEquals(data['faultcode'], 'Server')
+        self.assertIn('by zero', data['faultstring'])
 
     def test_restful_get(self):
         r = self.app.get('/restful', headers={'Accept': 'application/json'})
diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index 2b1940f..0be172f 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -1,6 +1,6 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
+envlist = py27,py27-nolxml,pypy,tg11,tg15,cornice,coverage,py34,py34-nolxml,pecan-dev27,pecan-dev34,pep8
 
 [common]
 testtools=
@@ -17,7 +17,7 @@ basedeps=
     flask-restful
 
 [axes]
-python=py26,py27,py32,py33,pypy
+python=py27,py34,pypy
 sqlalchemy=sa5,sa6,sa7*
 lxml=lxml*,nolxml
 json=json*,simplejson
@@ -26,58 +26,23 @@ json=json*,simplejson
 deps = 
     {[common]testtools}
     {[common]basedeps}
-    suds
+    suds-jurko
 
 commands=
     {envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
     {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
-[axis:python:py26]
-deps = 
-    {[common]testtools}
-    unittest2
-    {[common]basedeps}
-    suds
-basepython=python2.6
-
 [axis:python:py27]
 basepython=python2.7
 
-[axis:python:py32]
-basepython=python3.2
-
-deps = 
-    {[common]testtools}
-    {[common]basedeps}
-    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/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
-
-[axis:python:py33]
-basepython=python3.3
-
-deps =
-    {[common]testtools}
-    {[common]basedeps}
-    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 --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
+[axis:python:py34]
+basepython=python3.4
 
 [axis:sqlalchemy:sa5]
 deps=
     SQLAlchemy<=0.5.99
 
-constraints=
-    !python:py32
-
-
 [axis:sqlalchemy:sa6]
 deps=
     SQLAlchemy<=0.6.99
@@ -90,9 +55,6 @@ deps=
 deps=
     simplejson
 
-constraints=
-    !python:py32
-
 [axis:lxml:lxml]
 deps=
     lxml
@@ -101,50 +63,6 @@ deps=
 setenv=
     COVERAGE_FILE=.coverage.{envname}
 
-[testenv:tg11]
-basepython=python2.6
-deps=
-    pbr
-    nose
-    webtest < 1.4.99
-    coverage < 3.99
-    simplejson
-    suds
-    lxml
-commands=
-    {envbindir}/easy_install -i http://www.turbogears.org/1.1/downloads/current/index/ 'TurboGears<1.1.99'
-    {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg1.py --verbose --with-coverage --cover-package wsme,wsmeext {posargs}
-    {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-
-[testenv:tg15]
-basepython=python2.6
-deps=
-    pbr
-    nose
-    webtest < 1.4.99
-    coverage < 3.99
-    simplejson
-    suds
-    lxml
-commands=
-    {envbindir}/easy_install -i http://www.turbogears.org/1.5/downloads/current/index/ 'TurboGears<1.5.99'
-    {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg15.py --verbose --with-coverage --cover-package wsme,wsmeext {posargs}
-    {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-
-[testenv:tg21]
-basepython=python2.6
-deps=
-    pbr
-    nose
-    coverage < 3.99
-    simplejson
-commands=
-    {envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
-    {envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg20.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
-
-
 [testenv:cornice]
 basepython=python2.7
 usedevelop=True
@@ -161,31 +79,18 @@ commands=
 [testenv:pecan-dev-base]
 deps=
     {[common]testtools}
-    webtest
     transaction
-    suds
+    suds-jurko
     https://github.com/stackforge/pecan/zipball/master
 
-[testenv:pecan-dev26]
-basepython=python2.6
-deps={[testenv:pecan-dev-base]deps}
-commands=
-    {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
-
 [testenv:pecan-dev27]
 basepython=python2.7
 deps={[testenv:pecan-dev-base]deps}
 commands=
     {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
 
-[testenv:pecan-dev32]
-basepython=python3.2
-deps={[testenv:pecan-dev-base]deps}
-commands=
-    {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
-
-[testenv:pecan-dev33]
-basepython=python3.3
+[testenv:pecan-dev34]
+basepython=python3.4
 deps={[testenv:pecan-dev-base]deps}
 commands=
     {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
diff --git a/tox.ini b/tox.ini
index 1b75333..0af9a7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,tg11,tg15,cornice,coverage,py33,py33-nolxml,pecan-dev26,pecan-dev27,pecan-dev32,pecan-dev33,pep8
+envlist = py27,py27-nolxml,pypy,tg11,tg15,cornice,coverage,py34,py34-nolxml,pecan-dev27,pecan-dev34,pep8
 
 [common]
 testtools = 
@@ -19,49 +19,6 @@ basedeps =
 setenv = 
 	COVERAGE_FILE=.coverage.{envname}
 
-[testenv:tg11]
-basepython = python2.6
-deps = 
-	pbr
-	nose
-	webtest < 1.4.99
-	coverage < 3.99
-	simplejson
-	suds
-	lxml
-commands = 
-	{envbindir}/easy_install -i http://www.turbogears.org/1.1/downloads/current/index/ 'TurboGears<1.1.99'
-	{envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg1.py --verbose --with-coverage --cover-package wsme,wsmeext {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-
-[testenv:tg15]
-basepython = python2.6
-deps = 
-	pbr
-	nose
-	webtest < 1.4.99
-	coverage < 3.99
-	simplejson
-	suds
-	lxml
-commands = 
-	{envbindir}/easy_install -i http://www.turbogears.org/1.5/downloads/current/index/ 'TurboGears<1.5.99'
-	{envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg15.py --verbose --with-coverage --cover-package wsme,wsmeext {posargs}
-	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-
-[testenv:tg21]
-basepython = python2.6
-deps = 
-	pbr
-	nose
-	coverage < 3.99
-	simplejson
-commands = 
-	{envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
-	{envbindir}/coverage run {envbindir}/nosetests --with-xunit --xunit-file nosetests-{envname}.xml tests/test_tg20.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
-
 [testenv:cornice]
 basepython = python2.7
 usedevelop = True
@@ -78,31 +35,18 @@ commands =
 [testenv:pecan-dev-base]
 deps = 
 	{[common]testtools}
-	webtest
 	transaction
-	suds
+	suds-jurko
 	https://github.com/stackforge/pecan/zipball/master
 
-[testenv:pecan-dev26]
-basepython = python2.6
-deps = {[testenv:pecan-dev-base]deps}
-commands = 
-	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
-
 [testenv:pecan-dev27]
 basepython = python2.7
 deps = {[testenv:pecan-dev-base]deps}
 commands = 
 	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
 
-[testenv:pecan-dev32]
-basepython = python3.2
-deps = {[testenv:pecan-dev-base]deps}
-commands = 
-	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
-
-[testenv:pecan-dev33]
-basepython = python3.3
+[testenv:pecan-dev34]
+basepython = python3.4
 deps = {[testenv:pecan-dev-base]deps}
 commands = 
 	{envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs}
@@ -138,314 +82,6 @@ usedevelop = True
 deps = 
 	pbr
 
-[testenv:py26-sa5-lxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-
-[testenv:py26-sa5]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-
-[testenv:py26-sa5-lxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-
-[testenv:py26-sa5-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-	lxml
-	simplejson
-
-[testenv:py26-sa5-nolxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-
-[testenv:py26-sa5-nolxml]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-
-[testenv:py26-sa5-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.5.99
-	simplejson
-
-[testenv:py26-sa6-lxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-
-[testenv:py26-sa6]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-
-[testenv:py26-sa6-lxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-
-[testenv:py26-sa6-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-	lxml
-	simplejson
-
-[testenv:py26-sa6-nolxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-
-[testenv:py26-sa6-nolxml]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-
-[testenv:py26-sa6-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.6.99
-	simplejson
-
-[testenv:py26-sa7-lxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-
-[testenv:py26]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-
-[testenv:py26-sa7-lxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-	simplejson
-
-[testenv:py26-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	lxml
-	simplejson
-
-[testenv:py26-sa7-nolxml-json]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-
-[testenv:py26-nolxml]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-
-[testenv:py26-sa7-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	simplejson
-
-[testenv:py26-nolxml-simplejson]
-commands = 
-	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
-	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
-basepython = python2.6
-deps = 
-	{[common]testtools}
-	unittest2
-	{[common]basedeps}
-	suds
-	SQLAlchemy<=0.7.99
-	simplejson
-
 [testenv:py27-sa5-lxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs}
@@ -454,7 +90,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 basepython = python2.7
@@ -467,7 +103,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 basepython = python2.7
@@ -480,7 +116,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -494,7 +130,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -508,7 +144,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 basepython = python2.7
 
@@ -520,7 +156,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 basepython = python2.7
 
@@ -532,7 +168,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	simplejson
 basepython = python2.7
@@ -545,7 +181,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 basepython = python2.7
@@ -558,7 +194,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 basepython = python2.7
@@ -571,7 +207,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -585,7 +221,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -599,7 +235,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 basepython = python2.7
 
@@ -611,7 +247,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 basepython = python2.7
 
@@ -623,7 +259,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	simplejson
 basepython = python2.7
@@ -636,7 +272,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 basepython = python2.7
@@ -649,7 +285,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 basepython = python2.7
@@ -662,7 +298,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -676,7 +312,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -690,7 +326,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 basepython = python2.7
 
@@ -702,7 +338,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 basepython = python2.7
 
@@ -714,7 +350,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python2.7
@@ -727,396 +363,296 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
 basepython = python2.7
 
-[testenv:py32-sa6-lxml-json]
+[testenv:py34-sa5-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 tests/test_flask.py --verbose {posargs}
+	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.6.99
-	lxml
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.6.99
-	lxml
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.6.99
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.6.99
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.7.99
-	lxml
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.7.99
-	lxml
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.7.99
-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 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 = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
-	SQLAlchemy<=0.7.99
-basepython = python3.2
-
-[testenv:py33-sa5-lxml-json]
-commands = 
-	{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
-deps = 
-	{[common]testtools}
-	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5]
+[testenv:py34-sa5]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5-lxml-simplejson]
+[testenv:py34-sa5-lxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5-simplejson]
+[testenv:py34-sa5-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5-nolxml-json]
+[testenv:py34-sa5-nolxml-json]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5-nolxml]
+[testenv:py34-sa5-nolxml]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa5-nolxml-simplejson]
+[testenv:py34-sa5-nolxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-lxml-json]
+[testenv:py34-sa6-lxml-json]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6]
+[testenv:py34-sa6]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-lxml-simplejson]
+[testenv:py34-sa6-lxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-simplejson]
+[testenv:py34-sa6-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-nolxml-json]
+[testenv:py34-sa6-nolxml-json]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-nolxml]
+[testenv:py34-sa6-nolxml]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa6-nolxml-simplejson]
+[testenv:py34-sa6-nolxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa7-lxml-json]
+[testenv:py34-sa7-lxml-json]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33]
+[testenv:py34]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa7-lxml-simplejson]
+[testenv:py34-sa7-lxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-simplejson]
+[testenv:py34-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa7-nolxml-json]
+[testenv:py34-sa7-nolxml-json]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-nolxml]
+[testenv:py34-nolxml]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-sa7-nolxml-simplejson]
+[testenv:py34-sa7-nolxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
-[testenv:py33-nolxml-simplejson]
+[testenv:py34-nolxml-simplejson]
 commands = 
-	{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 run {envbindir}/nosetests --nologcapture --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 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 = 
 	{[common]testtools}
 	{[common]basedeps}
-	https://bitbucket.org/bernh/suds-python-3-patches/downloads/suds_patched.zip
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
-basepython = python3.3
+basepython = python3.4
 
 [testenv:pypy-sa5-lxml-json]
 commands = 
@@ -1126,7 +662,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 
@@ -1138,7 +674,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 
@@ -1150,7 +686,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -1163,7 +699,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
@@ -1176,7 +712,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 
 [testenv:pypy-sa5-nolxml]
@@ -1187,7 +723,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 
 [testenv:pypy-sa5-nolxml-simplejson]
@@ -1198,7 +734,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.5.99
 	simplejson
 
@@ -1210,7 +746,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 
@@ -1222,7 +758,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 
@@ -1234,7 +770,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -1247,7 +783,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
@@ -1260,7 +796,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 
 [testenv:pypy-sa6-nolxml]
@@ -1271,7 +807,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 
 [testenv:pypy-sa6-nolxml-simplejson]
@@ -1282,7 +818,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.6.99
 	simplejson
 
@@ -1294,7 +830,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 
@@ -1306,7 +842,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 
@@ -1318,7 +854,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -1331,7 +867,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
@@ -1344,7 +880,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 
 [testenv:pypy-nolxml]
@@ -1355,7 +891,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 
 [testenv:pypy-sa7-nolxml-simplejson]
@@ -1366,7 +902,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
 
@@ -1378,7 +914,7 @@ commands =
 deps = 
 	{[common]testtools}
 	{[common]basedeps}
-	suds
+	suds-jurko
 	SQLAlchemy<=0.7.99
 	simplejson
 
diff --git a/wsme/rest/json.py b/wsme/rest/json.py
index e9a8ddc..07388bb 100644
--- a/wsme/rest/json.py
+++ b/wsme/rest/json.py
@@ -225,7 +225,7 @@ def parse(s, datatypes, bodyarg, encoding='utf8'):
         try:
             kw = {argname: fromjson(datatypes[argname], jdata)}
         except ValueError as e:
-            raise InvalidInput(argname, jdata, e.message)
+            raise InvalidInput(argname, jdata, e.args[0])
     else:
         kw = {}
         extra_args = []
@@ -236,7 +236,7 @@ def parse(s, datatypes, bodyarg, encoding='utf8'):
                 try:
                     kw[key] = fromjson(datatypes[key], jdata[key])
                 except ValueError as e:
-                    raise InvalidInput(key, jdata[key], e.message)
+                    raise InvalidInput(key, jdata[key], e.args[0])
         if extra_args:
             raise UnknownArgument(', '.join(extra_args))
     return kw
diff --git a/wsme/tests/test_api.py b/wsme/tests/test_api.py
index b99b20a..94d63fb 100644
--- a/wsme/tests/test_api.py
+++ b/wsme/tests/test_api.py
@@ -383,7 +383,7 @@ class TestFormatException(unittest.TestCase):
         return wsme_api.format_exception(fake_exc_info, debug=debug)
 
     def test_format_client_exception(self):
-        faultstring = b'boom'
+        faultstring = 'boom'
         ret = self._test_format_exception(exc.ClientSideError(faultstring))
         self.assertIsNone(ret['debuginfo'])
         self.assertEqual('Client', ret['faultcode'])
@@ -397,7 +397,7 @@ class TestFormatException(unittest.TestCase):
         self.assertEqual(faultstring, ret['faultstring'])
 
     def test_format_server_exception(self):
-        faultstring = b'boom'
+        faultstring = 'boom'
         ret = self._test_format_exception(Exception(faultstring))
         self.assertIsNone(ret['debuginfo'])
         self.assertEqual('Server', ret['faultcode'])
@@ -411,7 +411,7 @@ class TestFormatException(unittest.TestCase):
         self.assertEqual(faultstring, ret['faultstring'])
 
     def test_format_server_exception_debug(self):
-        faultstring = b'boom'
+        faultstring = 'boom'
         ret = self._test_format_exception(Exception(faultstring), debug=True)
         # assert debuginfo is populated
         self.assertIsNotNone(ret['debuginfo'])
diff --git a/wsme/tests/test_restjson.py b/wsme/tests/test_restjson.py
index 3569a11..6297b59 100644
--- a/wsme/tests/test_restjson.py
+++ b/wsme/tests/test_restjson.py
@@ -437,10 +437,10 @@ class TestRestJson(wsme.tests.protocol.RestOnlyProtocolTestCase):
             headers=headers,
             status=406)
         print("Received:", res.body)
-        assert res.body == ("Unacceptable Accept type: "
-                            "text/html, application/xml;q=0.9 not in "
-                            "['application/json', 'text/javascript', "
-                            "'application/javascript', 'text/xml']")
+        assert res.body == b("Unacceptable Accept type: "
+                             "text/html, application/xml;q=0.9 not in "
+                             "['application/json', 'text/javascript', "
+                             "'application/javascript', 'text/xml']")
 
     def test_GET_bad_simple_accept(self):
         headers = {
@@ -451,9 +451,9 @@ class TestRestJson(wsme.tests.protocol.RestOnlyProtocolTestCase):
             headers=headers,
             status=406)
         print("Received:", res.body)
-        assert res.body == ("Unacceptable Accept type: text/plain not in "
-                            "['application/json', 'text/javascript', "
-                            "'application/javascript', 'text/xml']")
+        assert res.body == b("Unacceptable Accept type: text/plain not in "
+                             "['application/json', 'text/javascript', "
+                             "'application/javascript', 'text/xml']")
 
     def test_POST(self):
         headers = {
@@ -481,9 +481,9 @@ class TestRestJson(wsme.tests.protocol.RestOnlyProtocolTestCase):
             headers=headers,
             status=415)
         print("Received:", res.body)
-        assert res.body == ("Unacceptable Content-Type: text/plain not in "
-                            "['application/json', 'text/javascript', "
-                            "'application/javascript', 'text/xml']")
+        assert res.body == b("Unacceptable Content-Type: text/plain not in "
+                             "['application/json', 'text/javascript', "
+                             "'application/javascript', 'text/xml']")
 
     def test_DELETE(self):
         res = self.app.delete(
diff --git a/wsmeext/sphinxext.py b/wsmeext/sphinxext.py
index fa47f9b..9c8ffe3 100644
--- a/wsmeext/sphinxext.py
+++ b/wsmeext/sphinxext.py
@@ -560,9 +560,11 @@ class WSMEDomain(Domain):
     }
 
     def clear_doc(self, docname):
-        for name, value in self.data['types'].items():
+        keys = list(self.data['types'].keys())
+        for key in keys:
+            value = self.data['types'][key]
             if value == docname:
-                del self.data['types'][name]
+                del self.data['types'][key]
 
     def resolve_xref(self, env, fromdocname, builder,
                      type, target, node, contnode):