diff --git a/dev-plone4.cfg b/dev-plone4.cfg
index 0edbecd..6ffac50 100644
--- a/dev-plone4.cfg
+++ b/dev-plone4.cfg
@@ -1,4 +1,6 @@
 [buildout]
+extends = test-plone-4.0.x.cfg
+
 extensions = mr.developer buildout.dumppickedversions buildout.eggtractor
 unzip = true
 parts =
@@ -18,22 +20,11 @@ overwrite-picked-versions-file = True
 
 tractor-src-directory = src
 
-# Change the number here to change the version of Plone being used
-extends = 
-    http://dist.plone.org/release/4.0rc1/versions.cfg
-versions = versions
-
-# Add additional egg download sources here. dist.plone.org contains archives
-# of Plone packages.
-find-links =
-    http://dist.plone.org/release/4.0rc1
-    http://dist.plone.org/thirdparty
-
 # Add additional eggs here
-eggs =
+eggs +=
+    plone.app.discussion
     Sphinx
     repoze.sphinx.autointerface
-    plone.app.discussion
     plone.formwidget.captcha
     plone.formwidget.recaptcha
     collective.akismet 
@@ -51,6 +42,7 @@ auto-checkout =
     plone.formwidget.recaptcha
     collective.akismet
     collective.autoresizetextarea
+    collective.z3cform.norobots
     plone.app.z3cform
     plone.z3cform
     z3c.form
@@ -85,6 +77,7 @@ zcml =
     plone.formwidget.captcha
     plone.formwidget.recaptcha
 
+
 [zopepy]
 # For more information on this step and configuration options see:
 # http://pypi.python.org/pypi/zc.recipe.egg
@@ -93,10 +86,6 @@ eggs = ${instance:eggs}
 interpreter = zopepy
 scripts = zopepy
 
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-packages = ${instance:location}/lib/python ./
 
 [ipzope]
 recipe = zc.recipe.egg
@@ -111,46 +100,24 @@ initialization =
 extra-paths = ${instance:location}/lib/python
 scripts = ipython=ipzope
 
+
 [releaser]
 recipe = zc.recipe.egg
 eggs = zest.releaser
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = plone.app.discussion
-# other eggs in this list not shown
-extra-paths = ${instance:location}/lib/python
-defaults = ['--exit-with-status', '--auto-color', '--auto-progress']
-
-[coverage-test]
-recipe = zc.recipe.testrunner
-eggs = ${test:eggs}
-defaults = ['--coverage', '../../coverage', '-v', '--auto-progress']
-
-[coverage-report]
-recipe = zc.recipe.egg
-eggs = z3c.coverage
-scripts = coveragereport
-arguments = ('coverage', 'report')
-
-[jscoverage]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    jscoverage-server -v --ip-address=0.0.0.0 --port=9999 --encoding=UTF-8 --document-root=plone/app/discussion/ --no-instrument=/tests
-output = ${buildout:directory}/bin/jscoverage
-mode = 755
 
 [sphinxbuilder]
 recipe = collective.recipe.sphinxbuilder
 interpreter = ${buildout:directory}/bin/zopepy
 
+
 [sources]
 Products.PloneTestCase = svn http://svn.plone.org/svn/collective/Products.PloneTestCase/trunk/
 plone.formwidget.captcha = svn https://svn.plone.org/svn/plone/plone.formwidget.captcha/trunk
 plone.formwidget.recaptcha = svn https://svn.plone.org/svn/plone/plone.formwidget.recaptcha/trunk
 collective.akismet = svn https://svn.plone.org/svn/collective/collective.akismet/trunk
 collective.autoresizetextarea = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/trunk
+collective.z3cform.norobots = svn https://svn.plone.org/svn/collective/collective.z3cform.norobots/trunk/
 plone.app.z3cform = svn http://svn.plone.org/svn/plone/plone.app.z3cform/trunk
 plone.z3cform = svn http://svn.zope.org/repos/main/plone.z3cform/trunk/
 z3c.form = svn http://svn.zope.org/repos/main/z3c.form/trunk