diff --git a/buildout.cfg b/buildout.cfg
index 015e125e..e2287a3f 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,5 +1,7 @@
 [buildout]
-extends = test-plone-4.0.x.cfg
+extends = 
+#   test-plone-4.0.x.cfg
+    test-plone-3.3.x.cfg
 
 
 parts += 
diff --git a/docs/Makefile b/docs/Makefile
index 9f1b0f05..686c9af3 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,14 +3,14 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD = /opt/zope/Products.EasyNewsletter/bin/zopepy /opt/zope/Products.EasyNewsletter/bin/sphinx-build
 PAPER         =
-BUILDDIR      = build
+BUILDDIR      = /opt/zope/Products.EasyNewsletter/docs
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) /opt/zope/Products.EasyNewsletter/docs/source
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
@@ -61,9 +61,9 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/EasyNewsletter.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/sphinxbuilder.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/EasyNewsletter.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/sphinxbuilder.qhc"
 
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
diff --git a/docs/make.bat b/docs/make.bat
index 276df6ad..e0a30158 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -3,8 +3,8 @@
 REM Command file for Sphinx documentation
 
 set SPHINXBUILD=sphinx-build
-set BUILDDIR=/home/timo/workspace/plone/Products.EasyNewsletter/docs
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% /home/timo/workspace/plone/Products.EasyNewsletter/docs/source
+set BUILDDIR=/opt/zope/Products.EasyNewsletter/docs
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% /opt/zope/Products.EasyNewsletter/docs/source
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 )
diff --git a/test-plone-3.3.x.cfg b/test-plone-3.3.x.cfg
index de35a5a8..97dc2a6c 100644
--- a/test-plone-3.3.x.cfg
+++ b/test-plone-3.3.x.cfg
@@ -22,15 +22,19 @@ eggs +=
     Sphinx-PyPI-upload
     repoze.sphinx.autointerface
     Products.PdbDebugMode
-#    Products.PrintingMailHost
+#   Products.PrintingMailHost
     plone.reload
     Products.MaildropHost
 
 
 [versions]
 collective.recipe.sphinxbuilder = 0.6.3.3
+Products.CMFPlone = 4.0b1
+plone.app.testing = 3.0a1
 plone.reload = 1.5
+plone.testing = 3.0a2
 Sphinx = 0.6.6
+#unittest2 = 0.5.1
 
 
 [omelette]
@@ -109,3 +113,4 @@ initialization =
     exclude = '--omit=' + '${buildout:package-directory}/tests/*'
     include = '--include=' + '${buildout:package-directory}/*.py'
     sys.argv = sys.argv[:] + ['html', '-i', include, exclude]
+
diff --git a/test-plone-4.0.x.cfg b/test-plone-4.0.x.cfg
index e799421a..42c5e449 100644
--- a/test-plone-4.0.x.cfg
+++ b/test-plone-4.0.x.cfg
@@ -7,14 +7,15 @@ package-directory = Products/EasyNewsletter
 
 parts +=
     omelette
-    zopepy    
+    zopepy
     sphinxbuilder
     test
     coverage
-    coveragereport    
+    coveragereport
     coveragereport-xml
     coveragereport-html
 
+
 [instance]
 eggs +=
     Sphinx
@@ -25,11 +26,12 @@ eggs +=
     plone.reload
     Products.MaildropHost
 
+
 [versions]
 Sphinx = 0.6.6
 collective.recipe.sphinxbuilder = 0.6.3.3
 
-    
+
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${instance:eggs}