diff --git a/CHANGES.txt b/CHANGES.txt
index a2c3f01..7596ede 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@ Changelog
 
 - Only require Chameleon >= 2.4, was needlessly bumped in last release.
 
+- Add test extra, remove versions from buildout.cfg.
+
 
 2.2 (2012-01-08)
 ~~~~~~~~~~~~~~~~
diff --git a/buildout.cfg b/buildout.cfg
index 15c0805..801718f 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,34 +1,11 @@
 [buildout]
 develop = .
-eggs = z3c.pt chameleon
 parts = test py
-versions = versions
-
-[versions]
-zope.component = 3.7.1
-zope.configuration = 3.6.0
-zope.deferredimport = 3.5.3
-zope.deprecation = 3.4.0
-zope.dottedname = 3.4.5
-zope.event = 3.4.0
-zope.exceptions = 3.5.2
-zope.hookable = 3.4.0
-zope.i18n = 3.7.4
-zope.i18nmessageid = 3.5.3
-zope.interface = 3.5.0
-zope.location = 3.5.2
-zope.proxy = 3.5.0
-zope.publisher = 3.7.0
-zope.schema = 3.5.1
-zope.security = 3.6.0
-zope.traversing = 3.7.1
-zope.testing = 3.7.1
-zc.recipe.testrunner = 1.1.0
 
 [test]
 recipe = zc.recipe.testrunner
 eggs =
-   z3c.pt
+   z3c.pt [test]
 
 [py]
 recipe = zc.recipe.egg
diff --git a/setup.py b/setup.py
index 3054b26..04adf71 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,10 @@
     'Chameleon >= 2.4',
     ]
 
+tests_require = [
+    'zope.testing',
+    ]
+
 setup(name='z3c.pt',
       version=version,
       description="Fast ZPT engine.",
@@ -32,4 +36,8 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      extras_require=dict(
+          test=tests_require,
+      ),
+      tests_require=tests_require,
       )