diff --git a/MANIFEST.in b/MANIFEST.in
index 795ab04..517428f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-recursive-include zeam/utils/batch *.txt *.py *.zcml *.po *.mo *.pt
+recursive-include src *.mo *.po *.pot *.pt *.py *.txt *.zcml
 recursive-include docs *.txt
diff --git a/buildout.cfg b/buildout.cfg
index 6e1f228..1eca39d 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,13 +1,13 @@
 [buildout]
 develop = .
 parts = test
-extends = http://grok.zope.org/releaseinfo/grok-1.1.cfg
+extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
 versions = versions
 extensions =
    buildout.dumppickedversions
 
 [versions]
-megrok.pagetemplate = 0.5
+megrok.pagetemplate = 0.7
 
 [test]
 recipe = zc.recipe.testrunner
diff --git a/setup.py b/setup.py
index 29e26c7..1169651 100644
--- a/setup.py
+++ b/setup.py
@@ -4,18 +4,22 @@
 version = '0.8dev'
 
 install_requires=[
+    'grokcore.component',
+    'grokcore.view',
+    'megrok.pagetemplate>=0.7',
     'setuptools',
+    'zope.cachedescriptors',
+    'zope.i18n',
     'zope.interface',
+    'zope.publisher',
     'zope.schema',
-    'zope.annotation',
     'zope.traversing',
-    'zope.app.pagetemplate',
-    'grokcore.view',
-    'grokcore.component',
-    'megrok.pagetemplate>=0.3',
     ]
 
 tests_requires = install_requires + [
+    'zope.app.wsgi',
+    'zope.testing',
+    'grokcore.view [test]'
     ],
 
 
diff --git a/src/zeam/utils/batch/configure.zcml b/src/zeam/utils/batch/configure.zcml
index f85fafa..62794a7 100644
--- a/src/zeam/utils/batch/configure.zcml
+++ b/src/zeam/utils/batch/configure.zcml
@@ -3,11 +3,12 @@
    xmlns:i18n="http://namespaces.zope.org/i18n"
    xmlns:grok="http://namespaces.zope.org/grok">
 
-  <i18n:registerTranslations directory="i18n" />
-
+  <include package="zope.i18n" file="meta.zcml" />
+  <include package="zope.i18n" />
   <include package="grokcore.component" file="meta.zcml" />
   <include package="megrok.pagetemplate" file="meta.zcml" />
 
+  <i18n:registerTranslations directory="i18n" />
   <grok:grok package="." />
 
 </configure>
diff --git a/src/zeam/utils/batch/ftesting.zcml b/src/zeam/utils/batch/ftesting.zcml
index 4a9206b..f6704f5 100644
--- a/src/zeam/utils/batch/ftesting.zcml
+++ b/src/zeam/utils/batch/ftesting.zcml
@@ -4,14 +4,7 @@
    xmlns:browser="http://namespaces.zope.org/browser"
    i18n_domain="zope">
 
-  <include package="zope.component" file="meta.zcml"/>
-  <include package="zope.app.component" file="meta.zcml" />
-  <include package="grokcore.component" file="meta.zcml"/>
-  <include package="megrok.pagetemplate" file="meta.zcml"/>
-  <include package="grokcore.view" file="meta.zcml" />
-  <include package="zope.app.zcmlfiles" file="meta.zcml" />
-  <include package="zope.app.zcmlfiles" />
-  <include package="grokcore.view" />
+  <include package="grokcore.view" file="ftesting.zcml" />
   <include package="zeam.utils.batch" />
 
   <grok:grok package="zeam.utils.batch.tests" />
diff --git a/src/zeam/utils/batch/tests.py b/src/zeam/utils/batch/tests.py
index c405490..71c3b2d 100644
--- a/src/zeam/utils/batch/tests.py
+++ b/src/zeam/utils/batch/tests.py
@@ -1,29 +1,26 @@
 # Copyright Sylvain Viollon 2008 (c)
 # $Id: tests.py 85 2008-10-18 00:15:41Z sylvain $
 
-import os.path
 import unittest
 
 from zope.testing import doctest
-from zope.app.testing import functional
+from zope.app.wsgi.testlayer import BrowserLayer
+import zeam.utils.batch
 
-ftesting_zcml = os.path.join(os.path.dirname(__file__), 'ftesting.zcml')
-FunctionalLayer = functional.ZCMLLayer(
-    ftesting_zcml, __name__, 'FunctionalLayer', allow_teardown=True
-    )
+FunctionalLayer = BrowserLayer(zeam.utils.batch)
 
 
 def test_suite():
-
-    batchs = doctest.DocFileSuite('batch.txt',
-        optionflags=(doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE),
-        )
-
-    readme = functional.FunctionalDocFileSuite('README.txt',
-        globs = dict(__name__="zeam.utils.batch"),
-        )
-
-    views = functional.FunctionalDocFileSuite('views.txt')
+    globs = dict(__name__="zeam.utils.batch",
+                 getRootFolder=FunctionalLayer.getRootFolder)
+    optionflags = (doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
+
+    batchs = doctest.DocFileSuite(
+        'batch.txt', optionflags=optionflags, globs=globs)
+    readme = doctest.DocFileSuite(
+        'README.txt', optionflags=optionflags, globs=globs)
+    views = doctest.DocFileSuite(
+        'views.txt', optionflags=optionflags, globs=globs)
 
     views.layer = FunctionalLayer
     readme.layer = FunctionalLayer
diff --git a/src/zeam/utils/batch/views.txt b/src/zeam/utils/batch/views.txt
index 5429935..cebb500 100644
--- a/src/zeam/utils/batch/views.txt
+++ b/src/zeam/utils/batch/views.txt
@@ -198,8 +198,3 @@ Traversing
   >>> assert result is content
   >>> request.form.get('bstart_toto')
   '6'
-
-
-Tear down:
-
-  >>> sync()