Use the latest zc.buildout versions in the 1.x and 2.x lines.

.travis.yml

@@ -7,8 +7,8 @@ python:
 
 install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install --use-mirrors zc.buildout==1.6.3; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then pip install --use-mirrors zc.buildout==2.0.0 zope.testing manuel; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install --use-mirrors zc.buildout<2.0.0; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then pip install --use-mirrors zc.buildout>=2.0.0 zope.testing manuel; fi
     - python setup.py install
 
 script: python setup.py test

tox.ini

@@ -9,21 +9,21 @@ envlist = py26, py27, py32, py33
 [testenv]
 commands = python setup.py test
 deps =
-    zc.buildout==1.6.3
+    zc.buildout<2.0.0
 
 [testenv:py26]
 deps =
-    zc.buildout==1.6.3
+    zc.buildout<2.0.0
     unittest2
 
 [testenv:py32]
 deps =
-    zc.buildout==2.0.0
+    zc.buildout>=2.0.0
     zope.testing
     manuel
 
 [testenv:py33]
 deps =
-    zc.buildout==2.0.0
+    zc.buildout>=2.0.0
     zope.testing
     manuel