Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py	(revision 7293)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_captcha.py	(revision 7294)
@@ -63,18 +63,29 @@
         return
 
-class NullCaptchaTests(FunctionalTestCase):
-
-    layer = FunctionalLayer
+class CaptchaTestBase(object):
 
     def test_ifaces(self):
         # make sure we implement the promised interfaces
-        obj = NullCaptcha()
-        verify.verifyClass(ICaptcha, NullCaptcha)
+        obj = self.factory()
+        verify.verifyClass(ICaptcha, self.factory)
         verify.verifyObject(ICaptcha, obj)
         return
+
+    def test_utility(self):
+        # the null captcha is also registered as a utility for ICaptcha
+        captcha = getUtility(ICaptcha, name=self.name)
+        self.assertTrue(isinstance(captcha, self.factory))
+        return
+
+class NullCaptchaTests(FunctionalTestCase, CaptchaTestBase):
+
+    layer = FunctionalLayer
+
+    factory = NullCaptcha
+    name = 'No captcha'
 
     def test_verify(self):
         # null captchas accept any input request
-        captcha = NullCaptcha()
+        captcha = self.factory()
         result1 = captcha.verify(CaptchaRequest('my-sol', 'my-challenge'))
         result2 = captcha.verify(CaptchaRequest(None, None))
@@ -85,17 +96,16 @@
     def test_display(self):
         # null captchas do not generate additional HTML code
-        captcha = NullCaptcha()
+        captcha = self.factory()
         result = captcha.display()
         self.assertEqual(result, u'')
         return
 
-    def test_utility(self):
-        # the null captcha is also registered as a utility for ICaptcha
-        captcha = getUtility(ICaptcha, name='No captcha')
-        self.assertTrue(isinstance(captcha, NullCaptcha))
-        return
+class TestCaptchaTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
 
 class CaptchaChooserTests(FunctionalTestCase):
     # These tests do not require a site setup
+    # See testsuite below for insite tests.
 
     layer = FunctionalLayer
