diff --git a/setup.cfg b/setup.cfg
index 4e6fa2f..f4d8e3f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,10 +17,10 @@ classifier =
         Development Status :: 3 - Alpha
         Operating System :: OS Independent
         Programming Language :: Python
-        Programming Language :: Python :: 2.5
         Programming Language :: Python :: 2.6
         Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3.2
+        Programming Language :: Python :: 3.3
         Programming Language :: Python :: Implementation :: CPython
         Programming Language :: Python :: Implementation :: PyPy
         License :: OSI Approved :: MIT License
diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index 5d4f2e7..fd48e75 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -1,20 +1,15 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27,py27-nolxml,py32,py32-nolxml,pypy,py25-simplejson,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml
+envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml
 
 [common]
 testtools=
     nose
     coverage
-    d2to1
-py25deps=
-    --insecure
-    six
-    simplegeneric
-    webob <= 1.1.1
+    pbr
 
 [axes]
-python=py25,py27,py32,py33,pypy
+python=py26,py27,py32,py33,pypy
 sqlalchemy=sa5,sa6,sa7*
 lxml=lxml*,nolxml
 json=json*,simplejson
@@ -31,16 +26,6 @@ commands=
     {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:py25]
-deps=
-    {[common]py25deps}
-    {[common]testtools}
-    webtest < 1.4.99
-    zope.interface<=3.8.99
-    transaction<=1.1.1
-    suds
-basepython=python2.5
-
 [axis:python:py27]
 basepython=python2.7
 
@@ -88,10 +73,6 @@ deps=
 deps=
     SQLAlchemy<=0.7.99
 
-[axis:json:json]
-constraints=
-    !python:py25
-
 [axis:json:simplejson]
 deps=
     simplejson
@@ -103,19 +84,14 @@ constraints=
 deps=
     lxml
 
-[axis:lxml:nolxml]
-constraints=
-    !python:py25
-
 [testenv]
 setenv=
     COVERAGE_FILE=.coverage.{envname}
 
 [testenv:sphinxext]
-basepython=python2.5
+basepython=python2.6
 deps=
-    {[common]py25deps}
-    d2to1
+    pbr
     nose
     coverage
     simplejson
@@ -127,10 +103,9 @@ commands=
     {envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg11]
-basepython=python2.5
+basepython=python2.6
 deps=
-    {[common]py25deps}
-    d2to1
+    pbr
     nose
     webtest < 1.4.99
     coverage
@@ -143,10 +118,9 @@ commands=
     {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg15]
-basepython=python2.5
+basepython=python2.6
 deps=
-    {[common]py25deps}
-    d2to1
+    pbr
     nose
     webtest < 1.4.99
     coverage
@@ -159,10 +133,9 @@ commands=
     {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg21]
-basepython=python2.5
+basepython=python2.6
 deps=
-    {[common]py25deps}
-    d2to1
+    pbr
     nose
     coverage
     simplejson
@@ -175,7 +148,7 @@ commands=
 [testenv:pecan]
 basepython=python2.7
 deps=
-    d2to1
+    pbr
     nose
     webtest
     coverage
@@ -192,7 +165,7 @@ commands=
 [testenv:flask]
 basepython=python2.7
 deps=
-    d2to1
+    pbr
     nose
     webtest
     coverage
@@ -203,8 +176,9 @@ commands=
 
 [testenv:cornice]
 basepython=python2.7
+usedevelop=True
 deps=
-    d2to1
+    pbr
     nose
     webtest
     coverage
diff --git a/tox.ini b/tox.ini
index d4d05e5..6aecd34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,20 @@
 [tox]
-envlist = py27,py27-nolxml,py32,py32-nolxml,pypy,py25-simplejson,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml
+envlist = py26,py26-nolxml,py27,py27-nolxml,py32,py32-nolxml,pypy,sphinxext,tg11,tg15,pecan,flask,cornice,coverage,py33,py33-nolxml
 
 [common]
 testtools = 
 	nose
 	coverage
-	d2to1
-py25deps = 
-	--insecure
-	six
-	simplegeneric
-	webob <= 1.1.1
+	pbr
 
 [testenv]
 setenv = 
 	COVERAGE_FILE=.coverage.{envname}
 
 [testenv:sphinxext]
-basepython = python2.5
+basepython = python2.6
 deps = 
-	{[common]py25deps}
-	d2to1
+	pbr
 	nose
 	coverage
 	simplejson
@@ -32,10 +26,9 @@ commands =
 	{envbindir}/coverage report --show-missing wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg11]
-basepython = python2.5
+basepython = python2.6
 deps = 
-	{[common]py25deps}
-	d2to1
+	pbr
 	nose
 	webtest < 1.4.99
 	coverage
@@ -48,10 +41,9 @@ commands =
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg15]
-basepython = python2.5
+basepython = python2.6
 deps = 
-	{[common]py25deps}
-	d2to1
+	pbr
 	nose
 	webtest < 1.4.99
 	coverage
@@ -64,10 +56,9 @@ commands =
 	{envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py
 
 [testenv:tg21]
-basepython = python2.5
+basepython = python2.6
 deps = 
-	{[common]py25deps}
-	d2to1
+	pbr
 	nose
 	coverage
 	simplejson
@@ -80,7 +71,7 @@ commands =
 [testenv:pecan]
 basepython = python2.7
 deps = 
-	d2to1
+	pbr
 	nose
 	webtest
 	coverage
@@ -96,7 +87,7 @@ commands =
 [testenv:flask]
 basepython = python2.7
 deps = 
-	d2to1
+	pbr
 	nose
 	webtest
 	coverage
@@ -107,8 +98,9 @@ commands =
 
 [testenv:cornice]
 basepython = python2.7
+usedevelop = True
 deps = 
-	d2to1
+	pbr
 	nose
 	webtest
 	coverage
@@ -138,108 +130,292 @@ changedir =
 commands = 
 	make clean ziphtml
 
-[testenv:py25-sa5-lxml-simplejson]
+[testenv:py26-sa5-lxml-json]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
 	suds
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
-[testenv:py25-sa5-simplejson]
+[testenv:py26-sa5-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
 	suds
 	SQLAlchemy<=0.5.99
 	lxml
 	simplejson
 
-[testenv:py25-sa6-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 --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
 	suds
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
-[testenv:py25-sa6-simplejson]
+[testenv:py26-sa6-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
 	suds
 	SQLAlchemy<=0.6.99
 	lxml
 	simplejson
 
-[testenv:py25-sa7-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 --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
 	suds
 	SQLAlchemy<=0.7.99
 	lxml
 	simplejson
 
-[testenv:py25-simplejson]
+[testenv:py26-simplejson]
 commands = 
 	{envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests --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.5
 deps = 
-	{[common]py25deps}
 	{[common]testtools}
-	webtest < 1.4.99
-	zope.interface<=3.8.99
-	transaction<=1.1.1
+	webtest
+	transaction
 	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --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}
+	webtest
+	transaction
+	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 --verbose {posargs}