diff --git a/.travis.yml b/.travis.yml
index 00d5476e..930f4e7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,16 @@ language: python
 python:
   - 2.7
 
+env:
+  - PLONE_VERSION=4
+  - PLONE_VERSION=5.0
+  - PLONE_VERSION=5.1
+
 install:
   - sudo apt-get -qq install libfreetype6-dev liblcms1-dev libreoffice
   - mkdir -p buildout-cache/{eggs,downloads}
+  - sed -ie "s#plone-5#plone-$PLONE_VERSION#" buildout.cfg
+  - sed -ie "s#travis-5#travis-$PLONE_VERSION#" travis.cfg
   - python bootstrap.py -c travis.cfg 
   - virtualenv-2.7 .
   - bin/buildout -Nc travis.cfg
diff --git a/buildout.cfg b/buildout.cfg
index cf9b83e1..c9cc7eb0 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,3 +1,4 @@
 [buildout]
 extends =
+    https://raw.github.com/collective/buildout.plonetest/master/plone-5.x.cfg
     buildout.d/development.cfg
diff --git a/buildout.d/development.cfg b/buildout.d/development.cfg
index fc5a1daa..e47dae65 100644
--- a/buildout.d/development.cfg
+++ b/buildout.d/development.cfg
@@ -39,7 +39,7 @@ environment-vars =
   zope_i18n_compile_mo_files true
 
 [sources]
-collective.behavior.talcondition = git git://github.com/collective/collective.behavior.talcondition.git pushurl=git@github.com:collective/collective.behavior.talcondition.git branch=plone50
+collective.behavior.talcondition = git git://github.com/collective/collective.behavior.talcondition.git pushurl=git@github.com:collective/collective.behavior.talcondition.git
 collective.excelexport = git git://github.com/collective/collective.excelexport.git pushurl=git@github.com:collective/collective.excelexport.git
 appy = svn http://svn.communesplone.org/svn/communesplone/appy/trunk/
 
diff --git a/travis.cfg b/travis.cfg
index f786ea2a..a7dfb46e 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/travis-4.3.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/travis-5.x.cfg
     buildout.d/development.cfg
 
 [code-analysis]