Index: setup.py
===================================================================
--- setup.py	(revision 91203)
+++ setup.py	(working copy)
@@ -43,17 +43,21 @@
       include_package_data=True,
       namespace_packages=['Products'],
       zip_safe=False,
-      tests_require=[
-          "five.localsitemanager >= 0.2",
+      setup_requires=['eggtestinfo',
           ],
+      tests_require=['zope.testing',
+                     'five.localsitemanager >= 0.2',
+                    ],
       test_suite="Products.GenericSetup.tests",
-      install_requires=[
-          "setuptools",
-          "five.localsitemanager >= 0.2",
-#          'Zope >= 2.10',
+      test_loader="zope.testing.testrunner.eggsupport:SkipLayers",
+      install_requires=['setuptools',
+                        'five.localsitemanager >= 0.2',
+                       #'Zope2-buildout >= 2.10',
           ],
       entry_points="""
       [zope2.initialize]
       Products.GenericSetup = Products.GenericSetup:initialize
+      [distutils.commands]
+      test = zope.testing.testrunner.eggsupport:ftest
       """,
       )