diff --git a/buildout.cfg b/buildout.cfg
index b8cb661..8538b7d 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,77 +1,10 @@
 [buildout]
 extends =
     http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.1.x.cfg
-extensions = buildout.eggtractor mr.developer
-tractor-src-directory = 
-    .
-    src
-auto-checkout =
-    collective.autoresizetextarea
-    collective.akismet
-    collective.z3cform.norobots
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
 package-name = plone.app.discussion
 package-directory = plone/app/discussion
 
-parts +=
-    omelette
-    test
-    releaser
-    zopepy
-    sphinxbuilder
-    sphinxupload
-
-#develop = .
 versions = versions
 
 [versions]
-plone.app.discussion = 2.1.1dev
-
-[instance]
-eggs +=
-    Products.PdbDebugMode
-    Products.PrintingMailHost
-    roman
-    Sphinx
-    Sphinx-PyPI-upload
-    repoze.sphinx.autointerface
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-packages = ${instance:location}/lib/python ./
-
-[test]
-recipe = collective.xmltestreport
-eggs = ${buildout:package-name} [test]
-defaults = ['--auto-color', '--auto-progress']
-
-[releaser]
-recipe = zc.recipe.egg
-eggs = jarn.mkrelease
-
-[zopepy]
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = zopepy
-scripts = zopepy
-
-[sphinxbuilder]
-recipe = collective.recipe.sphinxbuilder
-interpreter = ${buildout:directory}/bin/zopepy
-
-[sphinxupload]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    bin/zopepy setup.py upload_sphinx
-output = ${buildout:directory}/bin/sphinxupload
-mode = 755
-
-[sources]
-collective.akismet = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/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.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/
+plone.app.discussion = 2.1.1dev
\ No newline at end of file
diff --git a/dev.cfg b/dev.cfg
new file mode 100644
index 0000000..0fbe078
--- /dev/null
+++ b/dev.cfg
@@ -0,0 +1,75 @@
+[buildout]
+extends =
+    buildout.cfg
+extensions = buildout.eggtractor mr.developer
+tractor-src-directory = 
+    .
+    src
+auto-checkout =
+    collective.autoresizetextarea
+    collective.akismet
+    collective.z3cform.norobots
+    plone.formwidget.captcha
+    plone.formwidget.recaptcha
+
+parts +=
+    omelette
+    test
+    releaser
+    zopepy
+    sphinxbuilder
+    sphinxupload
+
+#develop = .
+versions = versions
+
+[versions]
+plone.app.discussion = 2.1.1dev
+
+[instance]
+eggs +=
+    Products.PdbDebugMode
+    Products.PrintingMailHost
+    roman
+    Sphinx
+    Sphinx-PyPI-upload
+    repoze.sphinx.autointerface
+
+[omelette]
+recipe = collective.recipe.omelette
+eggs = ${instance:eggs}
+packages = ${instance:location}/lib/python ./
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = ${test:eggs}
+defaults = ['--auto-color', '--auto-progress']
+
+[releaser]
+recipe = zc.recipe.egg
+eggs = jarn.mkrelease
+
+[zopepy]
+recipe = zc.recipe.egg
+eggs = ${instance:eggs}
+interpreter = zopepy
+scripts = zopepy
+
+[sphinxbuilder]
+recipe = collective.recipe.sphinxbuilder
+interpreter = ${buildout:directory}/bin/zopepy
+
+[sphinxupload]
+recipe = collective.recipe.template
+input = inline:
+    #!/bin/sh
+    bin/zopepy setup.py upload_sphinx
+output = ${buildout:directory}/bin/sphinxupload
+mode = 755
+
+[sources]
+collective.akismet = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/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.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/