diff --git a/tox.ini b/tox.ini
index 8838eee..3c81853 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ testtools =
 
 [testenv]
 deps = 
+    d2to1
     nose
     webtest
     coverage
@@ -28,6 +29,7 @@ downloadcache=.tox/cache
 [testenv:py25simplejson]
 basepython=python2.5
 deps=
+    d2to1
     nose
     webtest
     coverage
@@ -38,6 +40,7 @@ deps=
 [testenv:sphinxext]
 basepython=python2.5
 deps=
+    d2to1
     nose
     coverage
     simplejson
@@ -71,9 +74,22 @@ commands=
     {envbindir}/easy_install -i http://www.turbogears.org/1.5/downloads/current/index/ 'TurboGears<1.5.99'
     {envbindir}/coverage run -p {envbindir}/nosetests tests/test_tg15.py --verbose {posargs}
 
+[testenv:tg21]
+basepython=python2.5
+deps=
+    d2to1
+    nose
+    coverage
+    simplejson
+commands=
+    {envbindir}/easy_install https://bitbucket.org/cdevienne/wsme-soap/get/tip.zip
+    {envbindir}/easy_install -i http://www.turbogears.org/2.1/downloads/current/index/ 'TurboGears2<2.1.99' webtest
+    {envbindir}/coverage run -p {envbindir}/nosetests tests/test_tg20.py --verbose {posargs}
+
 [testenv:pecan]
 basepython=python2.7
 deps=
+    d2to1
     nose
     webtest
     coverage