diff --git a/base.cfg b/base.cfg
index 2debd1e2..a539ec9e 100644
--- a/base.cfg
+++ b/base.cfg
@@ -44,6 +44,7 @@ eggs =
     bda.plone.shop
     bda.plone.stripe
     bda.plone.gtm
+    pdbpp
 
 zcml =
     bda.plone.shop
@@ -57,6 +58,7 @@ eggs = zest.releaser[recommended]
 [test]
 recipe = zc.recipe.testrunner
 eggs =
+    pdbpp
     souper
     souper.plone[test]
     bda.plone.cart[test]
@@ -72,6 +74,7 @@ recipe = zc.recipe.egg
 eggs =
     ${test:eggs}
     plone.app.robotframework
+    pdbpp
     plone.reload
     plone.app.debugtoolbar
     Products.PrintingMailHost
diff --git a/bootstrap-5.0.x.sh b/bootstrap-5.0.x.sh
index e27049ea..df027dce 100755
--- a/bootstrap-5.0.x.sh
+++ b/bootstrap-5.0.x.sh
@@ -4,5 +4,5 @@
 rm -r ./lib ./include ./local ./bin
 ln -fs plone-5.0.x.cfg buildout.cfg
 virtualenv --clear .
-./bin/pip install --upgrade pip setuptools zc.buildout
+./bin/pip install -r https://raw.githubusercontent.com/plone/buildout.coredev/5.0/requirements.txt
 ./bin/buildout
diff --git a/bootstrap-5.1.x.sh b/bootstrap-5.1.x.sh
index 0ba0704e..0e88dfe5 100755
--- a/bootstrap-5.1.x.sh
+++ b/bootstrap-5.1.x.sh
@@ -4,5 +4,5 @@
 rm -r ./lib ./include ./local ./bin
 ln -fs plone-5.1.x.cfg buildout.cfg
 virtualenv --clear .
-./bin/pip install --upgrade pip setuptools zc.buildout
+./bin/pip install -r https://raw.githubusercontent.com/plone/buildout.coredev/5.1/requirements.txt
 ./bin/buildout
diff --git a/versions.cfg b/versions.cfg
index 0524349c..55734022 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -16,7 +16,6 @@ auto-checkout +=
     yafowil.plone
     yafowil.widget.autocomplete
     yafowil.widget.datetime
-    plonetheme.barceloneta
 
 [versions]
 yafowil = >=2.2b2